From: <ken...@us...> - 2008-10-08 17:58:01
|
Revision: 2234 http://planeshift.svn.sourceforge.net/planeshift/?rev=2234&view=rev Author: kennygraunke Date: 2008-10-08 17:57:53 +0000 (Wed, 08 Oct 2008) Log Message: ----------- Removed inaccurate and unmaintainable comments specifying the numeric value of MSGTYPE_*. If you want to know the numerical value, gdb psserver and type "print (int) MSGTYPE_*". Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2008-10-08 11:21:01 UTC (rev 2233) +++ trunk/src/common/net/messages.h 2008-10-08 17:57:53 UTC (rev 2234) @@ -70,7 +70,7 @@ enum MSG_TYPES { - MSGTYPE_PING = 1, // 1 + MSGTYPE_PING = 1, MSGTYPE_AUTHENTICATE, MSGTYPE_PREAUTHENTICATE, MSGTYPE_PREAUTHAPPROVED, @@ -78,7 +78,7 @@ MSGTYPE_AUTHREJECTED, MSGTYPE_DISCONNECT, MSGTYPE_CHAT, - MSGTYPE_GUILDCMD, // 10 + MSGTYPE_GUILDCMD, MSGTYPE_USERCMD, MSGTYPE_SYSTEM, MSGTYPE_CHARREJECT, @@ -88,7 +88,7 @@ MSGTYPE_USERACTION, MSGTYPE_ADMINCMD, MSGTYPE_GUIINTERACT, - MSGTYPE_GUIINVENTORY, // 20 + MSGTYPE_GUIINVENTORY, MSGTYPE_VIEW_ITEM, MSGTYPE_VIEW_CONTAINER, MSGTYPE_VIEW_SKETCH, @@ -98,7 +98,7 @@ MSGTYPE_UPDATE_ITEM, MSGTYPE_MODE, MSGTYPE_WEATHER, - MSGTYPE_NEWSECTOR, // 30 + MSGTYPE_NEWSECTOR, MSGTYPE_GUIGUILD, MSGTYPE_EQUIPMENT, MSGTYPE_GUIEXCHANGE, @@ -108,7 +108,7 @@ MSGTYPE_EXCHANGE_ACCEPT, MSGTYPE_EXCHANGE_STATUS, MSGTYPE_EXCHANGE_END, - MSGTYPE_EXCHANGE_MONEY, // 40 + MSGTYPE_EXCHANGE_MONEY, MSGTYPE_GUIMERCHANT, MSGTYPE_GROUPCMD, MSGTYPE_GUIGROUP, @@ -118,7 +118,7 @@ MSGTYPE_GLYPH_ASSEMBLE, MSGTYPE_PURIFY_GLYPH, MSGTYPE_SPELL_CAST, - MSGTYPE_SPELL_CANCEL, // 50 + MSGTYPE_SPELL_CANCEL, MSGTYPE_EFFECT, MSGTYPE_EFFECT_STOP, MSGTYPE_NPCAUTHENT, @@ -128,7 +128,7 @@ MSGTYPE_NPCOMMANDLIST, MSGTYPE_ALLENTITYPOS, MSGTYPE_NEW_NPC, - MSGTYPE_PETITION, // 60 + MSGTYPE_PETITION, MSGTYPE_MSGSTRINGS, MSGTYPE_CHARACTERDATA, MSGTYPE_AUTHCHARACTER, @@ -138,7 +138,7 @@ MSGTYPE_LOOT, MSGTYPE_LOOTITEM, MSGTYPE_LOOTREMOVE, - MSGTYPE_GUISKILL, // 70 + MSGTYPE_GUISKILL, MSGTYPE_OVERRIDEACTION, MSGTYPE_QUESTLIST, MSGTYPE_QUESTINFO, @@ -148,7 +148,7 @@ MSGTYPE_BUDDY_STATUS, MSGTYPE_MOTD, MSGTYPE_MOTDREQUEST, - MSGTYPE_QUESTION, // 80 + MSGTYPE_QUESTION, MSGTYPE_QUESTIONRESPONSE, MSGTYPE_SLOT_MOVEMENT, MSGTYPE_QUESTIONCANCEL, @@ -158,7 +158,7 @@ MSGTYPE_CHARDETAILSREQUEST, MSGTYPE_CHARDESCUPDATE, MSGTYPE_FACTION_INFO, - MSGTYPE_QUESTREWARD, // 90 + MSGTYPE_QUESTREWARD, MSGTYPE_NAMECHANGE, MSGTYPE_GUILDCHANGE, MSGTYPE_LOCKPICK, @@ -168,7 +168,7 @@ MSGTYPE_ADVICE, MSGTYPE_ACTIVEMAGIC, MSGTYPE_GROUPCHANGE, - MSGTYPE_MAPACTION, // 100 + MSGTYPE_MAPACTION, MSGTYPE_CLIENTSTATUS, MSGTYPE_TUTORIAL, MSGTYPE_BANKING, @@ -182,7 +182,7 @@ // Char creation messages under this MSGTYPE_CHAR_DELETE, MSGTYPE_CHAR_CREATE_PARENTS, - MSGTYPE_CHAR_CREATE_CHILDHOOD, // 110 + MSGTYPE_CHAR_CREATE_CHILDHOOD, MSGTYPE_CHAR_CREATE_LIFEEVENTS, MSGTYPE_CHAR_CREATE_UPLOAD, MSGTYPE_CHAR_CREATE_VERIFY, @@ -192,7 +192,7 @@ MSGTYPE_PERSIST_ACTOR_REQUEST, MSGTYPE_PERSIST_ACTOR, MSGTYPE_PERSIST_ITEM, - MSGTYPE_PERSIST_ACTIONLOCATION, // 120 + MSGTYPE_PERSIST_ACTIONLOCATION, MSGTYPE_PERSIST_ALL, MSGTYPE_REMOVE_OBJECT, MSGTYPE_CHANGE_TRAIT, @@ -204,7 +204,7 @@ MSGTYPE_ZPOINT_EVENT, MSGTYPE_BUY_EVENT, MSGTYPE_SELL_EVENT, - MSGTYPE_PICKUP_EVENT,// 130 + MSGTYPE_PICKUP_EVENT, MSGTYPE_DROP_EVENT, MSGTYPE_LOOT_EVENT, MSGTYPE_CONNECT_EVENT, @@ -220,7 +220,7 @@ // Pet Related Messages MSGTYPE_NPC_SETOWNER, - MSGTYPE_PET_COMMAND,// 140 + MSGTYPE_PET_COMMAND, MSGTYPE_PET_SKILL, MSGTYPE_CRAFT_INFO, @@ -238,7 +238,7 @@ MSGTYPE_ENTRANCE, // GM Event message - MSGTYPE_GMEVENT_LIST, // 150 + MSGTYPE_GMEVENT_LIST, MSGTYPE_GMEVENT_INFO, MSGTYPE_SEQUENCE, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-12-07 04:12:27
|
Revision: 2634 http://planeshift.svn.sourceforge.net/planeshift/?rev=2634&view=rev Author: mgist Date: 2008-12-07 04:12:25 +0000 (Sun, 07 Dec 2008) Log Message: ----------- - Bumped netversion for MSGTYPE_EXCHANGE_AUTOGIVE Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2008-12-07 03:04:10 UTC (rev 2633) +++ trunk/src/common/net/messages.h 2008-12-07 04:12:25 UTC (rev 2634) @@ -43,7 +43,7 @@ // This holds the version number of the network code, remember to increase // this each time you do an update which breaks compatibility -#define PS_NETVERSION 0x0095 +#define PS_NETVERSION 0x0096 // Remember to bump the version in pscssetup.h, as well. // NPC Networking version is separate so we don't have to break compatibility @@ -2710,10 +2710,10 @@ void WriteDRInfo(uint32_t client, EID mappedid, bool on_ground, uint8_t mode, uint8_t counter, const csVector3& pos, float yrot, iSector *sector, - const csVector3& vel, csVector3& worldVel, float ang_vel, - csStringHashReversible* msgstrings, bool donewriting=true); + csString sectorName, const csVector3& vel, csVector3& worldVel, + float ang_vel, csStringHashReversible* msgstrings, bool donewriting=true); void ReadDRInfo( MsgEntry* me, csStringHashReversible* msgstrings, iEngine *engine); - void CreateMsgEntry(uint32_t client, csStringHashReversible* msgstrings, iSector *sector); + void CreateMsgEntry(uint32_t client, csStringHashReversible* msgstrings, iSector *sector, csString sectorName); /// Flags indicating what components are packed in this message enum DRDataFlags @@ -2752,7 +2752,7 @@ csStringHashReversible* msgstrings, psLinearMovement *linmove, uint8_t mode=0); psDRMessage(uint32_t client, EID mappedid, bool on_ground, uint8_t mode, uint8_t counter, - const csVector3& pos, float yrot, iSector *sector, + const csVector3& pos, float yrot, iSector *sector, csString sectorName, const csVector3& vel, csVector3& worldVel, float ang_vel, csStringHashReversible* msgstrings); psDRMessage(void *data,int size, csStringHashReversible* msgstrings, iEngine *engine); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-12-07 04:25:45
|
Revision: 2636 http://planeshift.svn.sourceforge.net/planeshift/?rev=2636&view=rev Author: mgist Date: 2008-12-07 04:25:42 +0000 (Sun, 07 Dec 2008) Log Message: ----------- - Reverted accidental commit. Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2008-12-07 04:20:27 UTC (rev 2635) +++ trunk/src/common/net/messages.h 2008-12-07 04:25:42 UTC (rev 2636) @@ -2710,8 +2710,8 @@ void WriteDRInfo(uint32_t client, EID mappedid, bool on_ground, uint8_t mode, uint8_t counter, const csVector3& pos, float yrot, iSector *sector, - csString sectorName, const csVector3& vel, csVector3& worldVel, - float ang_vel, csStringHashReversible* msgstrings, bool donewriting=true); + const csVector3& vel, csVector3& worldVel, float ang_vel, + csStringHashReversible* msgstrings, bool donewriting=true); void ReadDRInfo( MsgEntry* me, csStringHashReversible* msgstrings, iEngine *engine); void CreateMsgEntry(uint32_t client, csStringHashReversible* msgstrings, iSector *sector, csString sectorName); @@ -2752,7 +2752,7 @@ csStringHashReversible* msgstrings, psLinearMovement *linmove, uint8_t mode=0); psDRMessage(uint32_t client, EID mappedid, bool on_ground, uint8_t mode, uint8_t counter, - const csVector3& pos, float yrot, iSector *sector, csString sectorName, + const csVector3& pos, float yrot, iSector *sector, const csVector3& vel, csVector3& worldVel, float ang_vel, csStringHashReversible* msgstrings); psDRMessage(void *data,int size, csStringHashReversible* msgstrings, iEngine *engine); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-12-07 04:30:31
|
Revision: 2637 http://planeshift.svn.sourceforge.net/planeshift/?rev=2637&view=rev Author: mgist Date: 2008-12-07 04:30:28 +0000 (Sun, 07 Dec 2008) Log Message: ----------- - One more line... Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2008-12-07 04:25:42 UTC (rev 2636) +++ trunk/src/common/net/messages.h 2008-12-07 04:30:28 UTC (rev 2637) @@ -2713,7 +2713,7 @@ const csVector3& vel, csVector3& worldVel, float ang_vel, csStringHashReversible* msgstrings, bool donewriting=true); void ReadDRInfo( MsgEntry* me, csStringHashReversible* msgstrings, iEngine *engine); - void CreateMsgEntry(uint32_t client, csStringHashReversible* msgstrings, iSector *sector, csString sectorName); + void CreateMsgEntry(uint32_t client, csStringHashReversible* msgstrings, iSector *sector); /// Flags indicating what components are packed in this message enum DRDataFlags This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-07 19:49:31
|
Revision: 3942 http://planeshift.svn.sourceforge.net/planeshift/?rev=3942&view=rev Author: mgist Date: 2009-07-07 19:49:28 +0000 (Tue, 07 Jul 2009) Log Message: ----------- - Fixed message size. Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2009-07-07 19:21:52 UTC (rev 3941) +++ trunk/src/common/net/messages.h 2009-07-07 19:49:28 UTC (rev 3942) @@ -3485,7 +3485,7 @@ bool guarded=true, bool inplace=true) { - msg.AttachNew(new MsgEntry( sizeof( int32_t ) * 5 + 3 * sizeof(float) + 2 * sizeof(bool) )); + msg.AttachNew(new MsgEntry( sizeof( int32_t ) * 5 + 3 * sizeof(float) + sizeof(float) + 2 * sizeof(bool) )); msg->SetType(MSGTYPE_SLOT_MOVEMENT); msg->clientnum = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-08 08:08:55
|
Revision: 4915 http://planeshift.svn.sourceforge.net/planeshift/?rev=4915&view=rev Author: weltall2 Date: 2009-12-08 08:08:46 +0000 (Tue, 08 Dec 2009) Log Message: ----------- netbump 0xB5 Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2009-12-08 08:04:52 UTC (rev 4914) +++ trunk/src/common/net/messages.h 2009-12-08 08:08:46 UTC (rev 4915) @@ -45,7 +45,7 @@ // This holds the version number of the network code, remember to increase // this each time you do an update which breaks compatibility -#define PS_NETVERSION 0x00B4 +#define PS_NETVERSION 0x00B5 // Remember to bump the version in pscssetup.h, as well. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-02-21 10:52:33
|
Revision: 5607 http://planeshift.svn.sourceforge.net/planeshift/?rev=5607&view=rev Author: weltall2 Date: 2010-02-21 10:52:22 +0000 (Sun, 21 Feb 2010) Log Message: ----------- missing file Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2010-02-21 09:56:43 UTC (rev 5606) +++ trunk/src/common/net/messages.h 2010-02-21 10:52:22 UTC (rev 5607) @@ -1162,7 +1162,8 @@ SET_MEMBER_PUBLIC_NOTES, SET_MEMBER_PRIVATE_NOTES, - SET_GUILD_NOTIFICATION ///< Clients asks server to change the guild member login/logout notification setting + SET_GUILD_NOTIFICATION, ///< Clients asks server to change the guild member login/logout notification setting + SET_ALLIANCE_NOTIFICATION ///< Clients asks server to change the alliance member login/logout notification setting }; /** @brief Constuct a new equipment message to go on the network. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-07-08 13:00:32
|
Revision: 6024 http://planeshift.svn.sourceforge.net/planeshift/?rev=6024&view=rev Author: rlydontknow Date: 2010-07-08 13:00:25 +0000 (Thu, 08 Jul 2010) Log Message: ----------- reverted netbump and added a workaround - to be re-applied at the next netbump Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2010-07-07 22:55:42 UTC (rev 6023) +++ trunk/src/common/net/messages.h 2010-07-08 13:00:25 UTC (rev 6024) @@ -40,7 +40,7 @@ // This holds the version number of the network code, remember to increase // this each time you do an update which breaks compatibility -#define PS_NETVERSION 0x00BA +#define PS_NETVERSION 0x00B9 // Remember to bump the version in pscssetup.h, as well. @@ -3692,15 +3692,24 @@ } if (rot != NULL) { - msg->Add( *rot ); + msg->Add( rot->y ); } else { - csVector3 v = 0; - msg->Add(v); // Add 0 rotation if not specified. + msg->Add(0.f); // Add 0 rotation if not specified. } msg->Add( guarded ); msg->Add( inplace ); + if (rot != NULL) + { + msg->Add( rot->x ); + msg->Add( rot->z ); + } + else + { + msg->Add( 0.f ); + msg->Add( 0.f ); + } } psSlotMovementMsg( MsgEntry* me ) @@ -3711,9 +3720,11 @@ toSlot = me->GetInt32(); stackCount = me->GetInt32(); posWorld = me->GetVector(); - rot = me->GetVector(); + rot.y = me->GetFloat(); guarded = me->GetBool(); inplace = me->GetBool(); + rot.x = me->GetFloat(); + rot.z = me->GetFloat(); } PSF_DECLARE_MSG_FACTORY(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rly...@us...> - 2010-11-25 21:10:47
|
Revision: 6448 http://planeshift.svn.sourceforge.net/planeshift/?rev=6448&view=rev Author: rlydontknow Date: 2010-11-25 21:10:40 +0000 (Thu, 25 Nov 2010) Log Message: ----------- removed superflous comma Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2010-11-25 21:09:22 UTC (rev 6447) +++ trunk/src/common/net/messages.h 2010-11-25 21:10:40 UTC (rev 6448) @@ -3212,7 +3212,7 @@ INVINCIBLE = 1 << 1, ///< Used to inform super client. NPC = 1 << 2, ///< Set for NPCs NAMEKNOWN = 1 << 3, ///< Used to tell the client if he knows this actor - IS_ALIVE = 1 << 4, ///< Used to tell the clients that this actor is alive + IS_ALIVE = 1 << 4 ///< Used to tell the clients that this actor is alive }; psPersistActor( uint32_t clientnum, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-30 21:57:55
|
Revision: 6647 http://planeshift.svn.sourceforge.net/planeshift/?rev=6647&view=rev Author: weltall2 Date: 2010-12-30 21:57:49 +0000 (Thu, 30 Dec 2010) Log Message: ----------- missing file Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2010-12-30 19:48:14 UTC (rev 6646) +++ trunk/src/common/net/messages.h 2010-12-30 21:57:49 UTC (rev 6647) @@ -4553,6 +4553,13 @@ public: psNameCheckMessage(){} psNameCheckMessage( const char* name ); + /** Constructor. + * Prepares a message to be sent to the server with a first and last name. + * This is done to ask the server if the choosen name is usable. + * @param firstName The first name to be tried. + * @param lastName The last name to be tried. + */ + psNameCheckMessage(const char* firstName, const char* lastName); psNameCheckMessage( uint32_t client, bool accepted, const char* reason ); psNameCheckMessage( MsgEntry* me ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-08-26 21:23:57
|
Revision: 7622 http://planeshift.svn.sourceforge.net/planeshift/?rev=7622&view=rev Author: weltall2 Date: 2011-08-26 21:23:51 +0000 (Fri, 26 Aug 2011) Log Message: ----------- moved the messages to the end so the message ids aren't changed Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2011-08-26 21:19:38 UTC (rev 7621) +++ trunk/src/common/net/messages.h 2011-08-26 21:23:51 UTC (rev 7622) @@ -95,7 +95,6 @@ MSGTYPE_VIEW_ITEM, MSGTYPE_VIEW_CONTAINER, MSGTYPE_VIEW_SKETCH, - MSGTYPE_MUSICAL_SHEET, MSGTYPE_VIEW_ACTION_LOCATION, MSGTYPE_READ_BOOK, MSGTYPE_WRITE_BOOK, @@ -162,8 +161,6 @@ MSGTYPE_QUESTIONCANCEL, MSGTYPE_GUILDMOTDSET, MSGTYPE_PLAYSOUND, - MSGTYPE_PLAY_SONG, - MSGTYPE_STOP_SONG, MSGTYPE_CHARACTERDETAILS, MSGTYPE_CHARDETAILSREQUEST, MSGTYPE_CHARDESCUPDATE, @@ -264,6 +261,11 @@ //Extra value made to new clients MSGTYPE_CRAFT_CANCEL + + //music playing messages + MSGTYPE_MUSICAL_SHEET, + MSGTYPE_PLAY_SONG, + MSGTYPE_STOP_SONG, }; class psMessageCracker; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-08-26 21:41:30
|
Revision: 7623 http://planeshift.svn.sourceforge.net/planeshift/?rev=7623&view=rev Author: weltall2 Date: 2011-08-26 21:41:23 +0000 (Fri, 26 Aug 2011) Log Message: ----------- fixed build Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2011-08-26 21:23:51 UTC (rev 7622) +++ trunk/src/common/net/messages.h 2011-08-26 21:41:23 UTC (rev 7623) @@ -260,12 +260,12 @@ MSGTYPE_GENERICCMD, //Extra value made to new clients - MSGTYPE_CRAFT_CANCEL + MSGTYPE_CRAFT_CANCEL, //music playing messages MSGTYPE_MUSICAL_SHEET, MSGTYPE_PLAY_SONG, - MSGTYPE_STOP_SONG, + MSGTYPE_STOP_SONG }; class psMessageCracker; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-02-18 20:18:42
|
Revision: 9279 http://sourceforge.net/p/planeshift/code/9279 Author: ralphcampbell Date: 2014-02-18 20:18:40 +0000 (Tue, 18 Feb 2014) Log Message: ----------- Move the new combat message types in enum MSG_TYPES to the end in order to not break the current wire format (i.e., allow old clients to work with new server and new client to work with old server) Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2014-02-18 19:04:09 UTC (rev 9278) +++ trunk/src/common/net/messages.h 2014-02-18 20:18:40 UTC (rev 9279) @@ -109,7 +109,6 @@ MSGTYPE_WRITE_BOOK, MSGTYPE_UPDATE_ITEM, MSGTYPE_MODE, - MSGTYPE_ATTACK_QUEUE, MSGTYPE_WEATHER, MSGTYPE_NEWSECTOR, MSGTYPE_GUIGUILD, @@ -129,7 +128,6 @@ MSGTYPE_GUIGROUP, MSGTYPE_STATDRUPDATE, MSGTYPE_SPELL_BOOK, - MSGTYPE_ATTACK_BOOK, MSGTYPE_GLYPH_REQUEST, MSGTYPE_GLYPH_ASSEMBLE, MSGTYPE_PURIFY_GLYPH, @@ -153,7 +151,6 @@ MSGTYPE_AUTHCHARACTERAPPROVED, MSGTYPE_CHAR_CREATE_CP, MSGTYPE_COMBATEVENT, - MSGTYPE_SPECCOMBATEVENT, MSGTYPE_LOOT, MSGTYPE_LOOTITEM, MSGTYPE_LOOTREMOVE, @@ -291,7 +288,11 @@ MSGTYPE_HIRED_NPC_SCRIPT, MSGTYPE_GMSPAWNGETMODS, - MSGTYPE_GMSPAWNMODS + MSGTYPE_GMSPAWNMODS, + + MSGTYPE_ATTACK_QUEUE, + MSGTYPE_ATTACK_BOOK, + MSGTYPE_SPECCOMBATEVENT }; class psMessageCracker; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2014-07-04 03:05:14
|
Revision: 9522 http://sourceforge.net/p/planeshift/code/9522 Author: joelyon Date: 2014-07-04 03:05:11 +0000 (Fri, 04 Jul 2014) Log Message: ----------- modified to be backward compatible with earlier version clients so server and client updates can be done seperately. Modified Paths: -------------- trunk/src/common/net/messages.h Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2014-06-30 15:29:37 UTC (rev 9521) +++ trunk/src/common/net/messages.h 2014-07-04 03:05:11 UTC (rev 9522) @@ -3822,10 +3822,10 @@ { msgSize += sizeof(uint8_t); //SPELL_TYPE msgSize += sizeof(uint32_t); //duration + msgSize += spells[i]->Name().Length() + 1; + msgSize += spells[i]->Image().Length() + 1; msgSize += sizeof(uint32_t); //registrationTime msgSize += sizeof(uint32_t); //serverTime - msgSize += spells[i]->Name().Length() + 1; - msgSize += spells[i]->Image().Length() + 1; } msg.AttachNew(new MsgEntry(msgSize)); @@ -3838,10 +3838,10 @@ { msg->Add((uint8_t)spells[i]->Type()); msg->Add((uint32_t)spells[i]->Duration()); + msg->Add(spells[i]->Name().GetData()); + msg->Add(spells[i]->Image().GetData()); msg->Add((uint32_t)spells[i]->RegistrationTime()); msg->Add((uint32_t)serverTime); - msg->Add(spells[i]->Name().GetData()); - msg->Add(spells[i]->Image().GetData()); } valid = !(msg->overrun); } @@ -3868,10 +3868,10 @@ { type.Push( (SPELL_TYPE) message->GetUInt8() ); duration.Push( message->GetUInt32()); + name.Push( message->GetStr()); //if there was no name when the message was sent, this should read a null string + image.Push( message->GetStr()); //if there was no name when the message was sent, this should read a null string registrationTime.Push( message->GetUInt32()); serverTime=message->GetUInt32(); - name.Push( message->GetStr()); //if there was no name when the message was sent, this should read a null string - image.Push( message->GetStr()); //if there was no name when the message was sent, this should read a null string } valid = true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |