Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[713] showeq/trunk
|
From: <iea...@us...> - 2008-10-13 02:37:57
|
Revision: 713
http://seq.svn.sourceforge.net/seq/?rev=713&view=rev
Author: ieatacid
Date: 2008-10-13 02:37:44 +0000 (Mon, 13 Oct 2008)
Log Message:
-----------
+ Compatibility with live 10/07
+ Updated structs/opcodes
+ Version to 5.12.6.0
Modified Paths:
--------------
showeq/trunk/ChangeLog
showeq/trunk/conf/zoneopcodes.xml
showeq/trunk/configure.in
showeq/trunk/src/everquest.h
showeq/trunk/src/group.cpp
showeq/trunk/src/interface.cpp
showeq/trunk/src/messageshell.cpp
showeq/trunk/src/spawnshell.cpp
Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog 2008-09-23 01:38:12 UTC (rev 712)
+++ showeq/trunk/ChangeLog 2008-10-13 02:37:44 UTC (rev 713)
@@ -1,3 +1,9 @@
+ieatacid (10/12/08)
+----------------
+- Updated version to 5.12.6.0
+- Compatibility with live 10/07
+- Updated structs/opcodes
+
ieatacid (9/22/08)
----------------
- Updated version to 5.12.5.2
Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml 2008-09-23 01:38:12 UTC (rev 712)
+++ showeq/trunk/conf/zoneopcodes.xml 2008-10-13 02:37:44 UTC (rev 713)
@@ -6,7 +6,7 @@
<comment>old CharProfileCode</comment>
<payload dir="server" typename="charProfileStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7901" name="OP_ZoneEntry" updated="01/17/08">
+ <opcode id="5A6B" name="OP_ZoneEntry" updated="10/07/08">
<comment>old ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
@@ -57,7 +57,7 @@
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="664A" name="OP_NpcMoveUpdate" updated="01/17/08">
+ <opcode id="22A7" name="OP_NpcMoveUpdate" updated="10/07/08">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -69,7 +69,7 @@
<comment>old NewSpawnCode</comment>
<payload dir="server" typename="spawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5aac" name="OP_DeleteSpawn" updated="04/17/08">
+ <opcode id="4292" name="OP_DeleteSpawn" updated="10/07/08">
<comment>old DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
@@ -142,7 +142,7 @@
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5f51" name="OP_GroupInvite" updated="09/03/08">
+ <opcode id="5D32" name="OP_GroupInvite" updated="10/07/08">
<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>
@@ -155,27 +155,27 @@
<payload dir="both" typename="groupDeclineStruct" sizechecktype="match"/>
<comment>Declining to join a group</comment>
</opcode>
- <opcode id="1842" name="OP_GroupFollow" updated="09/03/08">
+ <opcode id="21BE" name="OP_GroupFollow" updated="10/07/08">
<payload dir="server" typename="groupFollowStruct" sizechecktype="match"/>
<comment>You join a group</comment>
</opcode>
- <!--<opcode id="1842" name="OP_GroupFollow2" updated="09/03/08">
- <payload dir="server" typename="groupAltFollowStruct" sizechecktype="match"/>
+ <opcode id="3E22" name="OP_GroupFollow2" updated="10/07/08">
+ <payload dir="server" typename="groupFollowStruct" sizechecktype="match"/>
<comment>Player joins your group</comment>
- </opcode>-->
- <opcode id="4036" name="OP_GroupUpdate" updated="09/03/08">
+ </opcode>
+ <opcode id="7351" name="OP_GroupUpdate" updated="10/07/08">
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
<comment>Variable length packet with group member names</comment>
</opcode>
- <opcode id="7545" name="OP_GroupDisband" updated="09/03/08">
+ <opcode id="C56C" name="OP_GroupDisband" updated="10/07/08">
<comment>You disband from group</comment>
<payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/>
</opcode>
- <opcode id="16be" name="OP_GroupDisband2" updated="09/03/08">
+ <opcode id="162D" name="OP_GroupDisband2" updated="10/07/08">
<comment>Other disbands from group</comment>
<payload dir="server" typename="groupDisbandStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1560" name="OP_GroupLeader" updated="09/03/08">
+ <opcode id="7545" name="OP_GroupLeader" updated="10/07/08">
<comment>Group leader change</comment>
<payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/>
</opcode>
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2008-09-23 01:38:12 UTC (rev 712)
+++ showeq/trunk/configure.in 2008-10-13 02:37:44 UTC (rev 713)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 5.12.5.2)
+AC_INIT(showeq, 5.12.6.0)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CANONICAL_SYSTEM
Modified: showeq/trunk/src/everquest.h
===================================================================
--- showeq/trunk/src/everquest.h 2008-09-23 01:38:12 UTC (rev 712)
+++ showeq/trunk/src/everquest.h 2008-10-13 02:37:44 UTC (rev 713)
@@ -604,7 +604,8 @@
/*0916*/ uint8_t unknown0916[4]; // *** Placeholder (11/24/2007)
/*0920*/ uint8_t unknown0920[4]; // *** Placeholder (01/17/2008)
/*0924*/ uint8_t unknown0924[4]; // *** Placeholder (09/03/2008)
-/*0928*/
+/*0928*/ uint8_t unknown0928[4]; // *** Placeholder (10/07/2008)
+/*0932*/
};
/**
@@ -685,7 +686,7 @@
/*
** Player Profile
-** Length: 23608 Octets
+** Length: 23488 Octets
** OpCode: CharProfileCode
*/
struct charProfileStruct
@@ -699,11 +700,12 @@
/*15264*/ uint32_t birthdayTime; // character birthday
/*15268*/ uint32_t lastSaveTime; // character last save time
/*15272*/ uint32_t timePlayedMin; // time character played
-/*15276*/ uint8_t pvp; // 1=pvp, 0=not pvp
-/*15277*/ uint8_t anon; // 2=roleplay, 1=anon, 0=not anon
-/*15278*/ uint8_t gm; // 0=no, 1=yes (guessing!)
-/*15279*/ int8_t guildstatus; // 0=member, 1=officer, 2=guildleader
-/*15280*/ uint8_t unknown15280[12];
+/*15276*/ uint8_t unknown15276[4];
+/*15280*/ uint8_t pvp; // 1=pvp, 0=not pvp
+/*15281*/ uint8_t anon; // 2=roleplay, 1=anon, 0=not anon
+/*15282*/ uint8_t gm; // 0=no, 1=yes (guessing!)
+/*15283*/ int8_t guildstatus; // 0=member, 1=officer, 2=guildleader
+/*15284*/ uint8_t unknown15284[8];
/*15292*/ uint32_t exp; // Current Experience
/*15296*/ uint8_t unknown15296[12];
/*15308*/ uint8_t languages[MAX_KNOWN_LANGS]; // List of languages
@@ -712,61 +714,60 @@
/*15344*/ float x; // Players x position
/*15348*/ float z; // Players z position
/*15352*/ float heading; // Players heading
-/*15356*/ uint8_t unknown15356[4]; // ***Placeholder
+/*15356*/ uint32_t standState; // 0x64 = stand
/*15360*/ uint32_t platinum_bank; // Platinum Pieces in Bank
/*15364*/ uint32_t gold_bank; // Gold Pieces in Bank
/*15368*/ uint32_t silver_bank; // Silver Pieces in Bank
/*15372*/ uint32_t copper_bank; // Copper Pieces in Bank
/*15376*/ uint32_t platinum_shared; // Shared platinum pieces
-/*15380*/ uint8_t unknown15380[716];
-/*16096*/ uint32_t expansions; // Bitmask for expansions
-/*16100*/ uint8_t unknown16100[12];
-/*16112*/ uint32_t autosplit; // 0 = off, 1 = on
-/*16116*/ uint8_t unknown16116[16];
-/*16132*/ uint16_t zoneId; // see zones.h
-/*16134*/ uint16_t zoneInstance; // Instance id
-/*16136*/ //char groupMembers[MAX_GROUP_MEMBERS][64]; // removed 9/3/2008
-/*16520*/ //char groupLeader[64]; // removed 9/3/2008
-/*16136*/ uint8_t unknown16136[800];
-/*16936*/ uint32_t leadAAActive; // 0 = leader AA off, 1 = leader AA on
-/*17380*/ uint8_t unknown17380[4];
-/*17384*/ uint32_t ldon_guk_points; // Earned GUK points
-/*17388*/ uint32_t ldon_mir_points; // Earned MIR points
-/*17392*/ uint32_t ldon_mmc_points; // Earned MMC points
-/*17396*/ uint32_t ldon_ruj_points; // Earned RUJ points
-/*17400*/ uint32_t ldon_tak_points; // Earned TAK points
-/*17404*/ uint32_t ldon_avail_points; // Available LDON points
-/*17408*/ uint8_t unknown17408[136];
-/*17544*/ uint32_t tributeTime; // Time remaining on tribute (millisecs)
-/*17548*/ uint32_t careerTribute; // Total favor points for this char
-/*17552*/ uint32_t unknown17552; // *** Placeholder
-/*17556*/ uint32_t currentTribute; // Current tribute points
-/*17560*/ uint32_t unknown17560; // *** Placeholder
-/*17564*/ uint32_t tributeActive; // 0 = off, 1=on
-/*17568*/ TributeStruct tributes[MAX_TRIBUTES]; // Current tribute loadout
-/*17608*/ uint8_t unknown17608[8];
-/*17616*/ float expGroupLeadAA; // Current group lead exp points
-/*17620*/ uint32_t unknown17620;
-/*17624*/ float expRaidLeadAA; // Current raid lead AA exp points
-/*17628*/ uint32_t groupLeadAAUnspent; // Unspent group lead AA points
-/*17632*/ uint32_t raidLeadAAUnspent; // Unspent raid lead AA points
-/*17636*/ uint32_t leadershipAAs[MAX_LEAD_AA]; // Leader AA ranks
-/*17764*/ uint8_t unknown17764[128];
-/*17892*/ uint32_t airRemaining; // Air supply (seconds)
-/*17896*/ uint8_t unknown17896[4608];
-/*22504*/ uint32_t expAA; // Exp earned in current AA point
-/*22508*/ uint8_t unknown22508[40];
-/*22548*/ uint32_t currentRadCrystals; // Current count of radiant crystals
-/*22552*/ uint32_t careerRadCrystals; // Total count of radiant crystals ever
-/*22556*/ uint32_t currentEbonCrystals;// Current count of ebon crystals
-/*22560*/ uint32_t careerEbonCrystals; // Total count of ebon crystals ever
-/*22564*/ uint8_t groupAutoconsent; // 0=off, 1=on
-/*22565*/ uint8_t raidAutoconsent; // 0=off, 1=on
-/*22566*/ uint8_t guildAutoconsent; // 0=off, 1=on
-/*22567*/ uint8_t unknown22567[5]; // ***Placeholder (6/29/2005)
-/*22572*/ uint32_t showhelm; // 0=no, 1=yes
-/*22576*/ uint8_t unknown22576[1032]; // ***Placeholder (2/13/2007)
-/*23608*/
+/*15380*/ uint8_t unknown15380[1036];
+/*16416*/ uint32_t expansions; // Bitmask for expansions
+/*16420*/ uint8_t unknown16420[12];
+/*16432*/ uint32_t autosplit; // 0 = off, 1 = on
+/*16436*/ uint8_t unknown16436[16];
+/*16452*/ uint16_t zoneId; // see zones.h
+/*16454*/ uint16_t zoneInstance; // Instance id
+/*16456*/ uint8_t unknown16456[800];
+/*17256*/ uint32_t leadAAActive; // 0 = leader AA off, 1 = leader AA on
+/*17260*/ uint8_t unknown17260[4];
+/*17264*/ uint32_t ldon_guk_points; // Earned GUK points
+/*17268*/ uint32_t ldon_mir_points; // Earned MIR points
+/*17272*/ uint32_t ldon_mmc_points; // Earned MMC points
+/*17276*/ uint32_t ldon_ruj_points; // Earned RUJ points
+/*17280*/ uint32_t ldon_tak_points; // Earned TAK points
+/*17284*/ uint32_t ldon_avail_points; // Available LDON points
+/*17288*/ uint8_t unknown17288[136];
+/*17424*/ uint32_t tributeTime; // Time remaining on tribute (millisecs)
+/*17428*/ uint32_t careerTribute; // Total favor points for this char
+/*17432*/ uint32_t unknown17432; // *** Placeholder
+/*17436*/ uint32_t currentTribute; // Current tribute points
+/*17440*/ uint32_t unknown17440; // *** Placeholder
+/*17444*/ uint32_t tributeActive; // 0 = off, 1=on
+/*17448*/ TributeStruct tributes[MAX_TRIBUTES]; // Current tribute loadout
+/*17488*/ uint8_t unknown17488[4];
+/*17492*/ float expGroupLeadAA; // Current group lead exp points
+/*17496*/ uint32_t unknown17496;
+/*17500*/ float expRaidLeadAA; // Current raid lead AA exp points
+/*17504*/ uint32_t unknown17504;
+/*17508*/ uint32_t groupLeadAAUnspent; // Unspent group lead AA points
+/*17512*/ uint32_t raidLeadAAUnspent; // Unspent raid lead AA points
+/*17516*/ uint32_t leadershipAAs[MAX_LEAD_AA]; // Leader AA ranks
+/*17644*/ uint8_t unknown17644[128];
+/*17772*/ uint32_t airRemaining; // Air supply (seconds)
+/*17776*/ uint8_t unknown17776[4608];
+/*22384*/ uint32_t expAA; // Exp earned in current AA point
+/*22388*/ uint8_t unknown22388[40];
+/*22428*/ uint32_t currentRadCrystals; // Current count of radiant crystals
+/*22432*/ uint32_t careerRadCrystals; // Total count of radiant crystals ever
+/*22436*/ uint32_t currentEbonCrystals;// Current count of ebon crystals
+/*22440*/ uint32_t careerEbonCrystals; // Total count of ebon crystals ever
+/*22444*/ uint8_t groupAutoconsent; // 0=off, 1=on
+/*22445*/ uint8_t raidAutoconsent; // 0=off, 1=on
+/*22446*/ uint8_t guildAutoconsent; // 0=off, 1=on
+/*22447*/ uint8_t unknown22447[5]; // ***Placeholder (6/29/2005)
+/*22452*/ uint32_t showhelm; // 0=no, 1=yes
+/*22456*/ uint8_t unknown22456[1032]; // ***Placeholder (2/13/2007)
+/*23488*/
};
#if 0
@@ -1662,7 +1663,7 @@
/*
** Grouping Invite
-** Length 140 Octets (invite a player) or 144 (you get invited)
+** Length 148 Octets (invite a player) or 152 (you get invited)
** Opcode OP_GroupInvite
*/
@@ -1670,21 +1671,21 @@
{
/*0000*/ char invitee[64]; // Invitee's Name
/*0064*/ char inviter[64]; // Inviter's Name
-/*0128*/ uint8_t unknown0128[12]; // ***Placeholder
-/*0140*/
+/*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 unknown0132[16]; // ***Placeholder
-/*0144*/
+/*0128*/ uint8_t unknown0128[24]; // ***Placeholder
+/*0152*/
};
/*
** Grouping Invite Answer - Decline
-** Length 144 Octets
+** Length 152 Octets
** Opcode GroupDeclineCode
*/
@@ -1692,15 +1693,15 @@
{
/*0000*/ char yourname[64]; // Player Name
/*0064*/ char membername[64]; // Invited Member Name
-/*0128*/ uint8_t unknown0128[12]; // ***Placeholder
-/*0140*/ uint8_t reason; // Already in Group = 1, Declined Invite = 3
-/*0141*/ uint8_t unknown0141[3]; // ***Placeholder
-/*0144*/
+/*0128*/ uint8_t unknown0128[20]; // ***Placeholder
+/*0148*/ uint8_t reason; // Already in Group = 1, Declined Invite = 3
+/*0149*/ uint8_t unknown0141[3]; // ***Placeholder
+/*0152*/
};
/*
** Grouping Invite Answer - Accept
-** Length 140 Octets
+** Length 148 Octets
** Opcode OP_GroupFollow
*/
@@ -1710,13 +1711,13 @@
/*0064*/ char invitee[64]; // Invitee's Member Name
/*0128*/ uint8_t unknown0132[4]; // ***Placeholder
/*0132*/ uint32_t level; // Invitee's level
-/*0136*/ uint8_t unknown0136[4]; // ***Placeholder (zeros)
-/*0140*/
+/*0136*/ uint8_t unknown0136[12]; // ***Placeholder (zeros)
+/*0148*/
};
/*
** Group Disbanding
-** Length 140 Octets
+** Length 148 Octets
** Opcode
*/
@@ -1724,13 +1725,13 @@
{
/*0000*/ char yourname[64]; // Player Name
/*0064*/ char membername[64]; // Invited Member Name
-/*0128*/ uint8_t unknown0128[12]; // ***Placeholder
-/*0140*/
+/*0128*/ uint8_t unknown0128[20]; // ***Placeholder
+/*0148*/
};
/*
** Group Leader Change
-** Length 140 Octets
+** Length 148 Octets
** Opcode OP_GroupLeader
*/
@@ -1738,8 +1739,8 @@
{
/*0000*/ char unknown0000[64]; // ***Placeholder
/*0064*/ char membername[64]; // Invited Member Name
-/*0128*/ uint8_t unknown0128[12]; // ***Placeholder
-/*0140*/
+/*0128*/ uint8_t unknown0128[20]; // ***Placeholder
+/*0148*/
};
/*
Modified: showeq/trunk/src/group.cpp
===================================================================
--- showeq/trunk/src/group.cpp 2008-09-23 01:38:12 UTC (rev 712)
+++ showeq/trunk/src/group.cpp 2008-10-13 02:37:44 UTC (rev 713)
@@ -125,6 +125,8 @@
m_membersInZoneCount++;
emit added(m_members[i]->m_name, m_members[i]->m_spawn);
+
+ netStream.skipBytes(7);
}
// clear the rest
Modified: showeq/trunk/src/interface.cpp
===================================================================
--- showeq/trunk/src/interface.cpp 2008-09-23 01:38:12 UTC (rev 712)
+++ showeq/trunk/src/interface.cpp 2008-10-13 02:37:44 UTC (rev 713)
@@ -1854,6 +1854,9 @@
m_packet->connect2("OP_GroupFollow", SP_Zone, DIR_Server,
"groupFollowStruct", SZC_Match,
m_messageShell, SLOT(groupFollow(const uint8_t*)));
+ m_packet->connect2("OP_GroupFollow2", SP_Zone, DIR_Server,
+ "groupFollowStruct", SZC_Match,
+ m_messageShell, SLOT(groupFollow(const uint8_t*)));
m_packet->connect2("OP_GroupDisband", SP_Zone, DIR_Server,
"groupDisbandStruct", SZC_Match,
m_messageShell, SLOT(groupDisband(const uint8_t*)));
Modified: showeq/trunk/src/messageshell.cpp
===================================================================
--- showeq/trunk/src/messageshell.cpp 2008-09-23 01:38:12 UTC (rev 712)
+++ showeq/trunk/src/messageshell.cpp 2008-10-13 02:37:44 UTC (rev 713)
@@ -680,7 +680,10 @@
const groupFollowStruct* gFollow = (const groupFollowStruct*)data;
QString tempStr;
- tempStr.sprintf("Follow: %s has joined the group", gFollow->invitee);
+ if(!strcmp(gFollow->invitee, m_player->name()))
+ tempStr = "Follow: You have joined the group";
+ else
+ tempStr.sprintf("Follow: %s has joined the group", gFollow->invitee);
m_messages->addMessage(MT_Group, tempStr);
}
Modified: showeq/trunk/src/spawnshell.cpp
===================================================================
--- showeq/trunk/src/spawnshell.cpp 2008-09-23 01:38:12 UTC (rev 712)
+++ showeq/trunk/src/spawnshell.cpp 2008-10-13 02:37:44 UTC (rev 713)
@@ -624,7 +624,7 @@
strcpy(spawn->suffix,name.latin1());
}
- netStream.skipBytes(32);
+ netStream.skipBytes(33);
// now we're at the end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
