Merge branch 'master' of github.com:Spawnfest2012/win

spawnfest · Jul 8, 2012 · 3119dae · 3119dae
2 parents d30ad31 + e8d6be8
commit 3119dae
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/apps/browserquest_srv/src/browserquest_srv_app.erl b/apps/browserquest_srv/src/browserquest_srv_app.erl
@@ -37,6 +37,7 @@ start(_StartType, _StartArgs) ->
         cowboy_tcp_transport, [{port, ListeningPort}],
         cowboy_http_protocol, [{dispatch, Dispatch}]
     ),
+
     browserquest_srv_sup:start_link().
 
 stop(_State) ->

diff --git a/apps/browserquest_srv/src/browserquest_srv_entity_handler.erl b/apps/browserquest_srv/src/browserquest_srv_entity_handler.erl
@@ -191,8 +191,8 @@ ensure_bin(Bin) when is_binary(Bin) ->
 %%% Exported functions
 %%%===================================================================
 make_zone(PosX, PosY) ->
-    Zone = erlang:trunc(PosX/(PosX rem 28))*erlang:trunc(PosY/(PosY rem 11)),
-    ZoneString = erlang:integer_to_list(Zone),
+    ZoneString = erlang:integer_to_list(PosX) ++ "x" ++
+        erlang:integer_to_list(PosY) ++ "y",
     ensure_bin("ZONE"++ZoneString).
 
 generate_id(InitialValue) when is_list(InitialValue) ->

diff --git a/apps/browserquest_srv/src/browserquest_srv_handler.erl b/apps/browserquest_srv/src/browserquest_srv_handler.erl
@@ -162,5 +162,5 @@ make_tick(Node, TickTime) ->
 	    make_tick(Node, TickTime)
     end.
 
-add_mob(#mobarea{id = Id, type = Type, x = X, y = Y}) ->
-    browserquest_srv_mob_sup:add_child(Id, Type, X, Y).
+add_mob(#mobarea{type = Type, x = X, y = Y}) ->
+    browserquest_srv_mob_sup:add_child(Type, X, Y).
diff --git a/apps/browserquest_srv/src/browserquest_srv_mob_sup.erl b/apps/browserquest_srv/src/browserquest_srv_mob_sup.erl
@@ -11,7 +11,7 @@
 -behaviour(supervisor).
 
 %% API
--export([start_link/0, add_child/4]).
+-export([start_link/0, add_child/3]).
 
 %% Supervisor callbacks
 -export([init/1]).
@@ -40,14 +40,14 @@ init([]) ->
 %%%===================================================================
 %%% Internal functions
 %%%===================================================================
-add_child(Id, MobType, X, Y) ->
+add_child(MobType, X, Y) ->
     Restart = permanent,
     Shutdown = 2000,
     ChildType = worker,
 
     Mob = 
         {erlang:make_ref(),
-         {browserquest_srv_mob, start_link, [Id, MobType, X, Y]},
+         {browserquest_srv_mob, start_link, [MobType, X, Y]},
          Restart, Shutdown, ChildType, [browserquest_srv_mob]},
     {ok, Pid} = supervisor:start_child(?SERVER, Mob),
     Pid.
diff --git a/apps/browserquest_srv/src/browserquest_srv_player.erl b/apps/browserquest_srv/src/browserquest_srv_player.erl
@@ -114,7 +114,7 @@ handle_call({move, X, Y}, _From, State = #state{pos_x = OldX, pos_y = OldY,
         true ->
             {reply, {ok, [Id, OldX, OldY]}, State};
         _ ->
-            browserquest_srv_player_handler:event(
+            browserquest_srv_entity_handler:event(
               Zone, ?WARRIOR, {action, [?MOVE, Id, X, Y]}),
             {reply, {ok, [Id, X, Y]}, State#state{pos_x = X, pos_y = Y}}
     end;

diff --git a/apps/browserquest_srv/src/browserquest_srv_sup.erl b/apps/browserquest_srv/src/browserquest_srv_sup.erl
@@ -64,18 +64,19 @@ init([]) ->
         {browserquest_srv_map,
          {browserquest_srv_map, start_link, [MapFile]},
          Restart, Shutdown, Type, [browserquest_srv_map]},
-    PlayerHandler = 
-        {browserquest_srv_player_handler,
-         {browserquest_srv_player_handler, start_link, []},
-         Restart, Shutdown, Type, [browserquest_srv_player_handler]},
 
     MobSup = 
         {browserquest_srv_mob_sup,
          {browserquest_srv_mob_sup, start_link, []},
          Restart, Shutdown, Type, [browserquest_srv_mob_sup]},
 
+    EntityHandler = 
+        {browserquest_srv_entity_handler,
+         {browserquest_srv_entity_handler, start_link, []},
+         Restart, Shutdown, Type, [browserquest_srv_entity_handler]},
 
-    {ok, {SupFlags, [Map, MobSup, PlayerHandler]}}.
+
+    {ok, {SupFlags, [Map, MobSup, EntityHandler]}}.
 
 %%%===================================================================
 %%% Internal functions