Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[734] showeq/trunk
|
From: <iea...@us...> - 2009-08-17 00:06:35
|
Revision: 734
http://seq.svn.sourceforge.net/seq/?rev=734&view=rev
Author: ieatacid
Date: 2009-08-17 00:06:27 +0000 (Mon, 17 Aug 2009)
Log Message:
-----------
Updated Opcodes and source code for August 12 2009 patch
Modified Paths:
--------------
showeq/trunk/conf/zoneopcodes.xml
showeq/trunk/src/everquest.h
showeq/trunk/src/interface.cpp
showeq/trunk/src/messageshell.cpp
showeq/trunk/src/netstream.cpp
showeq/trunk/src/spawnshell.cpp
Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml 2009-06-20 22:46:06 UTC (rev 733)
+++ showeq/trunk/conf/zoneopcodes.xml 2009-08-17 00:06:27 UTC (rev 734)
@@ -5,133 +5,174 @@
<!--
Critical opcodes used directly by ShowEQ
-->
- <opcode id="03D1" name="OP_NpcMoveUpdate" updated="06/12/09">
+ <opcode id="6A86" name="OP_NpcMoveUpdate" updated="08/12/09">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4036" name="OP_DeleteSpawn" updated="06/12/09">
+ <opcode id="4B05" name="OP_MovementHistory" updated="08/12/09">
+ <comment></comment>
+ <payload dir="client" typename="uint8_t" sizechecktype="none"/>
+ </opcode>
+ <opcode id="4315" name="OP_DeleteSpawn" updated="08/12/09">
<comment>old DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="09E3" name="OP_RespawnFromHover" updated="06/12/09">
- <comment>Server telling client that it is coming back from hover death</comment>
- <payload dir="both" typename="uint8_t" sizechecktype="none"/>
+ <opcode id="3AD9" name="OP_ZoneEntry" updated="08/12/09">
+ <comment>old ZoneEntryCode</comment>
+ <payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
+ <payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="48CD" name="OP_Shroud" updated="06/12/09">
+ <opcode id="35B1" name="OP_GuildMOTD" updated="08/12/09">
+ <comment>GuildMOTD</comment>
+ <payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
+ </opcode>
+ <opcode id="0FF4" name="OP_InspectAnswer" updated="08/12/09">
+ <comment>old InspectDataCode</comment>
+ <payload dir="both" typename="inspectDataStruct" sizechecktype="match"/>
+ </opcode>
+ <opcode id="6967" name="OP_SendZonePoints" updated="08/12/09">
+ <comment>Coords in a zone that will port you to another zone</comment>
+ <payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
+ </opcode>
+ <opcode id="41A6" name="OP_TargetMouse" updated="08/12/09">
+ <comment>Targeting a person - old ClientTargetCode</comment>
+ <payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
+ </opcode>
+ <opcode id="666D" name="OP_Shroud" updated="08/12/09">
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="1C50" name="OP_GroupFollow" updated="06/12/09">
+ <opcode id="390C" name="OP_GroupFollow" updated="08/12/09">
<payload dir="server" typename="groupFollowStruct" sizechecktype="match"/>
<comment>You join a group</comment>
</opcode>
- <opcode id="49F6" name="OP_GroupFollow2" updated="06/12/09">
+ <opcode id="49F6" name="OP_GroupFollow2" updated="08/12/09">
<payload dir="server" typename="groupFollowStruct" sizechecktype="match"/>
<comment>Player joins your group</comment>
</opcode>
- <opcode id="4481" name="OP_GroupUpdate" updated="06/12/09">
+ <opcode id="59A8" name="OP_GroupUpdate" updated="08/12/09">
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
<comment>Variable length packet with group member names</comment>
</opcode>
- <opcode id="0C33" name="OP_GroupDisband" updated="06/12/09">
+ <opcode id="0786" name="OP_GroupDisband" updated="08/12/09">
<comment>You disband from group</comment>
<payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/>
</opcode>
- <opcode id="58E6" name="OP_GroupDisband2" updated="06/12/09">
+ <opcode id="C56C" name="OP_GroupDisband2" updated="08/12/09">
<comment>Other disbands from group</comment>
<payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/>
</opcode>
- <opcode id="63F8" name="OP_GroupLeader" updated="06/12/09">
+ <opcode id="4481" name="OP_GroupLeader" updated="08/12/09">
<comment>Group leader change</comment>
<payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3F99" name="OP_DzSwitchInfo" updated="06/12/09">
+ <opcode id="3841" name="OP_DzSwitchInfo" updated="08/12/09">
<comment></comment>
<payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/>
</opcode>
- <opcode id="4661" name="OP_DzInfo" updated="06/12/09">
+ <opcode id="1875" name="OP_DzInfo" updated="08/12/09">
<comment></comment>
<payload dir="server" typename="dzInfo" sizechecktype="match"/>
</opcode>
- <opcode id="0507" name="OP_FormattedMessage" updated="06/12/09">
+ <opcode id="48B8" name="OP_FormattedMessage" updated="08/12/09">
<comment>old FormattedMessageCode</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="2018" name="OP_ZoneEntry" updated="06/12/09">
- <comment>old ZoneEntryCode</comment>
- <payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
- <payload dir="server" typename="uint8_t" sizechecktype="none"/>
- </opcode>
- <opcode id="0C7B" name="OP_SpawnDoor" updated="06/12/09">
+ <opcode id="1AC1" name="OP_SpawnDoor" updated="08/12/09">
<comment>old DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="4938" name="OP_SendZonePoints" updated="06/12/09">
- <comment>Coords in a zone that will port you to another zone</comment>
- <payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
- </opcode>
- <opcode id="5658" name="OP_AAExpUpdate" updated="06/12/09">
+ <opcode id="38D1" name="OP_AAExpUpdate" updated="08/12/09">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
- </opcode> <opcode id="053A" name="OP_AAExpUpdate" updated="05/14/09">
- <comment>Receiving AA experience. Also when percent to AA changes.</comment>
- <payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2042" name="OP_GuildMOTD" updated="06/12/09">
- <comment>GuildMOTD</comment>
- <payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
- </opcode>
- <opcode id="4B61" name="OP_HPUpdate" updated="06/12/09">
+ <opcode id="5821" name="OP_HPUpdate" updated="08/12/09">
<comment>old NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3288" name="OP_GuildMemberUpdate" updated="06/12/09">
+ <opcode id="16F5" name="OP_GuildMemberUpdate" updated="08/12/09">
<comment></comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="42EF" name="OP_SpawnRename" updated="06/12/09">
+ <opcode id="37A7" name="OP_SpawnRename" updated="08/12/09">
<comment>Spawns getting renamed after initial NewSpawn</comment>
<payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2736" name="OP_GroupInvite" updated="06/12/09">
+ <opcode id="099D" name="OP_GroupInvited" updated="08/12/09">
+ <payload dir="server" typename="groupInviteStruct" sizechecktype="match"/>
+ <comment>You got invited to a group</comment>
+ </opcode>
+ <opcode id="7930" name="OP_GroupInvite" updated="08/12/09">
<payload dir="client" typename="groupInviteStruct" sizechecktype="match"/>
- <payload dir="server" typename="groupAltInviteStruct" sizechecktype="match"/>
<comment>You're inviting someone and you're not grouped</comment>
</opcode>
- <opcode id="517B" name="OP_SwapSpell" updated="06/12/09">
+ <opcode id="1497" name="OP_SwapSpell" updated="08/12/09">
<comment>old TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6145" name="OP_InspectAnswer" updated="06/12/09">
- <comment>old InspectDataCode</comment>
- <payload dir="both" typename="inspectDataStruct" sizechecktype="match"/>
- </opcode>
- <opcode id="783C" name="OP_SimpleMessage" updated="06/12/09">
+ <opcode id="6884" name="OP_SimpleMessage" updated="08/12/09">
<comment>old SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0525" name="OP_SpecialMesg" updated="06/12/09">
+ <opcode id="429B" name="OP_SpecialMesg" updated="08/12/09">
<comment>Communicate textual info to client</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="0DDA" name="OP_RandomReq" updated="06/12/09">
+ <opcode id="28A7" name="OP_RandomReq" updated="08/12/09">
<comment>old RandomReqCode</comment>
<payload dir="client" typename="randomReqStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5DBC" name="OP_ConsentResponse" updated="06/12/09">
+ <opcode id="7113" name="OP_ConsentResponse" updated="08/12/09">
<comment>Server replying with consent information after /consent</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="771F" name="OP_DenyResponse" updated="06/12/09">
+ <opcode id="1AC8" name="OP_DenyResponse" updated="08/12/09">
<comment>Server replying with deny information after /deny</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="50D0" name="OP_BazaarSearch" updated="06/12/09">
+ <opcode id="60B5" name="OP_BazaarSearch" updated="08/12/09">
<payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/>
<payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
<comment>Bazaar search tool</comment>
</opcode>
+ <opcode id="2B9D" name="OP_WearChange" updated="08/12/09">
+ <comment>old SpawnUpdateCode</comment>
+ <payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
+ </opcode>
+ <opcode id="03A9" name="OP_SpawnAppearance" updated="08/12/09">
+ <comment>old SpawnAppearanceCode</comment>
+ <payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
+ </opcode>
+ <opcode id="52B5" name="OP_Stamina" updated="08/12/09">
+ <comment>Server updating on hunger/thirst</comment>
+ <payload dir="server" typename="staminaStruct" sizechecktype="match"/>
+ </opcode>
+ <opcode id="7452" name="OP_Consider" updated="08/12/09">
+ <comment>old ConsiderCode</comment>
+ <payload dir="both" typename="considerStruct" sizechecktype="match"/>
+ </opcode>
+ <opcode id="24A3" name="OP_ZoneChange" updated="08/12/09">
+ <comment>old ZoneChangeCode</comment>
+ <payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
+ </opcode>
+ <opcode id="66C5" name="OP_Buff" updated="08/12/09">
+ <comment>old BuffDropCode</comment>
+ <payload dir="both" typename="buffStruct" sizechecktype="match"/>
+ </opcode>
+ <opcode id="72F8" name="OP_Logout" updated="08/12/09">
+ <comment></comment>
+ <payload dir="server" typename="none" sizechecktype="match"/>
+ </opcode>
+
+ <opcode id="5251" name="OP_GroupInvite2" updated="06/12/09">
+ <payload dir="client" typename="groupInviteStruct" sizechecktype="match"/>
+ <comment>You're inviting someone and you are grouped</comment>
+ </opcode>
+ <opcode id="2736" name="OP_GroupCancelInvite" updated="06/12/09">
+ <payload dir="both" typename="groupDeclineStruct" sizechecktype="match"/>
+ <comment>Declining to join a group</comment>
+ </opcode>
<opcode id="43AC" name="OP_NewZone" updated="06/12/09">
<comment>old NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
@@ -153,18 +194,6 @@
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3969" name="OP_WearChange" updated="06/12/09">
- <comment>old SpawnUpdateCode</comment>
- <payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
- </opcode>
- <opcode id="4843" name="OP_SpawnAppearance" updated="06/12/09">
- <comment>old SpawnAppearanceCode</comment>
- <payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
- </opcode>
- <opcode id="70C6" name="OP_Stamina" updated="06/12/09">
- <comment>Server updating on hunger/thirst</comment>
- <payload dir="server" typename="staminaStruct" sizechecktype="match"/>
- </opcode>
<opcode id="33E5" name="OP_ClickObject" updated="06/12/09">
<comment>old RemDropCode</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
@@ -178,34 +207,10 @@
<comment>old ActionCode</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="66C5" name="OP_Consider" updated="06/12/09">
- <comment>old ConsiderCode</comment>
- <payload dir="both" typename="considerStruct" sizechecktype="match"/>
- </opcode>
- <opcode id="2EE2" name="OP_TargetMouse" updated="06/12/09">
- <comment>Targeting a person - old ClientTargetCode</comment>
- <payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
- </opcode>
<opcode id="231F" name="OP_Illusion" updated="06/12/09">
<comment>Spawn being illusioned (changing forms)</comment>
<payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/>
</opcode>
- <opcode id="32A9" name="OP_ZoneChange" updated="06/12/09">
- <comment>old ZoneChangeCode</comment>
- <payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
- </opcode>
- <opcode id="5251" name="OP_GroupInvite2" updated="06/12/09">
- <payload dir="client" typename="groupInviteStruct" sizechecktype="match"/>
- <comment>You're inviting someone and you are grouped</comment>
- </opcode>
- <opcode id="5251" name="OP_GroupCancelInvite" updated="06/12/09">
- <payload dir="both" typename="groupDeclineStruct" sizechecktype="match"/>
- <comment>Declining to join a group</comment>
- </opcode>
- <opcode id="7883" name="OP_Buff" updated="06/12/09">
- <comment>old BuffDropCode</comment>
- <payload dir="both" typename="buffStruct" sizechecktype="match"/>
- </opcode>
<opcode id="71BF" name="OP_BuffFadeMsg" updated="06/12/09">
<comment>old SpellFadeCode</comment>
<payload dir="both" typename="spellFadedStruct" sizechecktype="none"/>
@@ -239,11 +244,6 @@
<comment>old CorpseLocCode:</comment>
<payload dir="server" typename="corpseLocStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7705" name="OP_Logout" updated="06/12/09">
- <comment></comment>
- <payload dir="server" typename="none" sizechecktype="match"/>
- </opcode>
-
<opcode id="6022" name="OP_PlayerProfile" updated="01/17/08">
<comment>old CharProfileCode</comment>
<payload dir="server" typename="charProfileStruct" sizechecktype="match"/>
@@ -290,14 +290,14 @@
<!--
Not necessary for SEQ to run but here to name packets in logs.
- Also unverified as of 12-1-2007.
-->
- <opcode id="71b9" name="OP_SendAATable" updated="03/14/07">
+ <opcode id="7598" name="OP_SendAATable" updated="06/12/09">
<comment></comment>
</opcode>
- <opcode id="6f05" name="OP_SendAAStats" updated="03/14/07">
+ <opcode id="1ce3" name="OP_SendAAStats" updated="06/12/09">
<comment></comment>
</opcode>
+ <!-- Below are unverified as of 12-1-2007 -->
<opcode id="4d38" name="OP_AckPacket" updated="03/14/07">
<comment>Appears to be generic ack at the presentation level</comment>
</opcode>
Modified: showeq/trunk/src/everquest.h
===================================================================
--- showeq/trunk/src/everquest.h 2009-06-20 22:46:06 UTC (rev 733)
+++ showeq/trunk/src/everquest.h 2009-08-17 00:06:27 UTC (rev 734)
@@ -1555,19 +1555,38 @@
/*
** Channel Message received or sent
-** Length: 148 Octets + Variable Length + 4 Octets
+** Length: Variable
** OpCode: ChannelMessageCode
+
+This is how channelMessageStruct looks on the wire, for reference (8/12/09 eqgame.exe)
+
+char sender[0]; // Variable length senders name
+char target[0]; // Variable length target characters name
+uint32_t unknown;
+uint32_t language; // Language
+uint32_t chanNum; // Channel
+uint32_t unknown;
+uint8_t unknown;
+uint32_t skillInLanguage; // senders skill in language
+char message[0]; // Variable length message
+uint8_t unknown;
+uint32_t unknown;
+uint32_t unknown;
+char unknown[0]; // Variable legth unknown text
+uint8_t unknown;
+uint32_t unknown;
+
*/
+// This will get filled with data from the serialized packet
struct channelMessageStruct
{
-/*0000*/ char target[64]; // the target characters name
-/*0064*/ char sender[64]; // The senders name
-/*0128*/ uint32_t language; // Language
-/*0132*/ uint32_t chanNum; // Channel
-/*0136*/ int8_t unknown0136[8]; // ***Placeholder
-/*0144*/ uint32_t skillInLanguage; // senders skill in language
-/*0148*/ char message[0]; // Variable length message
+/*0000*/ char sender[64];
+/*0064*/ char target[64];
+/*0128*/ uint32_t language;
+/*0132*/ uint32_t chanNum;
+/*0144*/ uint32_t skillInLanguage;
+/*0148*/ char message[2048]; // Maximum message size according to eqgame.exe
};
/*
@@ -1710,14 +1729,6 @@
{
/*0000*/ char invitee[64]; // Invitee's Name
/*0064*/ char inviter[64]; // Inviter's Name
-/*0128*/ uint8_t unknown0128[20]; // ***Placeholder
-/*0148*/
-};
-
-struct groupAltInviteStruct
-{
-/*0000*/ char invitee[64]; // Invitee's Name
-/*0064*/ char inviter[64]; // Inviter's Name
/*0128*/ uint8_t unknown0128[24]; // ***Placeholder
/*0152*/
};
Modified: showeq/trunk/src/interface.cpp
===================================================================
--- showeq/trunk/src/interface.cpp 2009-06-20 22:46:06 UTC (rev 733)
+++ showeq/trunk/src/interface.cpp 2009-08-17 00:06:27 UTC (rev 734)
@@ -1858,9 +1858,9 @@
m_packet->connect2("OP_GroupInvite", SP_Zone, DIR_Client,
"groupInviteStruct", SZC_Match,
m_messageShell, SLOT(groupInvite(const uint8_t*)));
- m_packet->connect2("OP_GroupInvite", SP_Zone, DIR_Server,
- "groupAltInviteStruct", SZC_Match,
- m_messageShell, SLOT(groupInvite(const uint8_t*)));
+// m_packet->connect2("OP_GroupInvite", SP_Zone, DIR_Server,
+// "groupAltInviteStruct", SZC_Match,
+// m_messageShell, SLOT(groupInvite(const uint8_t*)));
m_packet->connect2("OP_GroupInvite2", SP_Zone, DIR_Client,
"groupInviteStruct", SZC_Match,
m_messageShell, SLOT(groupInvite(const uint8_t*)));
@@ -1988,9 +1988,9 @@
m_packet->connect2("OP_Death", SP_Zone, DIR_Server,
"newCorpseStruct", SZC_Match,
m_spawnShell, SLOT(killSpawn(const uint8_t*)));
- m_packet->connect2("OP_RespawnFromHover", SP_Zone, DIR_Server|DIR_Client,
- "uint8_t", SZC_None,
- m_spawnShell, SLOT(respawnFromHover(const uint8_t*, size_t, uint8_t)));
+// m_packet->connect2("OP_RespawnFromHover", SP_Zone, DIR_Server|DIR_Client,
+// "uint8_t", SZC_None,
+// m_spawnShell, SLOT(respawnFromHover(const uint8_t*, size_t, uint8_t)));
m_packet->connect2("OP_Shroud", SP_Zone, DIR_Server,
"spawnShroudSelf", SZC_None,
m_spawnShell, SLOT(shroudSpawn(const uint8_t*, size_t, uint8_t)));
Modified: showeq/trunk/src/messageshell.cpp
===================================================================
--- showeq/trunk/src/messageshell.cpp 2009-06-20 22:46:06 UTC (rev 733)
+++ showeq/trunk/src/messageshell.cpp 2009-08-17 00:06:27 UTC (rev 734)
@@ -19,6 +19,7 @@
#include "packetcommon.h"
#include "filtermgr.h"
#include "util.h"
+#include "netstream.h"
//----------------------------------------------------------------------
// MessageShell
@@ -36,10 +37,42 @@
{
}
-void MessageShell::channelMessage(const uint8_t* data, size_t, uint8_t dir)
+void MessageShell::channelMessage(const uint8_t* data, size_t len, uint8_t dir)
{
- const channelMessageStruct* cmsg = (const channelMessageStruct*)data;
+// Added for 8/12/09 patch for serialized message packet ----------------------
+ QString qTmp;
+ NetStream netStream(data, len);
+ channelMessageStruct *cmsg = new channelMessageStruct;
+ memset(cmsg, 0, sizeof(channelMessageStruct));
+
+ qTmp = netStream.readText(); // sender
+
+ if(qTmp.length())
+ strcpy(cmsg->sender, qTmp.latin1());
+
+ qTmp = netStream.readText(); // target
+
+ if(qTmp.length())
+ strcpy(cmsg->target, qTmp.latin1());
+
+ netStream.readUInt32(); // unknown
+
+ cmsg->language = netStream.readUInt32NC(); // language
+
+ cmsg->chanNum = netStream.readUInt32NC(); // channel
+
+ netStream.readUInt32(); // unknown
+ netStream.readUInt8(); // unknown
+
+ cmsg->skillInLanguage = netStream.readUInt32NC(); // skill
+
+ qTmp = netStream.readText(); // message
+ if(qTmp.length())
+ strcpy(cmsg->message, qTmp.latin1());
+
+//-----------------------------------------------------------------------------
+
// Tells and Group by us happen twice *shrug*. Ignore the client->server one.
if (dir == DIR_Client &&
(cmsg->chanNum == MT_Tell || cmsg->chanNum == MT_Group))
@@ -93,6 +126,9 @@
}
m_messages->addMessage((MessageType)cmsg->chanNum, tempStr);
+
+ delete cmsg;
+ cmsg = 0;
}
static MessageType chatColor2MessageType(ChatColor chatColor)
Modified: showeq/trunk/src/netstream.cpp
===================================================================
--- showeq/trunk/src/netstream.cpp 2009-06-20 22:46:06 UTC (rev 733)
+++ showeq/trunk/src/netstream.cpp 2009-08-17 00:06:27 UTC (rev 734)
@@ -193,7 +193,7 @@
void NetStream::skipBytes(size_t byteCount)
{
- if ((m_lastPos - m_pos) >= byteCount)
+ if (uint32_t(m_lastPos - m_pos) >= byteCount)
{
m_pos += byteCount;
}
Modified: showeq/trunk/src/spawnshell.cpp
===================================================================
--- showeq/trunk/src/spawnshell.cpp 2009-06-20 22:46:06 UTC (rev 733)
+++ showeq/trunk/src/spawnshell.cpp 2009-08-17 00:06:27 UTC (rev 734)
@@ -630,7 +630,7 @@
spawn->isMercenary = netStream.readUInt8();
// unknowns
- netStream.skipBytes(24);
+ netStream.skipBytes(28);
// now we're at the end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
