Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[864] showeq/trunk
|
From: <fra...@us...> - 2016-10-23 03:25:50
|
Revision: 864
http://sourceforge.net/p/seq/svn/864
Author: fransick
Date: 2016-10-23 03:25:47 +0000 (Sun, 23 Oct 2016)
Log Message:
-----------
Small fixes to:
- charProfileStruct
- everquest.h
Modified Paths:
--------------
showeq/trunk/conf/zoneopcodes.xml
showeq/trunk/src/everquest.h
showeq/trunk/src/packet.cpp
showeq/trunk/src/spawnshell.cpp
showeq/trunk/src/zonemgr.cpp
Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml 2016-10-21 17:23:15 UTC (rev 863)
+++ showeq/trunk/conf/zoneopcodes.xml 2016-10-23 03:25:47 UTC (rev 864)
@@ -211,11 +211,11 @@
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="703a" name="OP_RandomReq" updated="11/20/15">
+ <opcode id="3715" name="OP_RandomReq" updated="10/19/16">
<comment>RandomReqCode</comment>
<payload dir="client" typename="randomReqStruct" sizechecktype="match"/>
</opcode>
- <opcode id="440d" name="OP_RandomReply" updated="11/20/15">
+ <opcode id="27a2" name="OP_RandomReply" updated="10/19/16">
<comment>RandomCode</comment>
<payload dir="server" typename="randomStruct" sizechecktype="match"/>
</opcode>
Modified: showeq/trunk/src/everquest.h
===================================================================
--- showeq/trunk/src/everquest.h 2016-10-21 17:23:15 UTC (rev 863)
+++ showeq/trunk/src/everquest.h 2016-10-23 03:25:47 UTC (rev 864)
@@ -104,7 +104,7 @@
#define MAX_KNOWN_SKILLS 100
#define MAX_SPELL_SLOTS 16
#define MAX_KNOWN_LANGS 32
-#define MAX_SPELLBOOK_SLOTS 720
+#define MAX_SPELLBOOK_SLOTS 800
#define MAX_GROUP_MEMBERS 6
#define MAX_BUFFS 42
#define MAX_GUILDS 8192
@@ -112,7 +112,7 @@
#define MAX_BANDOLIERS 20
#define MAX_POTIONS_IN_BELT 5
#define MAX_TRIBUTES 5
-#define MAX_DISCIPLINES 200
+#define MAX_DISCIPLINES 300
//Item Flags
#define ITEM_NORMAL 0x0000
@@ -561,7 +561,7 @@
/*
** Client Zone Entry struct
-** Length: 80 Octets
+** Length: 88 Octets
** OpCode: ZoneEntryCode (when direction == client)
*/
struct ClientZoneEntryStruct
@@ -569,8 +569,8 @@
/*0000*/ uint32_t unknown0000; // ***Placeholder
/*0004*/ char name[32]; // Player firstname
/*0036*/ uint8_t unknown0036[28]; // ***Placeholder
-/*0064*/ uint32_t unknown0064[7]; // unknown
-/*0080*/
+/*0064*/ uint32_t unknown0064[6]; // unknown
+/*0088*/
};
Modified: showeq/trunk/src/packet.cpp
===================================================================
--- showeq/trunk/src/packet.cpp 2016-10-21 17:23:15 UTC (rev 863)
+++ showeq/trunk/src/packet.cpp 2016-10-23 03:25:47 UTC (rev 864)
@@ -628,8 +628,8 @@
}
else if (((packet.getDestPort() >= LoginServerMinPort) &&
(packet.getDestPort() <= LoginServerMaxPort)) ||
- (packet.getSourcePort() >= LoginServerMinPort) &&
- (packet.getSourcePort() <= LoginServerMaxPort))
+ ((packet.getSourcePort() >= LoginServerMinPort) &&
+ (packet.getSourcePort() <= LoginServerMaxPort)))
{
// Drop login server traffic
return;
Modified: showeq/trunk/src/spawnshell.cpp
===================================================================
--- showeq/trunk/src/spawnshell.cpp 2016-10-21 17:23:15 UTC (rev 863)
+++ showeq/trunk/src/spawnshell.cpp 2016-10-23 03:25:47 UTC (rev 864)
@@ -1012,7 +1012,7 @@
uint16_t spawnId = stream.readUInt(16);
// BSH 13 Apr 2011 -- garbage added in packet
- uint16_t unk1 = stream.readUInt(16);
+ stream.readUInt(16);
// 6 bit field specifier.
Modified: showeq/trunk/src/zonemgr.cpp
===================================================================
--- showeq/trunk/src/zonemgr.cpp 2016-10-21 17:23:15 UTC (rev 863)
+++ showeq/trunk/src/zonemgr.cpp 2016-10-23 03:25:47 UTC (rev 864)
@@ -207,7 +207,7 @@
// Really, everything after the level is not critical for operation. If
// needed, skip the rest to get up and running quickly after patch day.
- // Bind points
+ // Bind points (5 ints)
int bindCount = netStream.readUInt32NC();
for (int i = 0; i < bindCount; i++) {
memcpy(&player->profile.binds[i], netStream.pos(), sizeof(player->profile.binds[i]));
@@ -217,13 +217,13 @@
player->profile.deity = netStream.readUInt32NC();
player->profile.intoxication = netStream.readUInt32NC();
- // Spell slot refresh
+ // Spell slot refresh (10 ints)
int spellRefreshCount = netStream.readUInt32NC();
for (int i = 0; i < spellRefreshCount; i++) {
player->profile.spellSlotRefresh[i] = netStream.readUInt32NC();
}
- // Equipment
+ // Equipment (22 ints)
int equipCount = netStream.readUInt32NC();
for (int i = 0; i < equipCount; i++) {
memcpy(&player->profile.equipment[i], netStream.pos(), sizeof(player->profile.equipment[i]));
@@ -265,7 +265,7 @@
// Unknown
netStream.skipBytes(28);
- // AAs
+ // AAs (300 ints)
int aaCount = netStream.readUInt32NC();
for (int i = 0; i < aaCount; i++) {
player->profile.aa_array[i].AA = netStream.readUInt32NC();
@@ -273,66 +273,67 @@
player->profile.aa_array[i].unknown008 = netStream.readUInt32NC();
}
- // Something (100 ints)
- int sCount3 = netStream.readUInt32NC();
- for (int i = 0; i < sCount3; i++) {
+ // Number of SKills (100 ints)
+ int skills = netStream.readUInt32NC();
+ for (int i = 0; i < skills; i++) {
netStream.skipBytes(4);
}
// Something (25 ints)
- int sCount4 = netStream.readUInt32NC();
- for (int i = 0; i < sCount4; i++) {
+ int sCount3 = netStream.readUInt32NC();
+ for (int i = 0; i < sCount3; i++) {
netStream.skipBytes(4);
}
- // Something (300 ints)
- int sCount5 = netStream.readUInt32NC();
- for (int i = 0; i < sCount5; i++) {
- netStream.skipBytes(4);
+ // Disciplines (300 ints)
+ int disciplineCount = netStream.readUInt32NC();
+ for (int i = 0; i < disciplineCount; i++) {
+ player->profile.disciplines[i] = netStream.readUInt32NC();
}
- // Something (20 ints)
- int sCount6 = netStream.readUInt32NC();
- for (int i = 0; i < sCount6; i++) {
+ // Something (25 ints)
+ int sCount4 = netStream.readUInt32NC();
+ for (int i = 0; i < sCount4; i++) {
netStream.skipBytes(4);
}
// Unknown
netStream.skipBytes (4);
- // Something (20 floats)
- int sCount7 = netStream.readUInt32NC();
- for (int i = 0; i < sCount7; i++) {
- netStream.skipBytes(4);
+ // Recast Timers (25 ints)
+ int recastTypes = netStream.readUInt32NC();
+ for (int i = 0; i < recastTypes; i++) {
+ player->profile.recastTimers[i] = netStream.readUInt32NC();
}
- // Something (100 floats)
- int sCount8 = netStream.readUInt32NC();
- for (int i = 0; i < sCount8; i++) {
+ // Something (100 ints)
+ int sCount5 = netStream.readUInt32NC();
+ for (int i = 0; i < sCount5; i++) {
netStream.skipBytes(4);
}
- // Spellbook
+ // Spellbook (800 ints)
int spellBookSlots = netStream.readUInt32NC();
for (int i = 0; i < spellBookSlots; i++) {
player->profile.sSpellBook[i] = netStream.readInt32();
}
- // Mem Spell Slots
+ // Mem Spell Slots (16 ints)
int spellMemSlots = netStream.readUInt32NC();
for (int i = 0; i < spellMemSlots; i++) {
player->profile.sMemSpells[i] = netStream.readInt32();
}
- // Something (13 ints)
- int sCount9 = netStream.readUInt32NC();
- for (int i = 0; i < sCount9; i++) {
- netStream.skipBytes(4);
+ // Spell Slot Refresh Timers (13 ints)
+ int spellSlotRefreshTimer = netStream.readUInt32NC();
+ for (int i = 0; i < spellSlotRefreshTimer; i++) {
+ player->profile.spellSlotRefresh[i] = netStream.readInt32();
}
// Unknown
netStream.skipBytes(1);
+ // Buff Count (42 ints)
int buffCount = netStream.readUInt32NC();
for (int i = 0; i < buffCount; i++) {
memcpy(&player->profile.buffs[i], netStream.pos(), sizeof(player->profile.buffs[i]));
@@ -367,14 +368,7 @@
// Unknown
netStream.skipBytes(2);
-/*
- // Bandolier
- netStream.skipBytes(996);
-
- // Potion Belt
- netStream.skipBytes(153);
-*/
-
+ //Bandolier (20 ints)
int bandolierCount = netStream.readUInt32NC();
for (int i = 0; i < bandolierCount; i++) {
name = netStream.readText();
@@ -415,6 +409,7 @@
player->profile.bandoliers[i].ammo.icon = netStream.readUInt32NC();
}
+ //Potion Belt (5 ints)
int potionCount = netStream.readUInt32NC();
for (int i = 0; i < potionCount; i++) {
name = netStream.readText();
@@ -426,21 +421,22 @@
}
// Unknown
- netStream.skipBytes(84);
+ netStream.skipBytes(80);
player->profile.endurance = netStream.readUInt32NC();
// Unknown
netStream.skipBytes(12);
+ // Name
+ int firstName = netStream.readUInt32NC();
memcpy(player->name, netStream.pos(), 64);
- netStream.skipBytes(64);
+ netStream.skipBytes(firstName);
- // Unknown
- netStream.skipBytes(4);
-
+ // Lastname
+ int lastName = netStream.readUInt32NC();
memcpy(player->lastName, netStream.pos(), 32);
- netStream.skipBytes(32);
+ netStream.skipBytes(lastName);
player->birthdayTime = netStream.readUInt32NC();
player->accountCreateDate = netStream.readUInt32NC();
@@ -448,18 +444,16 @@
player->timePlayedMin = netStream.readUInt32NC();
// Unknown
- netStream.skipBytes(8);
+ netStream.skipBytes(4);
-/*
- // Something (32 ints) Think this is MAX_KNOWN_LANGS - cannot get this to skip the 36 bytes so added skip below
- int sCount10 = netStream.readUInt8();
- for (int i = 0; i < sCount10; i++) {
+ player->expansions = netStream.readUInt32NC();
+
+ // MAX_KNOWN_LANGS (32 ints)
+ int langCount = netStream.readUInt32NC();
+ for (int i = 0; i < langCount; i++) {
+ player->languages[i] = netStream.readUInt8();
}
-*/
- // Unknown
- netStream.skipBytes(36);
-
player->zoneId = netStream.readUInt16NC();
player->zoneInstance = netStream.readUInt16NC();
@@ -475,12 +469,8 @@
memcpy(&player->heading, netStream.pos(), sizeof(player->heading));
netStream.skipBytes(sizeof(player->heading));
-/*
- player->standState = netStream.readUInt8();
-*/
-
- netStream.skipBytes(4);
-
+ player->standState = netStream.readUInt16();
+ player->anon = netStream.readUInt16();
player->guildID = netStream.readUInt32NC();
// Unknown
@@ -495,9 +485,9 @@
// Unknown
netStream.skipBytes(12);
- // Something (164 ints)
- int sCount11 = netStream.readUInt32NC();
- for (int i = 0; i < sCount11; i++) {
+ // Something (236 ints)
+ int sCount6 = netStream.readUInt32NC();
+ for (int i = 0; i < sCount6; i++) {
netStream.skipBytes(8);
}
@@ -514,15 +504,21 @@
// Unknown
netStream.skipBytes(6);
- // Tributes
+ // Tributes (5 ints)
int tributeCount = netStream.readUInt32NC();
for (int i = 0; i < tributeCount; i++) {
memcpy(&player->tributes[i], netStream.pos(), sizeof(player->tributes[i]));
netStream.skipBytes(sizeof(player->tributes[i]));
}
+ // Something (10 ints)
+ int sCount7 = netStream.readUInt32NC();
+ for (int i = 0; i < sCount7; i++) {
+ netStream.skipBytes(8);
+ }
+
// Unknown
- netStream.skipBytes(229);
+ netStream.skipBytes(145);
player->currentRadCrystals = netStream.readUInt32NC();
player->careerRadCrystals = netStream.readUInt32NC();
@@ -530,8 +526,14 @@
player->careerEbonCrystals = netStream.readUInt32NC();
// Unknown
- netStream.skipBytes(153);
+ netStream.skipBytes(91);
+ player->autosplit = netStream.readUInt8();
+
+ // Unknown
+ netStream.skipBytes(61);
+
+
player->ldon_guk_points = netStream.readUInt32NC();
player->ldon_mir_points = netStream.readUInt32NC();
player->ldon_mmc_points = netStream.readUInt32NC();
@@ -543,11 +545,6 @@
// Below are the structs still not found in the new playerpacket
/*
- int skillCount = netStream.readUInt32NC();
- for (int i = 0; i < skillCount; i++) {
- player->profile.skills[i] = netStream.readUInt32NC();
- }
-
int innateSkillCount = netStream.readUInt32NC();
for (int i = 0; i < innateSkillCount; i++) {
player->profile.innateSkills[i] = netStream.readUInt32NC();
@@ -557,27 +554,11 @@
player->profile.thirst = netStream.readUInt32NC();
player->profile.hunger = netStream.readUInt32NC();
- int disciplineCount = netStream.readUInt32NC();
- for (int i = 0; i < disciplineCount; i++) {
- player->profile.disciplines[i] = netStream.readUInt32NC();
- }
-
- int recastTypes = netStream.readUInt32NC();
- for (int i = 0; i < recastTypes; i++) {
- player->profile.recastTimers[i] = netStream.readUInt32NC();
- }
-
player->pvp = netStream.readUInt8();
- player->anon = netStream.readUInt8();
player->gm = netStream.readUInt8();
player->guildstatus = netStream.readInt8();
player->exp = netStream.readUInt32NC();
- int langCount = netStream.readUInt32NC();
- for (int i = 0; i < langCount; i++) {
- player->languages[i] = netStream.readUInt8();
- }
-
// Unknown (41)
int doubleIntCount = netStream.readUInt32NC();
for (int i = 0; i < doubleIntCount; i++) {
@@ -590,10 +571,6 @@
for (int i = 0; i < byteCount; i++) {
char something = netStream.readUInt8();
}
-
- player->expansions = netStream.readUInt32NC();
- player->autosplit = netStream.readUInt8();
-
*/
retVal = netStream.pos() - netStream.data();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
