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

psu_proto: Review and move send_1006 to psu_proto.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-09-23 19:55:03 +02:00
parent cbd785766a
commit 9b0b5c1dec
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/egs_game.erl
View File

@ -420,7 +420,7 @@ event(lumilass_options_request, _State) ->
%% @todo Probably replenish the player HP when entering a non-mission area rather than when aborting the mission?
event(mission_abort, State=#state{gid=GID}) ->
psu_game:send_1006(11, 0),
psu_proto:send_1006(11, State),
{ok, User} = egs_user_model:read(GID),
%% delete the mission
if User#egs_user_model.instancepid =:= undefined -> ignore;
@ -647,7 +647,7 @@ event({party_remove_member, PartyPos}, State=#state{gid=GID}) ->
npc -> egs_user_model:delete(RemovedGID);
_ -> ignore
end,
psu_game:send_1006(8, PartyPos),
psu_proto:send_1006(8, PartyPos, State),
psu_game:send_0204(DestUser, RemovedUser, 1),
psu_proto:send_0215(0, State);

10
src/psu/psu_game.erl
View File

@ -34,9 +34,9 @@ char_load(User) ->
send_0d01(User),
% 0246
send_0a0a((User#egs_user_model.character)#characters.inventory),
send_1006(5, 0),
psu_proto:send_1006(5, 0, State), %% @todo The 0 here is PartyPos, save it in User.
send_1005((User#egs_user_model.character)#characters.name),
send_1006(12, 0),
psu_proto:send_1006(12, State),
psu_proto:send_0210(State),
send_0222(),
send_1500(User),
@ -605,12 +605,6 @@ send_1005(Name) ->
GID = get(gid),
send(<< 16#10050300:32, 16#ffff:16, 0:144, 16#00011300:32, GID:32/little, 0:64, Before/binary, GID:32/little, 0:64, Name/binary, After/binary >>).
%% @doc Party-related command probably controlling the party state.
%% EventID 11 aborts the mission.
send_1006(EventID, PartyPos) ->
GID = get(gid),
send(<< 16#10060300:32, 16#ffff:16, 0:144, 16#00011300:32, GID:32/little, 0:64, EventID:8, PartyPos:8, 0:16 >>).
%% @doc Send the player's current location.
send_100e(QuestID, ZoneID, MapID, Location, CounterID) ->
GID = get(gid),

6
src/psu/psu_proto.erl
View File

@ -1307,6 +1307,12 @@ send_0d05(#state{socket=Socket, gid=DestGID}) ->
Size = 4 + byte_size(Packet),
ssl:send(Socket, << Size:32/little, Packet/binary >>).
%% @doc Party-related events.
send_1006(EventID, State) ->
send_1006(EventID, 0, State).
send_1006(EventID, PartyPos, #state{socket=Socket, gid=DestGID}) ->
packet_send(Socket, << 16#10060300:32, 16#ffff:16, 0:144, 16#00011300:32, DestGID:32/little, 0:64, EventID:8, PartyPos:8, 0:16 >>).
%% Utility functions.
%% @doc Return the language as an atom from its integer value.