Merge branch 'master' of github.com:kakaranet/games

apps/face/src/index.erl

@@ -6,7 +6,7 @@
 -include("../../server/include/settings.hrl").
 -include_lib("avz/include/avz.hrl").
 -include_lib("kvs/include/user.hrl").
--jsmacro([take/2,attach/1,join/1,discard/3,player_info/2,reveal/4,piece/2,logout/0,pause/3]).
+-jsmacro([take/2,attach/1,join/1,discard/3,player_info/2,reveal/4,piece/2,logout/0,pause/2]).
 
 user() -> case wf:user() of undefined -> #user{id="maxim"}; U->U end.
 
@@ -58,7 +58,7 @@ reveal(GameId, Color, Value, Hand) ->
             [{discarded, bert:tuple(bert:atom("OkeyPiece"), Color, Value)},
              {hand, Hand}])))).
 
-pause(GameId, Action, Who) ->
+pause(GameId, Action) ->
     ws:send(
       bert:encodebuf(
         bert:tuple(
@@ -67,7 +67,7 @@ pause(GameId, Action, Who) ->
             bert:atom("pause_game"),
             bert:atom("undefined"),
             GameId,
-            bert:binary(Action)
+            bert:atom(Action)
            )
          )
        )
@@ -213,9 +213,9 @@ event({server, {game_event, _, okey_game_info, Args}}) ->
           [player1, player2, player3, player4],
           lists:map(
             fun
-                (#'PlayerInfo'{id = Id, robot = true} = P) ->
+                (#'PlayerInfo'{id = Id, robot = true}) ->
                     {Id, <<Id/binary, <<" R ">>/binary>>};
-                (#'PlayerInfo'{id = Id, robot = false} = P) ->
+                (#'PlayerInfo'{id = Id, robot = false}) ->
                     put(okey_im, Id),
                     {Id, <<Id/binary, <<" M ">>/binary>>}
             end,
@@ -274,7 +274,7 @@ event(pause) ->
                 wf:update(pause, [#button{id = pause, body = <<"Pause">>, postback = pause}]),
                 "resume"
         end,
-    wf:wire(pause("1000001", wf:f("~p", [Action]), wf:f("~p", [wf:to_list(get(okey_im))])));
+    wf:wire(pause("1000001", wf:f("~p", [Action])));
 
 event(Event)  -> wf:info("Event: ~p", [Event]).
 

apps/server/src/game_session.erl

@@ -377,8 +377,8 @@ handle_client_request(#pause_game{game = GameId, action = Action}, _From, State)
             {reply, {error, game_not_found}, State};
         #participation{reg_num = RegNum, tab_pid = TPid, tab_module = TMod} ->
             Signal = case Action of
-                         <<"pause">> -> pause_game;
-                         <<"resume">> -> resume_game
+                         pause -> pause_game;
+                         resume -> resume_game
                      end,
             Res = TMod:signal(TPid, RegNum, {Signal, self()}),
             gas:info(?MODULE,"B. Res: ~p", [Res]),

apps/server/src/okey/game_okey_ng_table_trn.erl

@@ -1447,13 +1447,13 @@ create_okey_turn_timeout(TashTaken, TashDiscarded) ->
 create_game_paused_pause(UserId, GameId) ->
     #game_paused{game = GameId,
                  who = UserId,
-                 action = <<"pause">>,
+                 action = pause,
                  retries = 0}.
 
 create_game_paused_resume(UserId, GameId) ->
     #game_paused{game = GameId,
                  who = UserId,
-                 action = <<"resume">>,
+                 action = resume,
                  retries = 0}.
 
 create_okey_playing_tables(Num) ->