Sancaros/egs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

game: Fix warping and rename some related variables.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-06-30 14:02:52 +02:00
parent 0e05b01ce5
commit c894ebe84a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/egs.erl
View File

@ -49,11 +49,11 @@ global(Type, Message) ->
%% @doc Warp all players to a new map.
warp(Quest, MapType, MapNumber, MapEntry) ->
lists:foreach(fun(User) -> egs_game:area_load(User#users.socket, User#users.gid, Quest, MapType, MapNumber, MapEntry) end, egs_db:users_select_all()).
warp(QuestID, ZoneID, MapID, EntryID) ->
lists:foreach(fun(User) -> User#users.pid ! {psu_warp, QuestID, ZoneID, MapID, EntryID} end, egs_db:users_select_all()).
%% @doc Warp one player to a new map.
warp(GID, Quest, MapType, MapNumber, MapEntry) ->
warp(GID, QuestID, ZoneID, MapID, EntryID) ->
User = egs_db:users_select(GID),
egs_game:area_load(User#users.socket, User#users.gid, Quest, MapType, MapNumber, MapEntry).
User#users.pid ! {psu_warp, QuestID, ZoneID, MapID, EntryID}.

3
src/egs_game.erl
View File

@ -461,6 +461,9 @@ loop(SoFar) ->
{psu_player_unspawn, Spawn} ->
send_0204(Spawn#users.gid, Spawn#users.lid, 5),
?MODULE:loop(SoFar);
{psu_warp, QuestID, ZoneID, MapID, EntryID} ->
area_load(QuestID, ZoneID, MapID, EntryID),
?MODULE:loop(SoFar);
{ssl, _, Data} ->
{Packets, Rest} = egs_proto:packet_split(<< SoFar/bits, Data/bits >>),
[dispatch(Orig) || Orig <- Packets],