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

psu_game: Don't reload the area twice in story missions when the NPC follows.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-09-12 23:42:36 +02:00
parent 3c90c8e4bc
commit c2adcb7018
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/psu/psu_game.erl
View File

@ -543,8 +543,15 @@ events(Events) ->
%% @todo When changing lobby to the room, 0230 must also be sent. Same when going from room to lobby. %% @todo When changing lobby to the room, 0230 must also be sent. Same when going from room to lobby.
%% @todo Probably move area_load inside the event and make other events call this one when needed. %% @todo Probably move area_load inside the event and make other events call this one when needed.
event({area_change, QuestID, ZoneID, MapID, EntryID}) -> event({area_change, QuestID, ZoneID, MapID, EntryID}) ->
log("area change (~b,~b,~b,~b)", [QuestID, ZoneID, MapID, EntryID]), event({area_change, QuestID, ZoneID, MapID, EntryID, 16#ffffffff});
area_load(QuestID, ZoneID, MapID, EntryID); event({area_change, QuestID, ZoneID, MapID, EntryID, PartyPos}) ->
case PartyPos of
16#ffffffff ->
log("area change (~b,~b,~b,~b,~b)", [QuestID, ZoneID, MapID, EntryID, PartyPos]),
area_load(QuestID, ZoneID, MapID, EntryID);
_Any -> %% @todo Handle area_change event for NPCs in story missions.
ignore
end;
%% @doc Chat broadcast handler. Dispatch the message to everyone (for now). %% @doc Chat broadcast handler. Dispatch the message to everyone (for now).
%% Disregard the name sent by the server. Use the name saved in memory instead, to prevent client-side editing. %% Disregard the name sent by the server. Use the name saved in memory instead, to prevent client-side editing.

7
src/psu/psu_proto.erl
View File

@ -334,7 +334,7 @@ parse(Size, 16#0806, Channel, Data) ->
parse(Size, 16#0807, Channel, Data) -> parse(Size, 16#0807, Channel, Data) ->
<< _LID:16/little, VarA:16/little, VarB:32/little, VarC:32/little, VarD:32/little, VarE:32/little, VarF:32/little, VarG:32/little, VarH:32/little, VarI:32/little, << _LID:16/little, VarA:16/little, VarB:32/little, VarC:32/little, VarD:32/little, VarE:32/little, VarF:32/little, VarG:32/little, VarH:32/little, VarI:32/little,
QuestID:32/little, ZoneID:16/little, MapID:16/little, EntryID:16/little, _AreaChangeNb:16/little, VarJ:32/little >> = Data, QuestID:32/little, ZoneID:16/little, MapID:16/little, EntryID:16/little, _AreaChangeNb:16/little, PartyPos:32/little >> = Data,
?ASSERT_EQ(Size, 60), ?ASSERT_EQ(Size, 60),
?ASSERT_EQ(Channel, 2), ?ASSERT_EQ(Channel, 2),
?ASSERT_EQ(VarA, 0), ?ASSERT_EQ(VarA, 0),
@ -346,8 +346,7 @@ parse(Size, 16#0807, Channel, Data) ->
?ASSERT_EQ(VarG, 0), ?ASSERT_EQ(VarG, 0),
?ASSERT_EQ(VarH, 0), ?ASSERT_EQ(VarH, 0),
?ASSERT_EQ(VarI, 0), ?ASSERT_EQ(VarI, 0),
?ASSERT_EQ(VarJ, 16#ffffffff), {area_change, QuestID, ZoneID, MapID, EntryID, PartyPos};
{area_change, QuestID, ZoneID, MapID, EntryID};
%% @todo Probably safely ignored. Still, figure out VarJ. It can be different than 2. %% @todo Probably safely ignored. Still, figure out VarJ. It can be different than 2.
parse(Size, 16#0808, Channel, Data) -> parse(Size, 16#0808, Channel, Data) ->
@ -899,7 +898,7 @@ parse(Size, 16#0f0a, Channel, Data) ->
?ASSERT_EQ(VarV, 1), ?ASSERT_EQ(VarV, 1),
?ASSERT_EQ(VarW, 0), ?ASSERT_EQ(VarW, 0),
?ASSERT(), ?ASSERT(),
ignore; %% @todo object_goggle_target_??? ignore; %% @todo object_goggle_target_activate
[56, 25] -> [56, 25] ->
?ASSERT_EQ(VarN, 16#ffffffff), ?ASSERT_EQ(VarN, 16#ffffffff),
?ASSERT_EQ(VarO, 16#ffffffff), ?ASSERT_EQ(VarO, 16#ffffffff),