Last set of minor cleanups

[minetest.git] / src / clientserver.h

diff --git a/src/clientserver.h b/src/clientserver.h
index 07e7b831d4b62388860aea3091e1490e2dd94449..52b9dc7b044c6f7073261895762fdc8bad24a93d 100644 (file)
--- a/src/clientserver.h
+++ b/src/clientserver.h
@@ -1,6 +1,6 @@
 /*
 Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -20,7 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CLIENTSERVER_HEADER
 #define CLIENTSERVER_HEADER
 
-#include "util/serialize.h"
+#include "util/pointer.h"
+
+SharedBuffer<u8> makePacket_TOCLIENT_TIME_OF_DAY(u16 time, float time_speed);
 
 /*
        changes by PROTOCOL_VERSION:
@@ -58,11 +60,38 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        PROTOCOL_VERSION 11:
                TileDef in ContentFeatures
                Nodebox drawtype
-               Added after a release: TOCLIENT_INVENTORY_FORMSPEC
+               (some dev snapshot)
+               TOCLIENT_INVENTORY_FORMSPEC
+               (0.4.0, 0.4.1)
+       PROTOCOL_VERSION 12:
+               TOSERVER_INVENTORY_FIELDS
+               16-bit node ids
+               TOCLIENT_DETACHED_INVENTORY
+       PROTOCOL_VERSION 13:
+               InventoryList field "Width" (deserialization fails with old versions)
+       PROTOCOL_VERSION 14:
+               Added transfer of player pressed keys to the server
+               Added new messages for mesh and bone animation, as well as attachments
+               GENERIC_CMD_SET_ANIMATION
+               GENERIC_CMD_SET_BONE_POSITION
+               GENERIC_CMD_SET_ATTACHMENT
+       PROTOCOL_VERSION 15:
+               Serialization format changes
+       PROTOCOL_VERSION 16:
+               TOCLIENT_SHOW_FORMSPEC
 */
 
-#define PROTOCOL_VERSION 11
+#define LATEST_PROTOCOL_VERSION 16
+
+// Server's supported network protocol range
+#define SERVER_PROTOCOL_VERSION_MIN 13
+#define SERVER_PROTOCOL_VERSION_MAX LATEST_PROTOCOL_VERSION
 
+// Client's supported network protocol range
+#define CLIENT_PROTOCOL_VERSION_MIN 13
+#define CLIENT_PROTOCOL_VERSION_MAX LATEST_PROTOCOL_VERSION
+
+// Constant that differentiates the protocol from random data and other protocols
 #define PROTOCOL_ID 0x4f457403
 
 #define PASSWORD_SIZE 28       // Maximum password length. Allows for
@@ -81,6 +110,7 @@ enum ToClientCommand
                [2] u8 deployed version
                [3] v3s16 player's position + v3f(0,BS/2,0) floatToInt'd 
                [12] u64 map seed (new as of 2011-02-27)
+               [20] f1000 recommended send interval (in seconds) (new as of 14)
 
                NOTE: The position in here is deprecated; position is
                      explicitly sent afterwards
@@ -239,6 +269,8 @@ enum ToClientCommand
                        u32 length of data
                        data
                }
+               u16 length of remote media server url (if applicable)
+               string url
        */
        
        TOCLIENT_TOOLDEF = 0x39,
@@ -316,6 +348,22 @@ enum ToClientCommand
                u32 len
                u8[len] formspec
        */
+
+       TOCLIENT_DETACHED_INVENTORY = 0x43,
+       /*
+               [0] u16 command
+               u16 len
+               u8[len] name
+               [2] serialized inventory
+       */
+       TOCLIENT_SHOW_FORMSPEC = 0x44,
+       /*
+               [0] u16 command
+               u32 len
+               u8[len] formspec
+               u16 len
+               u8[len] formname
+       */
 };
 
 enum ToServerCommand
@@ -328,7 +376,8 @@ enum ToServerCommand
                [2] u8 SER_FMT_VER_HIGHEST
                [3] u8[20] player_name
                [23] u8[28] password (new in some version)
-               [51] u16 client network protocol version (new in some version)
+               [51] u16 minimum supported network protocol version (added sometime)
+               [53] u16 maximum supported network protocol version (added later than the previous one)
        */
 
        TOSERVER_INIT2 = 0x11,
@@ -350,6 +399,7 @@ enum ToServerCommand
                [2+12] v3s32 speed*100
                [2+12+12] s32 pitch*100
                [2+12+12+4] s32 yaw*100
+               [2+12+12+4+4] u32 keyPressed
        */
 
        TOSERVER_GOTBLOCKS = 0x24,
@@ -510,6 +560,19 @@ enum ToServerCommand
                        u8[len] field value
        */
 
+       TOSERVER_INVENTORY_FIELDS = 0x3c,
+       /*
+               u16 command
+               u16 len
+               u8[len] form name (reserved for future use)
+               u16 number of fields
+               for each field:
+                       u16 len
+                       u8[len] field name
+                       u32 len
+                       u8[len] field value
+       */
+
        TOSERVER_REQUEST_MEDIA = 0x40,
        /*
                u16 command
@@ -520,16 +583,11 @@ enum ToServerCommand
                }
         */
 
+       TOSERVER_RECEIVED_MEDIA = 0x41,
+       /*
+               u16 command
+       */
 };
 
-inline SharedBuffer<u8> makePacket_TOCLIENT_TIME_OF_DAY(u16 time, float time_speed)
-{
-       SharedBuffer<u8> data(2+2+4);
-       writeU16(&data[0], TOCLIENT_TIME_OF_DAY);
-       writeU16(&data[2], time);
-       writeF1000(&data[4], time_speed);
-       return data;
-}
-
 #endif