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

psu_proto: Move send_1211 to psu_proto without reviewing it.

Browse Source
This commit is contained in:
Loïc Hoguin 2011-02-26 21:57:30 +01:00
parent 7415da1c89
commit 4848b3c218
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/egs_game.erl
View File

@ -598,14 +598,14 @@ event({object_box_destroy, ObjectID}, _Client) ->
psu_game:send_1213(ObjectID, 3);
%% @todo Second send_1211 argument should be User#users.lid. Fix when it's correctly handled.
event({object_chair_sit, ObjectTargetID}, _Client) ->
event({object_chair_sit, ObjectTargetID}, Client) ->
%~ {ok, User} = egs_users:read(get(gid)),
psu_game:send_1211(ObjectTargetID, 0, 8, 0);
psu_proto:send_1211(ObjectTargetID, 0, 8, 0, Client);
%% @todo Second psu_game:send_1211 argument should be User#users.lid. Fix when it's correctly handled.
event({object_chair_stand, ObjectTargetID}, _Client) ->
event({object_chair_stand, ObjectTargetID}, Client) ->
%~ {ok, User} = egs_users:read(get(gid)),
psu_game:send_1211(ObjectTargetID, 0, 8, 2);
psu_proto:send_1211(ObjectTargetID, 0, 8, 2, Client);
event({object_crystal_activate, ObjectID}, _Client) ->
psu_game:send_1213(ObjectID, 1);
@ -678,13 +678,13 @@ event({object_vehicle_boost_respawn, ObjectID}, _Client) ->
psu_game:send_1213(ObjectID, 0);
%% @todo Second send_1211 argument should be User#users.lid. Fix when it's correctly handled.
event({object_warp_take, BlockID, ListNb, ObjectNb}, #client{gid=GID}) ->
event({object_warp_take, BlockID, ListNb, ObjectNb}, Client=#client{gid=GID}) ->
{ok, User} = egs_users:read(GID),
Pos = psu_instance:warp_event(User#users.instancepid, element(2, User#users.area), BlockID, ListNb, ObjectNb),
NewUser = User#users{pos=Pos},
egs_users:write(NewUser),
psu_game:send_0503(User#users.pos),
psu_game:send_1211(16#ffffffff, 0, 14, 0);
psu_proto:send_1211(16#ffffffff, 0, 14, 0, Client);
%% @todo Don't send_0204 if the player is removed from the party while in the lobby I guess.
event({party_remove_member, PartyPos}, Client=#client{gid=GID}) ->

5
src/psu/psu_game.erl
View File

@ -337,11 +337,6 @@ send_1016(PartyPos) ->
GID = get(gid),
send(<< 16#10160300:32, 16#ffff0000:32, 0:128, 16#00011300:32, GID:32/little, 0:64, PartyPos:32/little >>).
%% @todo Object interaction? Figure out. C probably the interaction type.
%% @todo Apparently A would be TargetID/ffffffff, B would be the player LID, C would be the object type? D still completely unknown.
send_1211(A, B, C, D) ->
send(<< (header(16#1211))/binary, A:32/little, B:32/little, C:32/little, D:32/little >>).
%% @doc Make the client load the quest previously sent.
send_1212() ->
send(<< (header(16#1212))/binary, 0:19200 >>).

6
src/psu/psu_proto.erl
View File

@ -1601,6 +1601,12 @@ send_1207(#client{socket=Socket, gid=DestGID}) ->
packet_send(Socket, << 16#12070300:32, 16#ffff:16, 0:144, 16#00011300:32, DestGID:32/little, 0:64,
Chunk/binary, Chunk/binary, Chunk/binary, Chunk/binary, Chunk/binary, Chunk/binary >>).
%% @todo Object interaction? Figure out. C probably the interaction type.
%% @todo Apparently A would be TargetID/ffffffff, B would be the player LID, C would be the object type? D still completely unknown.
%% @todo This packet hasn't been reviewed at all yet.
send_1211(A, B, C, D, #client{socket=Socket, gid=DestGID}) ->
packet_send(Socket, << 16#12110300:32, 16#ffff:16, 0:144, 16#00011300:32, DestGID:32/little, 0:64, A:32/little, B:32/little, C:32/little, D:32/little >>).
%% @doc Send the player's partner card.
%% @todo Handle the LID and comment properly.
send_1500(Character, #client{socket=Socket, gid=DestGID}) ->