From 9c7f8f6eaa8b9962f08a8f1f2b817b4602661049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@dev-extend.eu>
Date: Sat, 26 Feb 2011 22:44:51 +0100
Subject: [PATCH] psu_proto: Move send_1602 to psu_proto without reviewing it.

---
 src/psu/psu_game.erl  | 15 +--------------
 src/psu/psu_proto.erl | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/psu/psu_game.erl b/src/psu/psu_game.erl
index 1eed886..0410d6d 100644
--- a/src/psu/psu_game.erl
+++ b/src/psu/psu_game.erl
@@ -37,7 +37,7 @@ char_load(User, Client) ->
 	send_1501(),
 	send_1512(),
 	%% 0303
-	send_1602(),
+	psu_proto:send_1602(Client),
 	psu_proto:send_021b(Client).
 
 %% @doc Load the given map as a standard lobby.
@@ -356,16 +356,3 @@ send_1501() ->
 send_1512() ->
 	GID = get(gid),
 	send(<< 16#15120300:32, 16#ffff:16, 0:144, 16#00011300:32, GID:32/little, 0:46144 >>).
-
-%% @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() ->
-	NPCList = egs_npc_db:all(),
-	NbNPC = length(NPCList),
-	Bin = iolist_to_binary([<< NPCid:8, 0, 4, 0, 3, 0:24 >> || {NPCid, _Data} <- NPCList]),
-	MiddlePaddingSize = 8 * (344 - byte_size(Bin)),
-	PMName = "My PM",
-	UCS2PMName = << << X:8, 0:8 >> || X <- PMName >>,
-	EndPaddingSize = 8 * (64 - byte_size(UCS2PMName)),
-	GID = get(gid),
-	send(<< 16#16020300:32, 16#ffff:16, 0:144, 16#00011300:32, GID:32/little, 0:96, Bin/binary, 0:MiddlePaddingSize, NbNPC, 0:24, UCS2PMName/binary, 0:EndPaddingSize, 0:32 >>).
diff --git a/src/psu/psu_proto.erl b/src/psu/psu_proto.erl
index 463d11a..e40317a 100644
--- a/src/psu/psu_proto.erl
+++ b/src/psu/psu_proto.erl
@@ -1644,6 +1644,20 @@ 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 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.
+%% @todo This packet hasn't been reviewed at all yet.
+send_1602(#client{socket=Socket, gid=DestGID}) ->
+	NPCList = egs_npc_db:all(),
+	NbNPC = length(NPCList),
+	Bin = iolist_to_binary([<< NPCid:8, 0, 4, 0, 3, 0:24 >> || {NPCid, _Data} <- NPCList]),
+	MiddlePaddingSize = 8 * (344 - byte_size(Bin)),
+	PMName = "My PM",
+	UCS2PMName = << << X:8, 0:8 >> || X <- PMName >>,
+	EndPaddingSize = 8 * (64 - byte_size(UCS2PMName)),
+	packet_send(Socket, << 16#16020300:32, 16#ffff:16, 0:144, 16#00011300:32, DestGID:32/little, 0:96,
+		Bin/binary, 0:MiddlePaddingSize, NbNPC, 0:24, UCS2PMName/binary, 0:EndPaddingSize, 0:32 >>).
+
 %% @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.