Просмотр исходного кода

return to linked processes and fix gameId

Maxim Sokhatsky 11 лет назад
Родитель
Сommit
b8fa95d97d

+ 1 - 1
apps/server/src/game_session.erl

@@ -24,7 +24,7 @@ process_request(Pid, Msg) -> gen_server:call(Pid, {client_request, Msg}).
 process_request(Pid, Source, Msg) -> gen_server:call(Pid, {client_request, Msg}).
 process_request(Pid, Source, Msg) -> gen_server:call(Pid, {client_request, Msg}).
 send_message_to_player(Pid, Message) -> Pid ! {server,Message}, ok.
 send_message_to_player(Pid, Message) -> Pid ! {server,Message}, ok.
 
 
-init([RPC]) -> MonRef = 0, %erlang:monitor(process, RPC), 
+init([RPC]) -> MonRef = erlang:monitor(process, RPC), 
    {ok, #state{rpc = RPC, rpc_mon = MonRef}}.
    {ok, #state{rpc = RPC, rpc_mon = MonRef}}.
 handle_call({client_request, Request}, From, State) -> handle_client_request(Request, From, State);
 handle_call({client_request, Request}, From, State) -> handle_client_request(Request, From, State);
 handle_call(Request, From, State) ->
 handle_call(Request, From, State) ->

+ 1 - 0
apps/web/priv/static/app/js/okey/apiprovider.js

@@ -5,6 +5,7 @@ function OkeyApiProviderScope(scope) {
     {
     {
         options = options || {};
         options = options || {};
         this.url = options.url;
         this.url = options.url;
+        this.gameId = options.gameId;
         this.proxies = [ "init", "handleMessage", "actionTake" ], 
         this.proxies = [ "init", "handleMessage", "actionTake" ], 
         this.proxyAll();
         this.proxyAll();
         this.socket = new WebSocket(this.url);
         this.socket = new WebSocket(this.url);

+ 2 - 2
apps/web/priv/static/app/js/okey/app.js

@@ -252,9 +252,9 @@ function initOkeyScene(e)
 
 
     var piles = e.detail.piles;
     var piles = e.detail.piles;
 
 
-    if (piles && "null" != piles) for (var i = 0; i < piles.length, pile; i++)
+    if (piles && "null" != piles) for (var i = 0; i < piles.length; i++)
     {
     {
-        pile = piles[i];
+        var pile = piles[i];
         for (var name in pile) 
         for (var name in pile) 
             for (var playerPile = pile[name],
             for (var playerPile = pile[name],
                      hand = playersLeftHandsMap[name],
                      hand = playersLeftHandsMap[name],

+ 1 - 1
apps/web/priv/static/app/js/okey/deck.js

@@ -115,7 +115,7 @@ function DeckScope(scope) {
 
 
         select: function(e) {
         select: function(e) {
             selected = null, this.each(function(card) {
             selected = null, this.each(function(card) {
-                return card && card.$el[0] == e.target ? (selected = card, !1) : void 0;
+                return card && card.$el[0] == e.target ? (selected = card, !1) : !0;
             });
             });
         },
         },
 
 

+ 1 - 0
apps/web/priv/static/app/js/selector.js

@@ -1,5 +1,6 @@
 var scope = {
 var scope = {
     apiUrl: "ws://localhost:8080/ws/",
     apiUrl: "ws://localhost:8080/ws/",
+    gameId: 1000001,
     CARD_SOURCE: "svg/Card.svg",
     CARD_SOURCE: "svg/Card.svg",
     CARD_SMALL_SOURCE: "svg/Card-Small.svg",
     CARD_SMALL_SOURCE: "svg/Card-Small.svg",
     CARD_COLORS: [ "#CE290F", "#3B5998", "#48AF5E", "#F8E81C" ],
     CARD_COLORS: [ "#CE290F", "#3B5998", "#48AF5E", "#F8E81C" ],

+ 1 - 1
apps/web/src/logallow.erl

@@ -4,7 +4,7 @@
 log_modules() -> [
 log_modules() -> [
 %    wf_core,
 %    wf_core,
 %    n2o_bullet,
 %    n2o_bullet,
-%    game_session,
+    game_session
 %    bullet_handler,
 %    bullet_handler,
 %    n2o_secret,
 %    n2o_secret,
 %    js_session,
 %    js_session,

+ 1 - 1
apps/web/src/okey.erl

@@ -174,7 +174,7 @@ event(player_info) ->
     wf:wire(Wire);
     wf:wire(Wire);
 
 
 event(attach) -> 
 event(attach) -> 
-    {ok,GamePid} = game_session:start(self()),
+    {ok,GamePid} = game_session:start_link(self()),
     wf:session(<<"game_pid">>,GamePid),
     wf:session(<<"game_pid">>,GamePid),
     User = user(),
     User = user(),
     wf:reg(User#user.id),
     wf:reg(User#user.id),