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

psu_proto: Move counter_options_request to events.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-08-21 18:39:15 +02:00
parent cfb14d9901
commit e4b2ab8a75
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/psu/psu_game.erl
View File

@ -569,6 +569,13 @@ event(counter_leave) ->
PrevArea = User#egs_user_model.prev_area, PrevArea = User#egs_user_model.prev_area,
area_load(PrevArea#psu_area.questid, PrevArea#psu_area.zoneid, PrevArea#psu_area.mapid, User#egs_user_model.prev_entryid); area_load(PrevArea#psu_area.questid, PrevArea#psu_area.zoneid, PrevArea#psu_area.mapid, User#egs_user_model.prev_entryid);
%% @doc Send the code for the background image to use. But there's more that should be sent though.
%% @todo Apparently background values 1 2 3 are never used on official servers. Find out why.
event({counter_options_request, CounterID}) ->
log("counter options request ~p", [CounterID]),
[{quests, _}, {bg, Background}|_Tail] = proplists:get_value(CounterID, ?COUNTERS),
send_1711(Background);
%% @doc Request the counter's quest files. %% @doc Request the counter's quest files.
event({counter_quest_files_request, CounterID}) -> event({counter_quest_files_request, CounterID}) ->
log("counter quest files request ~p", [CounterID]), log("counter quest files request ~p", [CounterID]),
@ -997,13 +1004,6 @@ handle(16#1709, _) ->
handle(16#170b, _) -> handle(16#170b, _) ->
send_170c(); send_170c();
%% @doc Counter initialization handler? Send the code for the background image to use.
%% @todo Handle correctly.
handle(16#1710, _) ->
{ok, User} = egs_user_model:read(get(gid)),
[{quests, _}, {bg, Background}, {options, _}] = proplists:get_value(User#egs_user_model.counterid, ?COUNTERS),
send_1711(Background);
%% @doc Dialog request handler. Do what we can. %% @doc Dialog request handler. Do what we can.
%% @todo Handle correctly. %% @todo Handle correctly.
handle(16#1a01, Data) -> handle(16#1a01, Data) ->

16
src/psu/psu_proto.erl
View File

@ -303,6 +303,22 @@ parse(Size, 16#0c0f, Channel, Data) ->
?ASSERT_EQ(VarI, 0), ?ASSERT_EQ(VarI, 0),
{counter_quest_options_request, CounterID}; {counter_quest_options_request, CounterID};
parse(Size, 16#1710, 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, CounterID:32/little >> = Data,
?ASSERT_EQ(Size, 48),
?ASSERT_EQ(Channel, 2),
?ASSERT_EQ(VarA, 0),
?ASSERT_EQ(VarB, 0),
?ASSERT_EQ(VarC, 0),
?ASSERT_EQ(VarD, 0),
?ASSERT_EQ(VarE, 0),
?ASSERT_EQ(VarF, 0),
?ASSERT_EQ(VarG, 0),
?ASSERT_EQ(VarH, 0),
?ASSERT_EQ(VarI, 0),
{counter_options_request, CounterID};
parse(_Size, Command, Channel, Data) -> parse(_Size, Command, Channel, Data) ->
%% @todo log unknown command? %% @todo log unknown command?
%~ ignore. %~ ignore.