diff options
author | Micael Karlberg <[email protected]> | 2011-09-19 19:26:54 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-09-19 19:26:54 +0200 |
commit | 7c730a573a7e239f41bc619b024a675667767428 (patch) | |
tree | 1265ca1ddae47b094af21f669d0526c9c1b074dd /lib/gs/contribs/othello/othello_board.erl | |
parent | 13fcdd5c954ddbb8ac9401d73f8e77423fbd976c (diff) | |
parent | e84f232326b2800ca806c867b2bfbe3652d423cb (diff) | |
download | otp-7c730a573a7e239f41bc619b024a675667767428.tar.gz otp-7c730a573a7e239f41bc619b024a675667767428.tar.bz2 otp-7c730a573a7e239f41bc619b024a675667767428.zip |
Merge branch 'dev' of super:otp into bmk/inets/inets571_integration
Diffstat (limited to 'lib/gs/contribs/othello/othello_board.erl')
-rw-r--r-- | lib/gs/contribs/othello/othello_board.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gs/contribs/othello/othello_board.erl b/lib/gs/contribs/othello/othello_board.erl index 0206ba2ded..6ccb79b7e4 100644 --- a/lib/gs/contribs/othello/othello_board.erl +++ b/lib/gs/contribs/othello/othello_board.erl @@ -147,7 +147,7 @@ but_pressed("Help",_ButtId,_User,GamePid,_Shell,_Wids,_Op) -> but_pressed("Newgame",_ButtId,_User,GamePid,_Shell,Wids,Options) -> new_game(GamePid,Wids,Options); but_pressed([],ButtId,User,GamePid,_Shell,_Wids,_Op) - when pid(GamePid),User == player -> + when is_pid(GamePid),User == player -> [C,R] = atom_to_list(ButtId), GamePid ! {self(),position,othello_adt:pos(C-96,translate(R-48))}, GamePid; @@ -243,7 +243,7 @@ game_msg(Msg,User,GamePid,Shell,Wids,Options) -> end. -new_game(GamePid,Wids,Options) when pid(GamePid) -> +new_game(GamePid,Wids,Options) when is_pid(GamePid) -> exit(GamePid,kill), new_game(Wids,Options); new_game(_,Wids,Options) -> |