NetworkPacket: reading outside packet is now clearer.

[dragonfireclient.git] / src / network / serveropcodes.cpp

diff --git a/src/network/serveropcodes.cpp b/src/network/serveropcodes.cpp
index 11d2c65eac0b6717a0e39f62e3b298a3c75f5fea..9c1da9ad17a6b48ed6c464260d60ec60dd08625e 100644 (file)
--- a/src/network/serveropcodes.cpp
+++ b/src/network/serveropcodes.cpp
@@ -24,10 +24,10 @@ const static ToServerCommandHandler null_command_handler = { "TOSERVER_NULL", TO
 
 const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES] =
 {
-       null_command_handler, // 0x00
+       null_command_handler, // 0x00 (never use this)
        null_command_handler, // 0x01
-       null_command_handler, // 0x02
-       null_command_handler, // 0x03
+       { "TOSERVER_INIT",                    TOSERVER_STATE_NOT_CONNECTED, &Server::handleCommand_Init }, // 0x02
+       { "TOSERVER_AUTH",                    TOSERVER_STATE_NOT_CONNECTED, &Server::handleCommand_Auth }, // 0x03
        null_command_handler, // 0x04
        null_command_handler, // 0x05
        null_command_handler, // 0x06
@@ -40,7 +40,7 @@ const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES] =
        null_command_handler, // 0x0d
        null_command_handler, // 0x0e
        null_command_handler, // 0x0f
-       { "TOSERVER_INIT",                     TOSERVER_STATE_NOT_CONNECTED, &Server::handleCommand_Init }, // 0x10
+       { "TOSERVER_INIT_LEGACY",              TOSERVER_STATE_NOT_CONNECTED, &Server::handleCommand_Init_Legacy }, // 0x10
        { "TOSERVER_INIT2",                    TOSERVER_STATE_NOT_CONNECTED, &Server::handleCommand_Init2 }, // 0x11
        null_command_handler, // 0x12
        null_command_handler, // 0x13
@@ -78,14 +78,14 @@ const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES] =
        { "TOSERVER_SIGNNODETEXT",             TOSERVER_STATE_INGAME, &Server::handleCommand_Deprecated }, // 0x33
        { "TOSERVER_CLICK_ACTIVEOBJECT",       TOSERVER_STATE_INGAME, &Server::handleCommand_Deprecated }, // 0x34
        { "TOSERVER_DAMAGE",                   TOSERVER_STATE_INGAME, &Server::handleCommand_Damage }, // 0x35
-       { "TOSERVER_PASSWORD",                 TOSERVER_STATE_INGAME, &Server::handleCommand_Password }, // 0x36
+       { "TOSERVER_PASSWORD_LEGACY",          TOSERVER_STATE_INGAME, &Server::handleCommand_Password }, // 0x36
        { "TOSERVER_PLAYERITEM",               TOSERVER_STATE_INGAME, &Server::handleCommand_PlayerItem }, // 0x37
        { "TOSERVER_RESPAWN",                  TOSERVER_STATE_INGAME, &Server::handleCommand_Respawn }, // 0x38
        { "TOSERVER_INTERACT",                 TOSERVER_STATE_INGAME, &Server::handleCommand_Interact }, // 0x39
        { "TOSERVER_REMOVED_SOUNDS",           TOSERVER_STATE_INGAME, &Server::handleCommand_RemovedSounds }, // 0x3a
        { "TOSERVER_NODEMETA_FIELDS",          TOSERVER_STATE_INGAME, &Server::handleCommand_NodeMetaFields }, // 0x3b
        { "TOSERVER_INVENTORY_FIELDS",         TOSERVER_STATE_INGAME, &Server::handleCommand_InventoryFields }, // 0x3c
-       null_command_handler, // 0x3d
+       { "TOSERVER_PASSWORD",                 TOSERVER_STATE_INGAME, &Server::handleCommand_Password }, // 0x3d
        null_command_handler, // 0x3e
        null_command_handler, // 0x3f
        { "TOSERVER_REQUEST_MEDIA",            TOSERVER_STATE_STARTUP, &Server::handleCommand_RequestMedia }, // 0x40
@@ -93,3 +93,93 @@ const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES] =
        { "TOSERVER_BREATH",                   TOSERVER_STATE_INGAME, &Server::handleCommand_Breath }, // 0x42
        { "TOSERVER_CLIENT_READY",             TOSERVER_STATE_STARTUP, &Server::handleCommand_ClientReady }, // 0x43
 };
+
+const static ClientCommandFactory null_command_factory = { "TOCLIENT_NULL", 0, false };
+
+const ClientCommandFactory clientCommandFactoryTable[TOCLIENT_NUM_MSG_TYPES] =
+{
+       null_command_factory, // 0x00
+       null_command_factory, // 0x01
+       { "TOCLIENT_HELLO",             0, true }, // 0x02
+       { "TOCLIENT_AUTH_ACCEPT",       0, true }, // 0x03
+       null_command_factory, // 0x04
+       null_command_factory, // 0x05
+       null_command_factory, // 0x06
+       null_command_factory, // 0x07
+       null_command_factory, // 0x08
+       null_command_factory, // 0x09
+       { "TOCLIENT_ACCESS_DENIED",     0, true }, // 0x0A
+       null_command_factory, // 0x0B
+       null_command_factory, // 0x0C
+       null_command_factory, // 0x0D
+       null_command_factory, // 0x0E
+       null_command_factory, // 0x0F
+       { "TOCLIENT_INIT",              0, true }, // 0x10
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       { "TOCLIENT_BLOCKDATA",                2, true }, // 0x20
+       { "TOCLIENT_ADDNODE",                  0, true }, // 0x21
+       { "TOCLIENT_REMOVENODE",               0, true }, // 0x22
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       { "TOCLIENT_INVENTORY",                0, true }, // 0x27
+       null_command_factory,
+       { "TOCLIENT_TIME_OF_DAY",              0, true }, // 0x29
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       null_command_factory,
+       { "TOCLIENT_CHAT_MESSAGE",             0, true }, // 0x30
+       { "TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD", 0, true }, // 0x31
+       { "TOCLIENT_ACTIVE_OBJECT_MESSAGES",   0, true }, // 0x32 Special packet, sent by 0 (rel) and 1 (unrel) channel
+       { "TOCLIENT_HP",                       0, true }, // 0x33
+       { "TOCLIENT_MOVE_PLAYER",              0, true }, // 0x34
+       { "TOCLIENT_ACCESS_DENIED_LEGACY",     0, true }, // 0x35
+       { "TOCLIENT_PLAYERITEM",               0, false }, // 0x36 obsolete
+       { "TOCLIENT_DEATHSCREEN",              0, true }, // 0x37
+       { "TOCLIENT_MEDIA",                    2, true }, // 0x38
+       { "TOCLIENT_TOOLDEF",                  0, false }, // 0x39 obsolete
+       { "TOCLIENT_NODEDEF",                  0, true }, // 0x3a
+       { "TOCLIENT_CRAFTITEMDEF",             0, false }, // 0x3b obsolete
+       { "TOCLIENT_ANNOUNCE_MEDIA",           0, true }, // 0x3c
+       { "TOCLIENT_ITEMDEF",                  0, true }, // 0x3d
+       null_command_factory,
+       { "TOCLIENT_PLAY_SOUND",               0, true }, // 0x3f
+       { "TOCLIENT_STOP_SOUND",               0, true }, // 0x40
+       { "TOCLIENT_PRIVILEGES",               0, true }, // 0x41
+       { "TOCLIENT_INVENTORY_FORMSPEC",       0, true }, // 0x42
+       { "TOCLIENT_DETACHED_INVENTORY",       0, true }, // 0x43
+       { "TOCLIENT_SHOW_FORMSPEC",            0, true }, // 0x44
+       { "TOCLIENT_MOVEMENT",                 0, true }, // 0x45
+       { "TOCLIENT_SPAWN_PARTICLE",           0, true }, // 0x46
+       { "TOCLIENT_ADD_PARTICLESPAWNER",      0, true }, // 0x47
+       { "TOCLIENT_DELETE_PARTICLESPAWNER_LEGACY",   0, true }, // 0x48
+       { "TOCLIENT_HUDADD",                   1, true }, // 0x49
+       { "TOCLIENT_HUDRM",                    1, true }, // 0x4a
+       { "TOCLIENT_HUDCHANGE",                0, true }, // 0x4b
+       { "TOCLIENT_HUD_SET_FLAGS",            0, true }, // 0x4c
+       { "TOCLIENT_HUD_SET_PARAM",            0, true }, // 0x4d
+       { "TOCLIENT_BREATH",                   0, true }, // 0x4e
+       { "TOCLIENT_SET_SKY",                  0, true }, // 0x4f
+       { "TOCLIENT_OVERRIDE_DAY_NIGHT_RATIO", 0, true }, // 0x50
+       { "TOCLIENT_LOCAL_PLAYER_ANIMATIONS",  0, true }, // 0x51
+       { "TOCLIENT_EYE_OFFSET",               0, true }, // 0x52
+       { "TOCLIENT_DELETE_PARTICLESPAWNER",   0, true }, // 0x53
+};