From 91f32909bd7352d877d469fd5d7a54ea04c55bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Wed, 22 Sep 2010 03:10:53 +0200 Subject: [PATCH] psu_proto: Pass the process state to send_0205. --- src/egs_game.erl | 2 +- src/psu/psu_game.erl | 2 +- src/psu/psu_proto.erl | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/egs_game.erl b/src/egs_game.erl index 3d721e2..6c1508c 100644 --- a/src/egs_game.erl +++ b/src/egs_game.erl @@ -271,7 +271,7 @@ event({counter_enter, CounterID, FromZoneID, FromMapID, FromEntryID}, State=#sta psu_proto:send_010d(User#egs_user_model{lid=0}, State), psu_game:send_0200(mission), psu_game:send_020f(ZoneFile, 0, 16#ff), - psu_proto:send_0205(User, 0), + psu_proto:send_0205(User, 0, State), psu_game:send_100e(16#7fffffff, 0, 0, AreaName, CounterID), psu_proto:send_0215(User, 0), psu_proto:send_0215(User, 0), diff --git a/src/psu/psu_game.erl b/src/psu/psu_game.erl index 39dfee1..9c4938a 100644 --- a/src/psu/psu_game.erl +++ b/src/psu/psu_game.erl @@ -164,7 +164,7 @@ area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName send_020f(ZoneFile, SetID, SeasonID); true -> ignore end, - psu_proto:send_0205(User#egs_user_model{lid=0}, IsSeasonal), + psu_proto:send_0205(User, IsSeasonal, State), send_100e(QuestID, ZoneID, (User#egs_user_model.area)#psu_area.mapid, AreaName, 16#ffffffff), if AreaType =:= mission -> psu_proto:send_0215(User#egs_user_model{lid=0}, 0), diff --git a/src/psu/psu_proto.erl b/src/psu/psu_proto.erl index 26d7e56..04609f9 100644 --- a/src/psu/psu_proto.erl +++ b/src/psu/psu_proto.erl @@ -1197,10 +1197,9 @@ send_0202(#state{socket=Socket, gid=DestGID}) -> %% @doc Make the client load a new map. %% @todo We set a value of 1 and not 0 after EntryID because this value is never found to be 0. -send_0205(DestUser, IsSeasonal) -> - #egs_user_model{socket=CSocket, id=GID, lid=LID, area=Area, entryid=EntryID} = DestUser, - #psu_area{zoneid=ZoneID, mapid=MapID} = Area, - packet_send(CSocket, << 16#02050300:32, LID:16/little, 0:144, 16#00011300:32, GID:32/little, 0:64, +send_0205(CharUser, IsSeasonal, #state{socket=Socket, gid=DestGID, lid=DestLID}) -> + #egs_user_model{area=#psu_area{zoneid=ZoneID, mapid=MapID}, entryid=EntryID} = CharUser, + packet_send(Socket, << 16#02050300:32, DestLID:16/little, 0:144, 16#00011300:32, DestGID:32/little, 0:64, 16#ffffffff:32, ZoneID:32/little, MapID:32/little, EntryID:32/little, 1:32/little, 0:24, IsSeasonal:8 >>). %% @todo No idea what this one does. For unknown reasons it uses channel 2.