jeena/GGS
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

bugfix

Browse source
This commit is contained in:
Jeena Paradies 2011-04-13 17:52:09 +02:00
parent 31240b02b8
commit 0c340f95d2
6 changed files with 1193 additions and 1188 deletions
Download patch file Download diff file Expand all files Collapse all files

5
games/Pong-bots/bots.sh Executable file
View file

@ -0,0 +1,5 @@
#!/bin/sh
for (( i = 0; i < 2; i++ )); do
./pong-bot.rb &
done

3
games/Pong-bots/ggs-network.rb
View file

@ -29,8 +29,8 @@ class GGSNetwork
protected protected
def write(message) def write(message)
puts message.inspect
@socket.write(message) @socket.write(message)
puts message
end end
def read def read
@ -58,7 +58,6 @@ class GGSNetwork
def receivedCommand(headers, data) def receivedCommand(headers, data)
puts [headers, data].inspect puts [headers, data].inspect
if headers.has_key? "Client-Command" if headers.has_key? "Client-Command"
command = headers["Client-Command"] command = headers["Client-Command"]
case command case command

17
games/Pong-bots/pong-bot.rb
View file

@ -17,18 +17,12 @@ class PongBot
@send_start = false @send_start = false
@ggs_network = GGSNetwork.new(self) @ggs_network = GGSNetwork.new(self)
#@ggs_network.connect("10.42.43.1")
@ggs_network.connect() @ggs_network.connect()
end end
def ggsNetworkReady(ggs_network, ready) def ggsNetworkReady(ggs_network, ready)
@ggs_network.sendCommand("ready") @ggs_network.sendCommand("ready")
t = Thread.new {
loop do
gameTick()
sleep 0.3
end
}
end end
def ggsNetworkDefined(ggs_network, defined) def ggsNetworkDefined(ggs_network, defined)
@ -56,7 +50,6 @@ class PongBot
@send_start = true @send_start = true
end end
else else
puts "#{@ball.y}:#{@me.y}"
if @ball.y < @me.y - 5 if @ball.y < @me.y - 5
@ggs_network.sendCommand("up") @ggs_network.sendCommand("up")
elsif @ball.y > @me.y - 5 elsif @ball.y > @me.y - 5
@ -71,6 +64,13 @@ class PongBot
else else
@me = @player2 @me = @player2
end end
Thread.new {
loop do
gameTick()
sleep 0.3
end
}
end end
def ball(pos_s) def ball(pos_s)
@ -88,7 +88,6 @@ class PongBot
def game(wait_or_start) def game(wait_or_start)
if wait_or_start == "wait" if wait_or_start == "wait"
puts "Other ready"
else else
@game_paused = false @game_paused = false
end end

2
games/Pong/Classes/GGSNetwork.m
View file

@ -11,7 +11,7 @@
@implementation GGSNetwork @implementation GGSNetwork
#define GGS_HOST @"home.jeena.net" #define GGS_HOST @"localhost"
#define GGS_PORT 9000 #define GGS_PORT 9000
#define NO_TIMEOUT -1 #define NO_TIMEOUT -1

2321
games/Pong/Pong.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate generated
View file

File diff suppressed because it is too large Load diff

31
src/ggs_gamevm_p.erl
View file

@ -121,21 +121,22 @@ intern_add_player(Table, Player) ->
1 -> 1 ->
erlang:display("A player joined"); erlang:display("A player joined");
2 -> 2 ->
[P1,P2] = PlayerList, erlang:display("Player 2 joined"),
erlang:display(PlayerList), [P1,P2] = PlayerList,
erlang:display("P1: joining"), erlang:display(PlayerList),
ggs_db:setItem(Table, local_storage, P1, player1), erlang:display("P1: joining"),
erlang:display(ggs_db:getItem(Table, local_storage, Player)), ggs_db:setItem(Table, local_storage, P1, player1),
ggs_db:setItem(Table, local_storage, player1_y, 50), erlang:display(ggs_db:getItem(Table, local_storage, P1)),
ggs_table:send_command(Table, Player, {"welcome", int2str(1)}), ggs_db:setItem(Table, local_storage, player1_y, 50),
ggs_table:notify_all_players(Table, {"player1_y", int2str(50)}), ggs_table:send_command(Table, P1, {"welcome", int2str(1)}),
erlang:display("P2: joining"), ggs_table:notify_all_players(Table, {"player1_y", int2str(50)}),
ggs_db:setItem(Table, local_storage, P2, player2), erlang:display("P2: joining"),
erlang:display(ggs_db:getItem(Table, local_storage, Player)), ggs_db:setItem(Table, local_storage, P2, player2),
ggs_db:setItem(Table, local_storage, player2_y, 50), erlang:display(ggs_db:getItem(Table, local_storage, P2)),
ggs_table:send_command(Table, Player, {"welcome", int2str(2)}), ggs_db:setItem(Table, local_storage, player2_y, 50),
ggs_table:send_command(Table, Player, {"player1_y", int2str(50)}), ggs_table:send_command(Table, P2, {"welcome", int2str(2)}),
ggs_table:notify_all_players(Table, {"player2_y", int2str(50)}); ggs_table:send_command(Table, P2, {"player1_y", int2str(50)}),
ggs_table:notify_all_players(Table, {"player2_y", int2str(50)});
_Other -> _Other ->
ggs_table:send_command(Table, Player, {"not_welcome", ""}) ggs_table:send_command(Table, Player, {"not_welcome", ""})
end. end.