X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclientserver.h;h=9d319275488725b10e1ba7b3a3c1af50812d2290;hb=0931d4b7ff95dc9b51bee28851c3780b2648ffd0;hp=a64a11f08a858d0f387036bce21fec32c07458cd;hpb=76e241392d2ad232b751c74df7cba9e5acfa7855;p=dragonfireclient.git

diff --git a/src/clientserver.h b/src/clientserver.h
index a64a11f08..9d3192754 100644
--- a/src/clientserver.h
+++ b/src/clientserver.h
@@ -24,6 +24,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define PROTOCOL_ID 0x4f457403
 
+#define PASSWORD_SIZE 28       // Maximum password length. Allows for
+                               // base64-encoded SHA-1 (27+\0).
+
 enum ToClientCommand
 {
 	TOCLIENT_INIT = 0x10,
@@ -34,7 +37,7 @@ enum ToClientCommand
 		[0] u16 TOSERVER_INIT
 		[2] u8 deployed version
 		[3] v3s16 player's position + v3f(0,BS/2,0) floatToInt'd 
-		([4] u64 map seed (new as of 2011-02-27))
+		[12] u64 map seed (new as of 2011-02-27)
 
 		NOTE: The position in here is deprecated; position is
 		      explicitly sent afterwards
@@ -87,6 +90,7 @@ enum ToClientCommand
 		u16 command
 		u16 number of player positions
 		for each player:
+			u16 peer_id
 			v3s32 position*100
 			v3s32 speed*100
 			s32 pitch*100
@@ -121,7 +125,7 @@ enum ToClientCommand
 		for all added objects {
 			u16 id
 			u8 type
-			u16 initialization data length
+			u32 initialization data length
 			string initialization data
 		}
 	*/
@@ -154,6 +158,19 @@ enum ToClientCommand
 	TOCLIENT_ACCESS_DENIED = 0x35,
 	/*
 		u16 command
+		u16 reason_length
+		wstring reason
+	*/
+
+	TOCLIENT_PLAYERITEM = 0x36,
+	/*
+		u16 command
+		u16 count of player items
+		for all player items {
+			u16 peer id
+			u16 length of serialized item
+			string serialized item
+		}
 	*/
 };
 
@@ -166,7 +183,8 @@ enum ToServerCommand
 		[0] u16 TOSERVER_INIT
 		[2] u8 SER_FMT_VER_HIGHEST
 		[3] u8[20] player_name
-		[23] u8[28] password
+		[23] u8[28] password (new in some version)
+		[51] u16 client network protocol version (new in some version)
 	*/
 
 	TOSERVER_INIT2 = 0x11,
@@ -285,6 +303,24 @@ enum ToServerCommand
 		u16 command
 		u8 amount
 	*/
+
+	TOSERVER_PASSWORD=0x36,
+	/*
+		Sent to change password.
+
+		[0] u16 TOSERVER_PASSWORD
+		[2] u8[28] old password
+		[30] u8[28] new password
+	*/
+
+	TOSERVER_PLAYERITEM=0x37,
+	/*
+		Sent to change selected item.
+
+		[0] u16 TOSERVER_PLAYERITEM
+		[2] u16 item
+	*/
+
 };
 
 inline SharedBuffer<u8> makePacket_TOCLIENT_TIME_OF_DAY(u16 time)