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

psu_proto: Move send_1601 to psu_proto without reviewing it.

Browse Source
This commit is contained in:
Loïc Hoguin 2011-02-26 22:18:19 +01:00
parent 250a22dea8
commit 023214793c
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/egs_game.erl
View File

@ -485,7 +485,7 @@ event({npc_force_invite, NPCid}, Client=#client{gid=GID}) ->
psu_proto:send_022c(0, 16#12, Client),
psu_game:send_1004(npc_mission, SentNPCUser, PartyPos),
psu_proto:send_100f((SentNPCUser#users.character)#characters.npcid, PartyPos, Client),
psu_game:send_1601(PartyPos);
psu_proto:send_1601(PartyPos, Client);
%% @todo Also at the end send a 101a (NPC:16, PartyPos:16, ffffffff). Not sure about PartyPos.
event({npc_invite, NPCid}, Client=#client{gid=GID}) ->

7
src/psu/psu_game.erl
View File

@ -122,7 +122,7 @@ npc_load(Leader, [{PartyPos, NPCGID}|NPCList], Client) ->
send_0a04(NPCUser#users.gid),
send_1004(npc_mission, NPCUser, PartyPos),
psu_proto:send_100f((NPCUser#users.character)#characters.npcid, PartyPos, Client),
send_1601(PartyPos),
psu_proto:send_1601(PartyPos, Client),
send_1016(PartyPos),
npc_load(Leader, NPCList, Client).
@ -362,11 +362,6 @@ send_1512() ->
GID = get(gid),
send(<< 16#15120300:32, 16#ffff:16, 0:144, 16#00011300:32, GID:32/little, 0:46144 >>).
%% @todo NPC related packet, sent when there's an NPC in the area.
send_1601(PartyPos) ->
{ok, << _:32, Bin/bits >>} = file:read_file("p/packet1601.bin"),
send(<< (header(16#1601))/binary, PartyPos:32/little, Bin/binary >>).
%% @doc Send the player's NPC and PM information.
%% @todo The value 4 is the card priority. Find what 3 is. When sending, the first 0 is an unknown value.
send_1602() ->

6
src/psu/psu_proto.erl
View File

@ -1638,6 +1638,12 @@ send_1500(Character, #client{socket=Socket, gid=DestGID}) ->
Name/binary, RaceBin:8, GenderBin:8, ClassBin:8, VoiceType:8, VoicePitch:8, 0:24,
DestGID:32/little, 0:224, Comment/binary, 1, 4, 1, Slot, 0:64 >>).
%% @todo NPC related packet, sent when there's an NPC in the area.
%% @todo This packet hasn't been reviewed at all yet.
send_1601(PartyPos, #client{socket=Socket, gid=DestGID}) ->
{ok, << _:32, Bin/bits >>} = file:read_file("p/packet1601.bin"),
packet_send(Socket, << 16#16010300:32, 16#ffff:16, 0:144, 16#00011300:32, DestGID:32/little, 0:64, PartyPos:32/little, Bin/binary >>).
%% @doc Send the list of parties to join.
%% @todo Handle lists of parties.
%% @todo Probably has to handle a LID here, although it should always be 0.