Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[739] showeq/trunk
|
From: <iea...@us...> - 2009-09-17 02:17:54
|
Revision: 739
http://seq.svn.sourceforge.net/seq/?rev=739&view=rev
Author: ieatacid
Date: 2009-09-17 02:17:45 +0000 (Thu, 17 Sep 2009)
Log Message:
-----------
+ Updated opcodes for 9/15 patch
+ Fixed group invite message code
+ Version to 5.13.7
Modified Paths:
--------------
showeq/trunk/ChangeLog
showeq/trunk/conf/zoneopcodes.xml
showeq/trunk/configure.in
showeq/trunk/src/interface.cpp
showeq/trunk/src/messageshell.cpp
showeq/trunk/src/messageshell.h
Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog 2009-08-25 00:51:03 UTC (rev 738)
+++ showeq/trunk/ChangeLog 2009-09-17 02:17:45 UTC (rev 739)
@@ -1,3 +1,9 @@
+ieatacid (9/16/09)
+-----------------
+- Updated version to 5.13.7
+- Opcodes updated
+- Group invite message code fixed (I hope)
+
ieatacid (8/24/09)
-----------------
- Updated version to 5.13.6.1
Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml 2009-08-25 00:51:03 UTC (rev 738)
+++ showeq/trunk/conf/zoneopcodes.xml 2009-09-17 02:17:45 UTC (rev 739)
@@ -5,162 +5,162 @@
<!--
Critical opcodes used directly by ShowEQ
-->
- <opcode id="6A86" name="OP_NpcMoveUpdate" updated="08/12/09">
+ <opcode id="654F" name="OP_NpcMoveUpdate" updated="09/15/09">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4B05" name="OP_MovementHistory" updated="08/12/09">
+ <opcode id="4B7B" name="OP_MovementHistory" updated="09/15/09">
<comment></comment>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4315" name="OP_DeleteSpawn" updated="08/12/09">
+ <opcode id="21BE" name="OP_DeleteSpawn" updated="09/15/09">
<comment>old DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3AD9" name="OP_ZoneEntry" updated="08/12/09">
+ <opcode id="538F" name="OP_ZoneEntry" updated="09/15/09">
<comment>old ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="35B1" name="OP_GuildMOTD" updated="08/12/09">
+ <opcode id="3088" name="OP_GuildMOTD" updated="09/15/09">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="0FF4" name="OP_InspectAnswer" updated="08/12/09">
+ <opcode id="2370" name="OP_InspectAnswer" updated="09/15/09">
<comment>old InspectDataCode</comment>
<payload dir="both" typename="inspectDataStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6967" name="OP_SendZonePoints" updated="08/12/09">
+ <opcode id="0FF4" name="OP_SendZonePoints" updated="09/15/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">
+ <opcode id="36F8" name="OP_TargetMouse" updated="09/15/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">
+ <opcode id="4A20" name="OP_Shroud" updated="09/15/09">
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="390C" name="OP_GroupFollow" updated="08/12/09">
+ <opcode id="0786" name="OP_GroupFollow" updated="09/15/09">
<payload dir="server" typename="groupFollowStruct" sizechecktype="match"/>
<comment>You join a group</comment>
</opcode>
- <opcode id="49F6" name="OP_GroupFollow2" updated="08/12/09">
+ <opcode id="0C33" name="OP_GroupFollow2" updated="09/15/09">
<payload dir="server" typename="groupFollowStruct" sizechecktype="match"/>
<comment>Player joins your group</comment>
</opcode>
- <opcode id="59A8" name="OP_GroupUpdate" updated="08/12/09">
+ <opcode id="5331" name="OP_GroupUpdate" updated="09/15/09">
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
<comment>Variable length packet with group member names</comment>
</opcode>
- <opcode id="0786" name="OP_GroupDisband" updated="08/12/09">
+ <opcode id="4717" name="OP_GroupDisband" updated="09/15/09">
<comment>You disband from group</comment>
<payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/>
</opcode>
- <opcode id="C56C" name="OP_GroupDisband2" updated="08/12/09">
+ <opcode id="4481" name="OP_GroupDisband2" updated="09/15/09">
<comment>Other disbands from group</comment>
<payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4481" name="OP_GroupLeader" updated="08/12/09">
+ <opcode id="6B67" name="OP_GroupLeader" updated="09/15/09">
<comment>Group leader change</comment>
<payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3841" name="OP_DzSwitchInfo" updated="08/12/09">
+ <opcode id="0EFC" name="OP_DzSwitchInfo" updated="09/15/09">
<comment></comment>
<payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/>
</opcode>
- <opcode id="1875" name="OP_DzInfo" updated="08/12/09">
+ <opcode id="1879" name="OP_DzInfo" updated="09/15/09">
<comment></comment>
<payload dir="server" typename="dzInfo" sizechecktype="match"/>
</opcode>
- <opcode id="48B8" name="OP_FormattedMessage" updated="08/12/09">
+ <opcode id="0A18" name="OP_FormattedMessage" updated="09/15/09">
<comment>old FormattedMessageCode</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="1AC1" name="OP_SpawnDoor" updated="08/12/09">
+ <opcode id="47AE" name="OP_SpawnDoor" updated="09/15/09">
<comment>old DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="38D1" name="OP_AAExpUpdate" updated="08/12/09">
+ <opcode id="3CD6" name="OP_AAExpUpdate" updated="09/15/09">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5821" name="OP_HPUpdate" updated="08/12/09">
+ <opcode id="4938" name="OP_HPUpdate" updated="09/15/09">
<comment>old NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="16F5" name="OP_GuildMemberUpdate" updated="08/12/09">
+ <opcode id="15B2" name="OP_GuildMemberUpdate" updated="09/15/09">
<comment></comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="37A7" name="OP_SpawnRename" updated="08/12/09">
+ <opcode id="1318" name="OP_SpawnRename" updated="09/15/09">
<comment>Spawns getting renamed after initial NewSpawn</comment>
<payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
</opcode>
- <opcode id="099D" name="OP_GroupInvited" updated="08/12/09">
+ <!--<opcode id="5251" name="OP_GroupInvited" updated="09/15/09">
<payload dir="server" typename="groupInviteStruct" sizechecktype="match"/>
<comment>You got invited to a group</comment>
+ </opcode>-->
+ <opcode id="389A" name="OP_GroupInvite" updated="09/15/09">
+ <payload dir="both" typename="groupInviteStruct" sizechecktype="none"/>
+ <comment>You invite or get invited</comment>
</opcode>
- <opcode id="7930" name="OP_GroupInvite" updated="08/12/09">
- <payload dir="client" typename="groupInviteStruct" sizechecktype="match"/>
- <comment>You're inviting someone and you're not grouped</comment>
- </opcode>
- <opcode id="1497" name="OP_SwapSpell" updated="08/12/09">
+ <opcode id="73D6" name="OP_SwapSpell" updated="09/15/09">
<comment>old TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6884" name="OP_SimpleMessage" updated="08/12/09">
+ <opcode id="2137" name="OP_SimpleMessage" updated="09/15/09">
<comment>old SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="429B" name="OP_SpecialMesg" updated="08/12/09">
+ <opcode id="14FF" name="OP_SpecialMesg" updated="09/15/09">
<comment>Communicate textual info to client</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="28A7" name="OP_RandomReq" updated="08/12/09">
+ <opcode id="86C7" name="OP_RandomReq" updated="09/15/09">
<comment>old RandomReqCode</comment>
<payload dir="client" typename="randomReqStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7113" name="OP_ConsentResponse" updated="08/12/09">
+ <opcode id="0E24" name="OP_ConsentResponse" updated="09/15/09">
<comment>Server replying with consent information after /consent</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1AC8" name="OP_DenyResponse" updated="08/12/09">
+ <opcode id="4CD1" name="OP_DenyResponse" updated="09/15/09">
<comment>Server replying with deny information after /deny</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="60B5" name="OP_BazaarSearch" updated="08/12/09">
+ <opcode id="3B85" name="OP_BazaarSearch" updated="09/15/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">
+ <opcode id="1F92" name="OP_WearChange" updated="09/15/09">
<comment>old SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="03A9" name="OP_SpawnAppearance" updated="08/12/09">
+ <opcode id="4B1A" name="OP_SpawnAppearance" updated="09/15/09">
<comment>old SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
- <opcode id="52B5" name="OP_Stamina" updated="08/12/09">
+ <opcode id="72F8" name="OP_Stamina" updated="09/15/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">
+ <opcode id="48B8" name="OP_Consider" updated="09/15/09">
<comment>old ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="24A3" name="OP_ZoneChange" updated="08/12/09">
+ <opcode id="4A61" name="OP_ZoneChange" updated="09/15/09">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
- <opcode id="66C5" name="OP_Buff" updated="08/12/09">
+ <opcode id="2963" name="OP_Buff" updated="09/15/09">
<comment>old BuffDropCode</comment>
<payload dir="both" typename="buffStruct" sizechecktype="match"/>
</opcode>
- <opcode id="72F8" name="OP_Logout" updated="08/12/09">
+ <opcode id="3D86" name="OP_Logout" updated="09/15/09">
<comment></comment>
<payload dir="server" typename="none" sizechecktype="match"/>
</opcode>
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2009-08-25 00:51:03 UTC (rev 738)
+++ showeq/trunk/configure.in 2009-09-17 02:17:45 UTC (rev 739)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 5.13.6.1)
+AC_INIT(showeq, 5.13.7.0)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CANONICAL_SYSTEM
Modified: showeq/trunk/src/interface.cpp
===================================================================
--- showeq/trunk/src/interface.cpp 2009-08-25 00:51:03 UTC (rev 738)
+++ showeq/trunk/src/interface.cpp 2009-09-17 02:17:45 UTC (rev 739)
@@ -1855,9 +1855,9 @@
// m_packet->connect2("OP_GroupUpdate", SP_Zone, DIR_Server,
// "groupUpdateStruct", SZC_None,
// m_messageShell, SLOT(groupUpdate(const uint8_t*, size_t, uint8_t)));
- 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_Client|DIR_Server,
+ "groupInviteStruct", SZC_None,
+ m_messageShell, SLOT(groupInvite(const uint8_t*, size_t, uint8_t)));
// m_packet->connect2("OP_GroupInvite", SP_Zone, DIR_Server,
// "groupAltInviteStruct", SZC_Match,
// m_messageShell, SLOT(groupInvite(const uint8_t*)));
Modified: showeq/trunk/src/messageshell.cpp
===================================================================
--- showeq/trunk/src/messageshell.cpp 2009-08-25 00:51:03 UTC (rev 738)
+++ showeq/trunk/src/messageshell.cpp 2009-09-17 02:17:45 UTC (rev 739)
@@ -680,12 +680,16 @@
m_messages->addMessage(MT_Group, tempStr);
}
-void MessageShell::groupInvite(const uint8_t* data)
+void MessageShell::groupInvite(const uint8_t* data, size_t len, uint8_t dir)
{
const groupInviteStruct* gmem = (const groupInviteStruct*)data;
QString tempStr;
- tempStr.sprintf("Invite: %s invites %s to join the group",
- gmem->inviter, gmem->invitee);
+
+ if(dir == DIR_Client)
+ tempStr.sprintf("Invite: You invite %s to join the group", gmem->invitee);
+ else
+ tempStr.sprintf("Invite: %s invites %s to join the group", gmem->inviter, gmem->invitee);
+
m_messages->addMessage(MT_Group, tempStr);
}
Modified: showeq/trunk/src/messageshell.h
===================================================================
--- showeq/trunk/src/messageshell.h 2009-08-25 00:51:03 UTC (rev 738)
+++ showeq/trunk/src/messageshell.h 2009-09-17 02:17:45 UTC (rev 739)
@@ -76,7 +76,7 @@
void startCast(const uint8_t* cast);
void groupUpdate(const uint8_t* gmem, size_t, uint8_t);
- void groupInvite(const uint8_t* gmem);
+ void groupInvite(const uint8_t* gmem, size_t, uint8_t);
void groupDecline(const uint8_t* gmem);
void groupFollow(const uint8_t* gmem);
void groupDisband(const uint8_t* gmem);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
