Browse Source

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

Roman Dayneko 11 years ago
parent
commit
67cd475dad
2 changed files with 3 additions and 2 deletions
  1. 2 1
      apps/face/src/index.erl
  2. 1 1
      apps/server/include/requests.hrl

+ 2 - 1
apps/face/src/index.erl

@@ -42,7 +42,8 @@ event(join) ->
 %%         }).
 %%         }).
 
 
 event(take) ->
 event(take) ->
-    Msg = "ws.send(Bert.encodebuf(Bert.tuple(Bert.atom('client'), Bert.tuple(Bert.atom('game_action'), 1000001, 'okey_take', [Bert.tuple(Bert.atom('pile'), 0))))));",
+    Msg = "ws.send(Bert.encodebuf(Bert.tuple(Bert.atom('client'),"
+        " Bert.tuple(Bert.atom('game_action'), 1000001, Bert.atom('okey_take'), {pile: 0} ) )));",
     wf:wire(Msg);
     wf:wire(Msg);
 
 
 %%-record('OkeyPiece', {
 %%-record('OkeyPiece', {

+ 1 - 1
apps/server/include/requests.hrl

@@ -67,7 +67,7 @@
 
 
 -record(game_action, {
 -record(game_action, {
           game      :: 'GameId'(),
           game      :: 'GameId'(),
-          action    :: string(),
+          action    :: atom(),
           args = [] :: proplist()
           args = [] :: proplist()
          }).
          }).
 %%%
 %%%