Menu
▾
▴
seq-cvs-commit — syncmail generated CVS commit notifications
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(18) |
Oct
(11) |
Nov
(9) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(6) |
Mar
|
Apr
(10) |
May
(38) |
Jun
(15) |
Jul
(32) |
Aug
|
Sep
(17) |
Oct
(11) |
Nov
|
Dec
(14) |
| 2006 |
Jan
(2) |
Feb
(5) |
Mar
(3) |
Apr
(2) |
May
(3) |
Jun
(7) |
Jul
|
Aug
|
Sep
(3) |
Oct
(2) |
Nov
(6) |
Dec
(3) |
| 2007 |
Jan
|
Feb
(17) |
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
(11) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
(6) |
Jul
|
Aug
|
Sep
(6) |
Oct
(4) |
Nov
(1) |
Dec
|
| 2009 |
Jan
(3) |
Feb
(2) |
Mar
(4) |
Apr
|
May
(4) |
Jun
(3) |
Jul
|
Aug
(5) |
Sep
(3) |
Oct
(2) |
Nov
|
Dec
(6) |
| 2010 |
Jan
|
Feb
(6) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(8) |
Aug
|
Sep
(2) |
Oct
(2) |
Nov
(4) |
Dec
(5) |
| 2013 |
Jan
(2) |
Feb
|
Mar
(2) |
Apr
(2) |
May
(1) |
Jun
(2) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(2) |
Nov
(2) |
Dec
(2) |
| 2014 |
Jan
(3) |
Feb
(2) |
Mar
(3) |
Apr
(4) |
May
(4) |
Jun
(3) |
Jul
(4) |
Aug
(5) |
Sep
|
Oct
(2) |
Nov
(5) |
Dec
(2) |
| 2015 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(10) |
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(2) |
Sep
(2) |
Oct
(3) |
Nov
(4) |
Dec
(2) |
| 2017 |
Jan
(2) |
Feb
|
Mar
(2) |
Apr
(4) |
May
(2) |
Jun
(2) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2018 |
Jan
(4) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(2) |
Jun
(2) |
Jul
(8) |
Aug
(2) |
Sep
(2) |
Oct
(2) |
Nov
(4) |
Dec
(6) |
| 2019 |
Jan
(2) |
Feb
(2) |
Mar
(2) |
Apr
(4) |
May
(2) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(2) |
Oct
(13) |
Nov
(6) |
Dec
(4) |
| 2020 |
Jan
(7) |
Feb
(7) |
Mar
(7) |
Apr
(8) |
May
(5) |
Jun
(3) |
Jul
(10) |
Aug
(4) |
Sep
|
Oct
(37) |
Nov
(30) |
Dec
(8) |
| 2021 |
Jan
(14) |
Feb
(9) |
Mar
(7) |
Apr
(17) |
May
(3) |
Jun
(10) |
Jul
(7) |
Aug
(3) |
Sep
(3) |
Oct
(4) |
Nov
(15) |
Dec
(22) |
| 2022 |
Jan
(3) |
Feb
(3) |
Mar
(3) |
Apr
(3) |
May
(3) |
Jun
(3) |
Jul
(3) |
Aug
(5) |
Sep
(6) |
Oct
(4) |
Nov
(34) |
Dec
(17) |
| 2023 |
Jan
(3) |
Feb
(3) |
Mar
(29) |
Apr
(2) |
May
(18) |
Jun
(12) |
Jul
(12) |
Aug
(2) |
Sep
(7) |
Oct
(2) |
Nov
(2) |
Dec
(2) |
| 2024 |
Jan
(2) |
Feb
(10) |
Mar
(17) |
Apr
(6) |
May
(3) |
Jun
(9) |
Jul
(22) |
Aug
(48) |
Sep
(3) |
Oct
(2) |
Nov
(2) |
Dec
(8) |
| 2025 |
Jan
(3) |
Feb
(2) |
Mar
(9) |
Apr
(7) |
May
(3) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <cn...@us...> - 2021-06-21 04:42:06
|
Revision: 1185
http://sourceforge.net/p/seq/svn/1185
Author: cn187
Date: 2021-06-21 04:42:04 +0000 (Mon, 21 Jun 2021)
Log Message:
-----------
Add safety check for formatted message arg sizes.
This works around a crash (due to possible packet changes) until a
proper fix can be found.
Modified Paths:
--------------
showeq/branches/cn187_devel/src/eqstr.cpp
Modified: showeq/branches/cn187_devel/src/eqstr.cpp
===================================================================
--- showeq/branches/cn187_devel/src/eqstr.cpp 2021-06-21 04:41:50 UTC (rev 1184)
+++ showeq/branches/cn187_devel/src/eqstr.cpp 2021-06-21 04:42:04 UTC (rev 1185)
@@ -148,7 +148,7 @@
while (cp < ((unsigned char *) &arguments[argsLen] - sizeof(uint32_t)*sizeof(unsigned char))) {
arg_len = (cp[0] << 0) | (cp[1] << 8) | (cp[2] << 16) | (cp[3] << 24);
cp += 4;
- if (arg_len == 0)
+ if (arg_len == 0 || arg_len > argsLen)
break;
tempStr += " ";
tempStr += QString::fromUtf8((const char *) cp, arg_len);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-06-21 04:41:56
|
Revision: 1184
http://sourceforge.net/p/seq/svn/1184
Author: cn187
Date: 2021-06-21 04:41:50 +0000 (Mon, 21 Jun 2021)
Log Message:
-----------
Fix issue with console map name display
Modified Paths:
--------------
showeq/branches/cn187_devel/src/mapcore.cpp
Modified: showeq/branches/cn187_devel/src/mapcore.cpp
===================================================================
--- showeq/branches/cn187_devel/src/mapcore.cpp 2021-06-16 19:16:41 UTC (rev 1183)
+++ showeq/branches/cn187_devel/src/mapcore.cpp 2021-06-21 04:41:50 UTC (rev 1184)
@@ -508,19 +508,17 @@
return;
- const char* filename = fileName.toLatin1().data();
-
QFile mapFile(fileName);
if (!mapFile.open(QIODevice::ReadOnly))
{
- seqWarn("Error opening map file '%s'!", filename);
+ seqWarn("Error opening map file '%s'!", fileName.toLatin1().data());
return;
}
// note the file name
- m_fileName = filename;
+ m_fileName = fileName;
// allocate memory in a QByteArray to hold the entire file contents
QByteArray textData(mapFile.size() + 1, '\0');
@@ -553,7 +551,7 @@
if (!count)
{
seqWarn("Error, no fields in first line of map file '%s'",
- filename);
+ fileName.toLatin1().data());
return;
}
@@ -560,7 +558,7 @@
if (count < 2)
{
seqWarn("Error, too few fields in first line of map file '%s'",
- filename);
+ fileName.toLatin1().data());
return;
}
@@ -619,7 +617,7 @@
if (count < 3)
{
seqWarn("Error reading M line %d on map '%s'! %d is too few fields",
- filelines, filename, count);
+ filelines, fileName.toLatin1().data(), count);
continue;
}
@@ -630,7 +628,7 @@
if (linePoints < 2)
{
seqWarn("M Line %d in map '%s' only had %d points, not loading.",
- filelines, filename, linePoints );
+ filelines, fileName.toLatin1().data(), linePoints );
continue;
}
@@ -647,7 +645,7 @@
if (!ok)
{
seqWarn("Error reading number of points on line %d in map '%s'!",
- filelines, filename);
+ filelines, fileName.toLatin1().data());
continue;
}
@@ -654,7 +652,7 @@
if ((specifiedLinePoints != linePoints) && (specifiedLinePoints != 0))
{
seqWarn("M Line %d in map '%s' has %d points as opposed to the %d points it specified!",
- filelines, filename, linePoints, specifiedLinePoints);
+ filelines, fileName.toLatin1().data(), linePoints, specifiedLinePoints);
}
// create an M line
@@ -700,7 +698,7 @@
if (count < 3)
{
seqWarn("Error reading L line %d on map '%s'! %d is too few fields",
- filelines, filename, count);
+ filelines, fileName.toLatin1().data(), count);
continue;
}
@@ -711,7 +709,7 @@
if (linePoints < 2)
{
seqWarn("L Line %d in map '%s' only had %d points, not loading.",
- filelines, filename, linePoints);
+ filelines, fileName.toLatin1().data(), linePoints);
continue;
}
@@ -728,7 +726,7 @@
if (!ok)
{
seqWarn("Error reading number of points on line %d in map '%s'!",
- filelines, filename);
+ filelines, fileName.toLatin1().data());
continue;
}
@@ -735,7 +733,7 @@
if ((specifiedLinePoints != linePoints) && (specifiedLinePoints != 0))
{
seqWarn("L Line %d in map '%s' has %d points as opposed to the %d points it specified!",
- filelines, filename, linePoints, specifiedLinePoints);
+ filelines, fileName.toLatin1().data(), linePoints, specifiedLinePoints);
}
// create the appropriate style L line depending on if the global
@@ -788,7 +786,7 @@
if (count < 4)
{
seqWarn("Error reading P line %d on map '%s'! %d is too few fields",
- filelines, filename, count);
+ filelines, fileName.toLatin1().data(), count);
continue;
}
@@ -827,7 +825,7 @@
if (count < 2)
{
seqWarn("Line %d in map '%s' has an A record with too few fields (%d)!",
- filelines, filename, count);
+ filelines, fileName.toLatin1().data(), count);
break;
}
@@ -835,7 +833,7 @@
if (name.isEmpty())
{
seqWarn("Line %d in map '%s' has an A marker with no Name expression!",
- filelines, filename);
+ filelines, fileName.toLatin1().data());
break;
}
rangeVal = (*fit++).toUShort();
@@ -842,7 +840,7 @@
if (!rangeVal)
{
seqWarn("Line %d in map '%s' has an A marker with no or 0 Range radius!",
- filelines, filename);
+ filelines, fileName.toLatin1().data());
break;
}
@@ -859,7 +857,7 @@
if (count < 1)
{
seqWarn("Line %d in map '%s' has an H record with too few fields (%d)!",
- filelines, filename, count);
+ filelines, fileName.toLatin1().data(), count);
break;
}
@@ -868,7 +866,7 @@
if (!ok)
{
seqWarn("Line %d in map '%s' has an H marker with invalid Z!",
- filelines, filename);
+ filelines, fileName.toLatin1().data());
break;
}
globHeightSet = true;
@@ -885,7 +883,7 @@
if (count < 1)
{
seqWarn("Line %d in map '%s' has a Z record with too few fields (%d)!",
- filelines, filename, count);
+ filelines, fileName.toLatin1().data(), count);
break;
}
@@ -893,7 +891,7 @@
if (!ok)
{
seqWarn("Line %d in map '%s' has an Z marker with invalid ZEM!",
- filelines, filename);
+ filelines, fileName.toLatin1().data());
break;
}
#ifdef DEBUGMAPLOAD
@@ -911,7 +909,7 @@
m_mapLoaded = true;
m_imageLoaded = false;
- QString imageFileName = filename;
+ QString imageFileName = fileName;
imageFileName.truncate(imageFileName.lastIndexOf('.'));
imageFileName += ".pgm";
@@ -921,7 +919,7 @@
seqInfo("Loaded map image: '%s'", imageFileName.toLatin1().data());
}
- seqInfo("Loaded map: '%s'", filename);
+ seqInfo("Loaded map: '%s'", fileName.toLatin1().data());
}
void MapData::loadSOEMap(const QString& fileName, bool import)
@@ -952,19 +950,17 @@
if (fileName.contains("/.txt") != 0)
return;
- const char* filename = fileName.toLatin1().data();
-
QFile mapFile(fileName);
if (!mapFile.open(QIODevice::ReadOnly))
{
- seqWarn("Error opening map file '%s'!", filename);
+ seqWarn("Error opening map file '%s'!", fileName.toLatin1().data());
return;
}
// note the file name
- m_fileName = filename;
+ m_fileName = fileName;
// allocate memory in a QByteArray to hold the entire file contents
QByteArray textData(mapFile.size() + 1, '\0');
@@ -1039,7 +1035,7 @@
if (count != 9)
{
seqWarn("Error reading L line %d on map '%s'! %d is an incorrect field count!",
- filelines, filename, count);
+ filelines, fileName.toLatin1().data(), count);
continue;
}
@@ -1106,7 +1102,7 @@
if (count != 8)
{
seqWarn("Error reading L line %d on map '%s'! %d is an incorrect field count!",
- filelines, filename, count);
+ filelines, fileName.toLatin1().data(), count);
continue;
}
@@ -1141,7 +1137,7 @@
m_mapLoaded = true;
m_imageLoaded = false;
- QString imageFileName = filename;
+ QString imageFileName = fileName;
imageFileName.truncate(imageFileName.lastIndexOf('.'));
imageFileName += ".pgm";
@@ -1151,7 +1147,7 @@
seqInfo("Loaded map image: '%s'", imageFileName.toLatin1().data());
}
- seqInfo("Loaded SOE map: '%s'", filename);
+ seqInfo("Loaded SOE map: '%s'", fileName.toLatin1().data());
}
void MapData::saveMap(const QString& fileName) const
@@ -1162,15 +1158,15 @@
FILE * fh;
uint32_t i;
- const char* filename;
+ QString filename;
if (!fileName.isEmpty())
- filename = fileName.toLatin1().data();
+ filename = fileName;
else
- filename = m_fileName.toLatin1().data();
+ filename = m_fileName;
- if ((fh = fopen(filename, "w")) == NULL)
+ if ((fh = fopen(filename.toLatin1().data(), "w")) == NULL)
{
- seqWarn("Error saving map '%s'!", filename);
+ seqWarn("Error saving map '%s'!", filename.toLatin1().data());
return;
}
@@ -1283,13 +1279,14 @@
}
#ifdef DEBUGMAP
- seqDebug("saveMap() - map '%s' saved with %d L lines, %d M lines, %d locations", filename,
- m_lLines.count(), m_mLines.count(), m_locations.count());
+ seqDebug("saveMap() - map '%s' saved with %d L lines, %d M lines, %d locations",
+ filename.toLatin1().data(),
+ m_lLines.count(), m_mLines.count(), m_locations.count());
#endif
fclose (fh);
- seqInfo("Saved map: '%s'", filename);
+ seqInfo("Saved map: '%s'", filename.toLatin1().data());
}
void MapData::saveSOEMap(const QString& fileName) const
@@ -1300,15 +1297,15 @@
FILE * fh;
uint i;
- const char* filename;
+ QString filename;
if (!fileName.isEmpty())
- filename = fileName.toLatin1().data();
+ filename = fileName;
else
- filename = m_fileName.toLatin1().data();
+ filename = m_fileName;
- if ((fh = fopen(filename, "w")) == NULL)
+ if ((fh = fopen(filename.toLatin1().data(), "w")) == NULL)
{
- seqWarn("Error saving map '%s'!", filename);
+ seqWarn("Error saving map '%s'!", filename.toLatin1().data());
return;
}
@@ -1395,13 +1392,14 @@
name.toLatin1().data());
}
#ifdef DEBUGMAP
- seqDebug("saveMap() - map '%s' saved with %d L lines, %d M lines, %d locations", filename,
- m_lLines.count(), m_mLines.count(), m_locations.count());
+ seqDebug("saveMap() - map '%s' saved with %d L lines, %d M lines, %d locations",
+ filename.toLatin1().data(),
+ m_lLines.count(), m_mLines.count(), m_locations.count());
#endif
fclose (fh);
- seqInfo("Saved SOE map: '%s'", filename);
+ seqInfo("Saved SOE map: '%s'", filename.toLatin1().data());
}
bool MapData::isAggro(const QString& name, uint16_t* range) const
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-06-16 19:16:43
|
Revision: 1183
http://sourceforge.net/p/seq/svn/1183
Author: cn187
Date: 2021-06-16 19:16:41 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
Change fillSpawnStruct to loop through posData
Change fillSpawnStruct to loop through posData (based on struct size)
rather than hardcoding the fill of each element. This will allow the size
of posData to change without needing to adjust fillSpawnStruct.
Modified Paths:
--------------
showeq/branches/cn187_devel/src/spawnshell.cpp
Modified: showeq/branches/cn187_devel/src/spawnshell.cpp
===================================================================
--- showeq/branches/cn187_devel/src/spawnshell.cpp 2021-06-16 18:42:30 UTC (rev 1182)
+++ showeq/branches/cn187_devel/src/spawnshell.cpp 2021-06-16 19:16:41 UTC (rev 1183)
@@ -798,11 +798,9 @@
spawn->equipment[8].equip0 = netStream.readUInt32NC();
}
- spawn->posData[0] = netStream.readUInt32NC();
- spawn->posData[1] = netStream.readUInt32NC();
- spawn->posData[2] = netStream.readUInt32NC();
- spawn->posData[3] = netStream.readUInt32NC();
- spawn->posData[4] = netStream.readUInt32NC();
+ for (int i = 0; i < (sizeof(spawn->posData)/sizeof(spawn->posData[0])); ++i) {
+ spawn->posData[i] = netStream.readUInt32NC();
+ }
if(spawn->hasTitle)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-06-16 18:42:31
|
Revision: 1182
http://sourceforge.net/p/seq/svn/1182
Author: cn187
Date: 2021-06-16 18:42:30 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
Release 6.1.3
- Updated version to 6.1.3
- Support for EQ patch 06/16/21
- Opcode and struct updates
Modified Paths:
--------------
showeq/branches/cn187_devel/ChangeLog
showeq/branches/cn187_devel/conf/zoneopcodes.xml
showeq/branches/cn187_devel/configure.in
showeq/branches/cn187_devel/src/everquest.h
Modified: showeq/branches/cn187_devel/ChangeLog
===================================================================
--- showeq/branches/cn187_devel/ChangeLog 2021-06-16 18:31:48 UTC (rev 1181)
+++ showeq/branches/cn187_devel/ChangeLog 2021-06-16 18:42:30 UTC (rev 1182)
@@ -1,3 +1,9 @@
+cn187 (06/16/21)
+----------------
+- Updated version to 6.1.3
+- Support for EQ patch 06/16/21
+- Opcode and struct updates
+
cn187 (05/20/21)
----------------
- Updated version to 6.1.2
Modified: showeq/branches/cn187_devel/conf/zoneopcodes.xml
===================================================================
--- showeq/branches/cn187_devel/conf/zoneopcodes.xml 2021-06-16 18:31:48 UTC (rev 1181)
+++ showeq/branches/cn187_devel/conf/zoneopcodes.xml 2021-06-16 18:42:30 UTC (rev 1182)
@@ -3,127 +3,127 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="304d" name="OP_PlayerProfile" updated="05/19/21">
+ <opcode id="7644" name="OP_PlayerProfile" updated="06/16/21">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4e21" name="OP_ZoneEntry" updated="05/19/21">
+ <opcode id="482a" name="OP_ZoneEntry" updated="06/16/21">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="0c8d" name="OP_TimeOfDay" updated="05/19/21">
+ <opcode id="1e14" name="OP_TimeOfDay" updated="06/16/21">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1afe" name="OP_NewZone" updated="05/19/21">
+ <opcode id="6fab" name="OP_NewZone" updated="06/16/21">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="239b" name="OP_SpawnDoor" updated="05/19/21">
+ <opcode id="3a3b" name="OP_SpawnDoor" updated="06/16/21">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="208f" name="OP_GroundSpawn" updated="05/19/21">
+ <opcode id="0ad4" name="OP_GroundSpawn" updated="06/16/21">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="3734" name="OP_SendZonePoints" updated="05/19/21">
+ <opcode id="7c9d" name="OP_SendZonePoints" updated="06/16/21">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="386d" name="OP_AAExpUpdate" updated="05/19/21">
+ <opcode id="5463" name="OP_AAExpUpdate" updated="06/16/21">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="405b" name="OP_ExpUpdate" updated="05/19/21">
+ <opcode id="7340" name="OP_ExpUpdate" updated="06/16/21">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4089" name="OP_GuildMOTD" updated="05/19/21">
+ <opcode id="16b3" name="OP_GuildMOTD" updated="06/16/21">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="3b56" name="OP_ClientUpdate" updated="05/19/21">
+ <opcode id="673e" name="OP_ClientUpdate" updated="06/16/21">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="29d3" name="OP_NpcMoveUpdate" updated="05/19/21">
+ <opcode id="1ec7" name="OP_NpcMoveUpdate" updated="06/16/21">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="1b37" name="OP_MobUpdate" updated="05/19/21">
+ <opcode id="1bdb" name="OP_MobUpdate" updated="06/16/21">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="317f" name="OP_DeleteSpawn" updated="05/19/21">
+ <opcode id="2107" name="OP_DeleteSpawn" updated="06/16/21">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7718" name="OP_RemoveSpawn" updated="05/19/21">
+ <opcode id="46a1" name="OP_RemoveSpawn" updated="06/16/21">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="2241" name="OP_Death" updated="05/19/21">
+ <opcode id="11bb" name="OP_Death" updated="06/16/21">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1ac5" name="OP_WearChange" updated="05/19/21">
+ <opcode id="6c44" name="OP_WearChange" updated="06/16/21">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="702c" name="OP_SpawnAppearance" updated="05/19/21">
+ <opcode id="784d" name="OP_SpawnAppearance" updated="06/16/21">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1f40" name="OP_Stamina" updated="05/19/21">
+ <opcode id="44a1" name="OP_Stamina" updated="06/16/21">
<comment>Server updating on hunger/thirst</comment>
<payload dir="server" typename="staminaStruct" sizechecktype="match"/>
</opcode>
- <opcode id="53c0" name="OP_HPUpdate" updated="05/19/21">
+ <opcode id="2a75" name="OP_HPUpdate" updated="06/16/21">
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="31f2" name="OP_GuildMemberUpdate" updated="05/19/21">
+ <opcode id="60bc" name="OP_GuildMemberUpdate" updated="06/16/21">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="1b9a" name="OP_ClickObject" updated="05/19/21">
+ <opcode id="01d2" name="OP_ClickObject" updated="06/16/21">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1efb" name="OP_Action" updated="05/19/21">
+ <opcode id="7476" name="OP_Action" updated="06/16/21">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="799e" name="OP_Action2" updated="05/19/21">
+ <opcode id="5b6a" name="OP_Action2" updated="06/16/21">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="107c" name="OP_Consider" updated="05/19/21">
+ <opcode id="3027" name="OP_Consider" updated="06/16/21">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0a6d" name="OP_TargetMouse" updated="05/19/21">
+ <opcode id="097f" name="OP_TargetMouse" updated="06/16/21">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2a6a" name="OP_SpawnRename" updated="05/19/21">
+ <opcode id="2fb8" name="OP_SpawnRename" updated="06/16/21">
<comment>Spawns getting renamed after initial NewSpawn</comment>
<payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0134" name="OP_Illusion" updated="05/19/21">
+ <opcode id="0866" name="OP_Illusion" updated="06/16/21">
<comment>Spawn being illusioned (changing forms)</comment>
<payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7d4d" name="OP_Shroud" updated="05/19/21">
+ <opcode id="24cb" name="OP_Shroud" updated="06/16/21">
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="4be3" name="OP_ZoneChange" updated="05/19/21">
+ <opcode id="12f2" name="OP_ZoneChange" updated="06/16/21">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -163,55 +163,55 @@
<comment>Group leader change</comment>
<payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6b8d" name="OP_Buff" updated="05/19/21">
+ <opcode id="34db" name="OP_Buff" updated="06/16/21">
<comment>old BuffDropCode</comment>
<payload dir="both" typename="buffStruct" sizechecktype="match"/>
</opcode>
- <opcode id="41c3" name="OP_BeginCast" updated="05/19/21">
+ <opcode id="2485" name="OP_BeginCast" updated="06/16/21">
<comment>BeginCastCode</comment>
<payload dir="both" typename="beginCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="198c" name="OP_CastSpell" updated="05/19/21">
+ <opcode id="705e" name="OP_CastSpell" updated="06/16/21">
<comment>StartCastCode</comment>
<payload dir="both" typename="startCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7edf" name="OP_SwapSpell" updated="05/19/21">
+ <opcode id="2691" name="OP_SwapSpell" updated="06/16/21">
<comment>TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="54b6" name="OP_MemorizeSpell" updated="05/19/21">
+ <opcode id="3f71" name="OP_MemorizeSpell" updated="06/16/21">
<comment>MemSpellCode</comment>
<payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
</opcode>
- <opcode id="28ec" name="OP_InspectAnswer" updated="05/19/21">
+ <opcode id="7199" name="OP_InspectAnswer" updated="06/16/21">
<comment>InspectDataCode</comment>
<payload dir="both" typename="inspectDataStruct" sizechecktype="match"/>
</opcode>
- <opcode id="599f" name="OP_Emote" updated="05/19/21">
+ <opcode id="00a2" name="OP_Emote" updated="06/16/21">
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="045c" name="OP_SimpleMessage" updated="05/19/21">
+ <opcode id="2ca0" name="OP_SimpleMessage" updated="06/16/21">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0458" name="OP_FormattedMessage" updated="05/19/21">
+ <opcode id="6e1c" name="OP_FormattedMessage" updated="06/16/21">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="6a82" name="OP_CommonMessage" updated="05/19/21">
+ <opcode id="5f15" name="OP_CommonMessage" updated="06/16/21">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="3164" name="OP_SpecialMesg" updated="05/19/21">
+ <opcode id="3ebc" name="OP_SpecialMesg" updated="06/16/21">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="0039" name="OP_RandomReq" updated="05/19/21">
+ <opcode id="1fa2" name="OP_RandomReq" updated="06/16/21">
<comment>RandomReqCode</comment>
<payload dir="client" typename="randomReqStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2ab4" name="OP_RandomReply" updated="05/19/21">
+ <opcode id="5a66" name="OP_RandomReply" updated="06/16/21">
<comment>RandomCode</comment>
<payload dir="server" typename="randomStruct" sizechecktype="match"/>
</opcode>
@@ -223,36 +223,36 @@
<comment>Server replying with deny information after /deny</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="432b" name="OP_ManaChange" updated="05/19/21">
+ <opcode id="10ca" name="OP_ManaChange" updated="06/16/21">
<comment>Mana change. Bards send this up with no size. Casters receive this for mana updates.</comment>
<payload dir="server" typename="manaDecrementStruct" sizechecktype="match"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="2203" name="OP_BazaarSearchRequest" updated="05/19/21">
+ <opcode id="0229" name="OP_BazaarSearchRequest" updated="06/16/21">
<comment>Bazaar search request </comment>
<payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/>
</opcode>
- <opcode id="41ab" name="OP_BazaarSearchResponse" updated="05/19/21">
+ <opcode id="6615" name="OP_BazaarSearchResponse" updated="06/16/21">
<comment>Bazaar search Response - Struct incorrect </comment>
<payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="08a8" name="OP_MoneyOnCorpse" updated="05/19/21">
+ <opcode id="7579" name="OP_MoneyOnCorpse" updated="06/16/21">
<comment>MoneyOnCorpseCode</comment>
<payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0b4f" name="OP_SkillUpdate" updated="05/19/21">
+ <opcode id="724c" name="OP_SkillUpdate" updated="06/16/21">
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1b81" name="OP_LevelUpdate" updated="05/19/21">
+ <opcode id="6df9" name="OP_LevelUpdate" updated="06/16/21">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="697c" name="OP_DzSwitchInfo" updated="05/19/21">
+ <opcode id="2437" name="OP_DzSwitchInfo" updated="06/16/21">
<comment>Expedition compass etc</comment>
<payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/>
</opcode>
- <opcode id="4e0e" name="OP_DzInfo" updated="05/19/21">
+ <opcode id="423f" name="OP_DzInfo" updated="06/16/21">
<comment>Expedition Information</comment>
<payload dir="server" typename="dzInfo" sizechecktype="match"/>
</opcode>
@@ -260,11 +260,11 @@
<comment>Environmental Damage</comment>
<payload dir="client" typename="environmentDamageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="17ad" name="OP_SetRunMode" updated="05/19/21">
+ <opcode id="7ba6" name="OP_SetRunMode" updated="06/16/21">
<comment>old cRunToggleCode</comment>
<payload dir="client" typename="cRunToggleStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6626" name="OP_Trader" updated="05/19/21">
+ <opcode id="719e" name="OP_Trader" updated="06/16/21">
<comment>PC's turning trader on and off</comment>
<payload dir="server" typename="bazaarTraderRequest" sizechecktype="match"/>
</opcode>
@@ -307,15 +307,15 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="0840" name="OP_GuildMemberList" updated="05/19/21">
+ <opcode id="2766" name="OP_GuildMemberList" updated="06/16/21">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4584" name="OP_ManaUpdate" updated="05/19/21">
+ <opcode id="6797" name="OP_ManaUpdate" updated="06/16/21">
<comment>Mana Update opcode - 10 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="6d4b" name="OP_EndUpdate" updated="05/19/21">
+ <opcode id="6d50" name="OP_EndUpdate" updated="06/16/21">
<comment>Endurance Update opcode - 10 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5299" name="OP_ExpandedGuildInfo" updated="05/19/21">
+ <opcode id="1fdf" name="OP_ExpandedGuildInfo" updated="06/16/21">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -535,11 +535,11 @@
<comment>Listing of all guilds. Can be triggered by /lfg search?</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="55bf" name="OP_GuildsInZoneList" updated="05/19/21">
+ <opcode id="54f9" name="OP_GuildsInZoneList" updated="06/16/21">
<comment>Listing of guild names present in the current zone. Generally seen on zoning</comment>
<payload dir="server" typename="guildsInZoneListStruct" sizechecktype="none"/>
</opcode>
- <opcode id="1712" name="OP_NewGuildInZone" updated="05/19/21">
+ <opcode id="562d" name="OP_NewGuildInZone" updated="06/16/21">
<comment>An additional guild name has appeared in the current zone. Seen when a guilded player enters the current zone</comment>
<payload dir="server" typename="newGuildInZoneStruct" sizechecktype="none"/>
</opcode>
@@ -595,7 +595,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="69d3" name="OP_Find" updated="05/19/21">
+ <opcode id="7dff" name="OP_Find" updated="06/16/21">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
Modified: showeq/branches/cn187_devel/configure.in
===================================================================
--- showeq/branches/cn187_devel/configure.in 2021-06-16 18:31:48 UTC (rev 1181)
+++ showeq/branches/cn187_devel/configure.in 2021-06-16 18:42:30 UTC (rev 1182)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.1.2)
+AC_INIT(showeq, 6.1.3)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
Modified: showeq/branches/cn187_devel/src/everquest.h
===================================================================
--- showeq/branches/cn187_devel/src/everquest.h 2021-06-16 18:31:48 UTC (rev 1181)
+++ showeq/branches/cn187_devel/src/everquest.h 2021-06-16 18:42:30 UTC (rev 1182)
@@ -1113,24 +1113,23 @@
struct
{
- signed deltaX:13; // change in x
+ unsigned heading:12; // heading
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding00:8;
+
+ signed deltaZ:13; // change in z
signed animation:10; // current animation
- unsigned padding00:9;
+ unsigned padding01:9;
+ signed deltaY:13; // change in y
signed y:19; // y coord (2nd loc value)
- signed deltaY:13; // change in y
- unsigned heading:12; // heading
- signed deltaZ:13; // change in z
- unsigned padding02:7;
-
signed deltaHeading:10; // change in heading
- signed x:19; // x coord (1st loc value)
+ signed z:19; // z coord (3rd loc value)
unsigned padding03:3;
- signed z:19; // z coord (3rd loc value)
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding04:1;
+ signed x:19; // x coord (1st loc value)
+ signed deltaX:13; // change in x
};
int32_t posData[5];
@@ -2393,24 +2392,23 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/
- signed deltaX:13; // change in x
+ unsigned heading:12; // heading
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding00:8;
+/*0008*/
+ signed deltaZ:13; // change in z
signed animation:10; // current animation
- unsigned padding00:9;
-/*0008*/
+ unsigned padding01:9;
+/*0012*/
+ signed deltaY:13; // change in y
signed y:19; // y coord (2nd loc value)
- signed deltaY:13; // change in y
-/*0012*/
- unsigned heading:12; // heading
- signed deltaZ:13; // change in z
- unsigned padding02:7;
/*0016*/
signed deltaHeading:10; // change in heading
- signed x:19; // x coord (1st loc value)
+ signed z:19; // z coord (3rd loc value)
unsigned padding03:3;
/*0020*/
- signed z:19; // z coord (3rd loc value)
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding04:1;
+ signed x:19; // x coord (1st loc value)
+ signed deltaX:13; // change in x
/*0024*/
};
@@ -2425,27 +2423,27 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
- float x; // x coord (1st loc value)
+ float z; // z coord (3rd loc value)
/*0010*/
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned heading:12; // heading
+ unsigned padding01:8;
+/*0014*/
float y; // y coord (2nd loc value)
-/*0014*/
- float deltaX; // change in x
/*0018*/
signed deltaHeading:10; // change in heading
unsigned padding03:22;
/*0022*/
- float z; // z coord (3rd loc value)
+ float deltaX; // change in x
/*0026*/
- unsigned heading:12; // heading
- unsigned padding05:20;
+ float deltaY; // change in y
/*0030*/
- float deltaY; // change in y
+ signed animation:10; // current animation
+ unsigned padding06:22;
/*0034*/
float deltaZ; // change in z
/*0038*/
- signed animation:10; // current animation
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding08:10;
+ float x; // x coord (1st loc value)
/*0042*/
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-06-16 18:31:48
|
Revision: 1181
http://sourceforge.net/p/seq/svn/1181
Author: cn187
Date: 2021-06-16 18:31:48 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
Tag for release 6.1.3
Added Paths:
-----------
showeq/tags/v6_1_3/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-06-16 18:30:06
|
Revision: 1180
http://sourceforge.net/p/seq/svn/1180
Author: cn187
Date: 2021-06-16 18:30:02 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
Release 6.1.3
- Updated version to 6.1.3
- Support for EQ patch 06/16/21
- Opcode and struct updates
Modified Paths:
--------------
showeq/trunk/ChangeLog
showeq/trunk/conf/zoneopcodes.xml
showeq/trunk/configure.in
showeq/trunk/src/everquest.h
Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog 2021-05-20 15:40:43 UTC (rev 1179)
+++ showeq/trunk/ChangeLog 2021-06-16 18:30:02 UTC (rev 1180)
@@ -1,3 +1,9 @@
+cn187 (06/16/21)
+----------------
+- Updated version to 6.1.3
+- Support for EQ patch 06/16/21
+- Opcode and struct updates
+
cn187 (05/20/21)
----------------
- Updated version to 6.1.2
Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml 2021-05-20 15:40:43 UTC (rev 1179)
+++ showeq/trunk/conf/zoneopcodes.xml 2021-06-16 18:30:02 UTC (rev 1180)
@@ -3,127 +3,127 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="304d" name="OP_PlayerProfile" updated="05/19/21">
+ <opcode id="7644" name="OP_PlayerProfile" updated="06/16/21">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4e21" name="OP_ZoneEntry" updated="05/19/21">
+ <opcode id="482a" name="OP_ZoneEntry" updated="06/16/21">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="0c8d" name="OP_TimeOfDay" updated="05/19/21">
+ <opcode id="1e14" name="OP_TimeOfDay" updated="06/16/21">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1afe" name="OP_NewZone" updated="05/19/21">
+ <opcode id="6fab" name="OP_NewZone" updated="06/16/21">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="239b" name="OP_SpawnDoor" updated="05/19/21">
+ <opcode id="3a3b" name="OP_SpawnDoor" updated="06/16/21">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="208f" name="OP_GroundSpawn" updated="05/19/21">
+ <opcode id="0ad4" name="OP_GroundSpawn" updated="06/16/21">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="3734" name="OP_SendZonePoints" updated="05/19/21">
+ <opcode id="7c9d" name="OP_SendZonePoints" updated="06/16/21">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="386d" name="OP_AAExpUpdate" updated="05/19/21">
+ <opcode id="5463" name="OP_AAExpUpdate" updated="06/16/21">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="405b" name="OP_ExpUpdate" updated="05/19/21">
+ <opcode id="7340" name="OP_ExpUpdate" updated="06/16/21">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4089" name="OP_GuildMOTD" updated="05/19/21">
+ <opcode id="16b3" name="OP_GuildMOTD" updated="06/16/21">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="3b56" name="OP_ClientUpdate" updated="05/19/21">
+ <opcode id="673e" name="OP_ClientUpdate" updated="06/16/21">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="29d3" name="OP_NpcMoveUpdate" updated="05/19/21">
+ <opcode id="1ec7" name="OP_NpcMoveUpdate" updated="06/16/21">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="1b37" name="OP_MobUpdate" updated="05/19/21">
+ <opcode id="1bdb" name="OP_MobUpdate" updated="06/16/21">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="317f" name="OP_DeleteSpawn" updated="05/19/21">
+ <opcode id="2107" name="OP_DeleteSpawn" updated="06/16/21">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7718" name="OP_RemoveSpawn" updated="05/19/21">
+ <opcode id="46a1" name="OP_RemoveSpawn" updated="06/16/21">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="2241" name="OP_Death" updated="05/19/21">
+ <opcode id="11bb" name="OP_Death" updated="06/16/21">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1ac5" name="OP_WearChange" updated="05/19/21">
+ <opcode id="6c44" name="OP_WearChange" updated="06/16/21">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="702c" name="OP_SpawnAppearance" updated="05/19/21">
+ <opcode id="784d" name="OP_SpawnAppearance" updated="06/16/21">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1f40" name="OP_Stamina" updated="05/19/21">
+ <opcode id="44a1" name="OP_Stamina" updated="06/16/21">
<comment>Server updating on hunger/thirst</comment>
<payload dir="server" typename="staminaStruct" sizechecktype="match"/>
</opcode>
- <opcode id="53c0" name="OP_HPUpdate" updated="05/19/21">
+ <opcode id="2a75" name="OP_HPUpdate" updated="06/16/21">
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="31f2" name="OP_GuildMemberUpdate" updated="05/19/21">
+ <opcode id="60bc" name="OP_GuildMemberUpdate" updated="06/16/21">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="1b9a" name="OP_ClickObject" updated="05/19/21">
+ <opcode id="01d2" name="OP_ClickObject" updated="06/16/21">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1efb" name="OP_Action" updated="05/19/21">
+ <opcode id="7476" name="OP_Action" updated="06/16/21">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="799e" name="OP_Action2" updated="05/19/21">
+ <opcode id="5b6a" name="OP_Action2" updated="06/16/21">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="107c" name="OP_Consider" updated="05/19/21">
+ <opcode id="3027" name="OP_Consider" updated="06/16/21">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0a6d" name="OP_TargetMouse" updated="05/19/21">
+ <opcode id="097f" name="OP_TargetMouse" updated="06/16/21">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2a6a" name="OP_SpawnRename" updated="05/19/21">
+ <opcode id="2fb8" name="OP_SpawnRename" updated="06/16/21">
<comment>Spawns getting renamed after initial NewSpawn</comment>
<payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0134" name="OP_Illusion" updated="05/19/21">
+ <opcode id="0866" name="OP_Illusion" updated="06/16/21">
<comment>Spawn being illusioned (changing forms)</comment>
<payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7d4d" name="OP_Shroud" updated="05/19/21">
+ <opcode id="24cb" name="OP_Shroud" updated="06/16/21">
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="4be3" name="OP_ZoneChange" updated="05/19/21">
+ <opcode id="12f2" name="OP_ZoneChange" updated="06/16/21">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -163,55 +163,55 @@
<comment>Group leader change</comment>
<payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6b8d" name="OP_Buff" updated="05/19/21">
+ <opcode id="34db" name="OP_Buff" updated="06/16/21">
<comment>old BuffDropCode</comment>
<payload dir="both" typename="buffStruct" sizechecktype="match"/>
</opcode>
- <opcode id="41c3" name="OP_BeginCast" updated="05/19/21">
+ <opcode id="2485" name="OP_BeginCast" updated="06/16/21">
<comment>BeginCastCode</comment>
<payload dir="both" typename="beginCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="198c" name="OP_CastSpell" updated="05/19/21">
+ <opcode id="705e" name="OP_CastSpell" updated="06/16/21">
<comment>StartCastCode</comment>
<payload dir="both" typename="startCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7edf" name="OP_SwapSpell" updated="05/19/21">
+ <opcode id="2691" name="OP_SwapSpell" updated="06/16/21">
<comment>TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="54b6" name="OP_MemorizeSpell" updated="05/19/21">
+ <opcode id="3f71" name="OP_MemorizeSpell" updated="06/16/21">
<comment>MemSpellCode</comment>
<payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
</opcode>
- <opcode id="28ec" name="OP_InspectAnswer" updated="05/19/21">
+ <opcode id="7199" name="OP_InspectAnswer" updated="06/16/21">
<comment>InspectDataCode</comment>
<payload dir="both" typename="inspectDataStruct" sizechecktype="match"/>
</opcode>
- <opcode id="599f" name="OP_Emote" updated="05/19/21">
+ <opcode id="00a2" name="OP_Emote" updated="06/16/21">
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="045c" name="OP_SimpleMessage" updated="05/19/21">
+ <opcode id="2ca0" name="OP_SimpleMessage" updated="06/16/21">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0458" name="OP_FormattedMessage" updated="05/19/21">
+ <opcode id="6e1c" name="OP_FormattedMessage" updated="06/16/21">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="6a82" name="OP_CommonMessage" updated="05/19/21">
+ <opcode id="5f15" name="OP_CommonMessage" updated="06/16/21">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="3164" name="OP_SpecialMesg" updated="05/19/21">
+ <opcode id="3ebc" name="OP_SpecialMesg" updated="06/16/21">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="0039" name="OP_RandomReq" updated="05/19/21">
+ <opcode id="1fa2" name="OP_RandomReq" updated="06/16/21">
<comment>RandomReqCode</comment>
<payload dir="client" typename="randomReqStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2ab4" name="OP_RandomReply" updated="05/19/21">
+ <opcode id="5a66" name="OP_RandomReply" updated="06/16/21">
<comment>RandomCode</comment>
<payload dir="server" typename="randomStruct" sizechecktype="match"/>
</opcode>
@@ -223,36 +223,36 @@
<comment>Server replying with deny information after /deny</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="432b" name="OP_ManaChange" updated="05/19/21">
+ <opcode id="10ca" name="OP_ManaChange" updated="06/16/21">
<comment>Mana change. Bards send this up with no size. Casters receive this for mana updates.</comment>
<payload dir="server" typename="manaDecrementStruct" sizechecktype="match"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="2203" name="OP_BazaarSearchRequest" updated="05/19/21">
+ <opcode id="0229" name="OP_BazaarSearchRequest" updated="06/16/21">
<comment>Bazaar search request </comment>
<payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/>
</opcode>
- <opcode id="41ab" name="OP_BazaarSearchResponse" updated="05/19/21">
+ <opcode id="6615" name="OP_BazaarSearchResponse" updated="06/16/21">
<comment>Bazaar search Response - Struct incorrect </comment>
<payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="08a8" name="OP_MoneyOnCorpse" updated="05/19/21">
+ <opcode id="7579" name="OP_MoneyOnCorpse" updated="06/16/21">
<comment>MoneyOnCorpseCode</comment>
<payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0b4f" name="OP_SkillUpdate" updated="05/19/21">
+ <opcode id="724c" name="OP_SkillUpdate" updated="06/16/21">
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1b81" name="OP_LevelUpdate" updated="05/19/21">
+ <opcode id="6df9" name="OP_LevelUpdate" updated="06/16/21">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="697c" name="OP_DzSwitchInfo" updated="05/19/21">
+ <opcode id="2437" name="OP_DzSwitchInfo" updated="06/16/21">
<comment>Expedition compass etc</comment>
<payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/>
</opcode>
- <opcode id="4e0e" name="OP_DzInfo" updated="05/19/21">
+ <opcode id="423f" name="OP_DzInfo" updated="06/16/21">
<comment>Expedition Information</comment>
<payload dir="server" typename="dzInfo" sizechecktype="match"/>
</opcode>
@@ -260,11 +260,11 @@
<comment>Environmental Damage</comment>
<payload dir="client" typename="environmentDamageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="17ad" name="OP_SetRunMode" updated="05/19/21">
+ <opcode id="7ba6" name="OP_SetRunMode" updated="06/16/21">
<comment>old cRunToggleCode</comment>
<payload dir="client" typename="cRunToggleStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6626" name="OP_Trader" updated="05/19/21">
+ <opcode id="719e" name="OP_Trader" updated="06/16/21">
<comment>PC's turning trader on and off</comment>
<payload dir="server" typename="bazaarTraderRequest" sizechecktype="match"/>
</opcode>
@@ -307,15 +307,15 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="0840" name="OP_GuildMemberList" updated="05/19/21">
+ <opcode id="2766" name="OP_GuildMemberList" updated="06/16/21">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4584" name="OP_ManaUpdate" updated="05/19/21">
+ <opcode id="6797" name="OP_ManaUpdate" updated="06/16/21">
<comment>Mana Update opcode - 10 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="6d4b" name="OP_EndUpdate" updated="05/19/21">
+ <opcode id="6d50" name="OP_EndUpdate" updated="06/16/21">
<comment>Endurance Update opcode - 10 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5299" name="OP_ExpandedGuildInfo" updated="05/19/21">
+ <opcode id="1fdf" name="OP_ExpandedGuildInfo" updated="06/16/21">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -535,11 +535,11 @@
<comment>Listing of all guilds. Can be triggered by /lfg search?</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="55bf" name="OP_GuildsInZoneList" updated="05/19/21">
+ <opcode id="54f9" name="OP_GuildsInZoneList" updated="06/16/21">
<comment>Listing of guild names present in the current zone. Generally seen on zoning</comment>
<payload dir="server" typename="guildsInZoneListStruct" sizechecktype="none"/>
</opcode>
- <opcode id="1712" name="OP_NewGuildInZone" updated="05/19/21">
+ <opcode id="562d" name="OP_NewGuildInZone" updated="06/16/21">
<comment>An additional guild name has appeared in the current zone. Seen when a guilded player enters the current zone</comment>
<payload dir="server" typename="newGuildInZoneStruct" sizechecktype="none"/>
</opcode>
@@ -595,7 +595,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="69d3" name="OP_Find" updated="05/19/21">
+ <opcode id="7dff" name="OP_Find" updated="06/16/21">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2021-05-20 15:40:43 UTC (rev 1179)
+++ showeq/trunk/configure.in 2021-06-16 18:30:02 UTC (rev 1180)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.1.2)
+AC_INIT(showeq, 6.1.3)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
Modified: showeq/trunk/src/everquest.h
===================================================================
--- showeq/trunk/src/everquest.h 2021-05-20 15:40:43 UTC (rev 1179)
+++ showeq/trunk/src/everquest.h 2021-06-16 18:30:02 UTC (rev 1180)
@@ -1113,24 +1113,23 @@
struct
{
- signed deltaX:13; // change in x
+ unsigned heading:12; // heading
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding00:8;
+
+ signed deltaZ:13; // change in z
signed animation:10; // current animation
- unsigned padding00:9;
+ unsigned padding01:9;
+ signed deltaY:13; // change in y
signed y:19; // y coord (2nd loc value)
- signed deltaY:13; // change in y
- unsigned heading:12; // heading
- signed deltaZ:13; // change in z
- unsigned padding02:7;
-
signed deltaHeading:10; // change in heading
- signed x:19; // x coord (1st loc value)
+ signed z:19; // z coord (3rd loc value)
unsigned padding03:3;
- signed z:19; // z coord (3rd loc value)
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding04:1;
+ signed x:19; // x coord (1st loc value)
+ signed deltaX:13; // change in x
};
int32_t posData[5];
@@ -2393,24 +2392,23 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/
- signed deltaX:13; // change in x
+ unsigned heading:12; // heading
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding00:8;
+/*0008*/
+ signed deltaZ:13; // change in z
signed animation:10; // current animation
- unsigned padding00:9;
-/*0008*/
+ unsigned padding01:9;
+/*0012*/
+ signed deltaY:13; // change in y
signed y:19; // y coord (2nd loc value)
- signed deltaY:13; // change in y
-/*0012*/
- unsigned heading:12; // heading
- signed deltaZ:13; // change in z
- unsigned padding02:7;
/*0016*/
signed deltaHeading:10; // change in heading
- signed x:19; // x coord (1st loc value)
+ signed z:19; // z coord (3rd loc value)
unsigned padding03:3;
/*0020*/
- signed z:19; // z coord (3rd loc value)
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding04:1;
+ signed x:19; // x coord (1st loc value)
+ signed deltaX:13; // change in x
/*0024*/
};
@@ -2425,27 +2423,27 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
- float x; // x coord (1st loc value)
+ float z; // z coord (3rd loc value)
/*0010*/
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned heading:12; // heading
+ unsigned padding01:8;
+/*0014*/
float y; // y coord (2nd loc value)
-/*0014*/
- float deltaX; // change in x
/*0018*/
signed deltaHeading:10; // change in heading
unsigned padding03:22;
/*0022*/
- float z; // z coord (3rd loc value)
+ float deltaX; // change in x
/*0026*/
- unsigned heading:12; // heading
- unsigned padding05:20;
+ float deltaY; // change in y
/*0030*/
- float deltaY; // change in y
+ signed animation:10; // current animation
+ unsigned padding06:22;
/*0034*/
float deltaZ; // change in z
/*0038*/
- signed animation:10; // current animation
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding08:10;
+ float x; // x coord (1st loc value)
/*0042*/
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-05-20 15:40:44
|
Revision: 1179
http://sourceforge.net/p/seq/svn/1179
Author: cn187
Date: 2021-05-20 15:40:43 +0000 (Thu, 20 May 2021)
Log Message:
-----------
Release 6.1.2
- Updated version to 6.1.2
- Support for EQ patch 05/19/21
- Struct and opcode updates
Modified Paths:
--------------
showeq/branches/cn187_devel/ChangeLog
showeq/branches/cn187_devel/conf/zoneopcodes.xml
showeq/branches/cn187_devel/configure.in
showeq/branches/cn187_devel/src/everquest.h
Modified: showeq/branches/cn187_devel/ChangeLog
===================================================================
--- showeq/branches/cn187_devel/ChangeLog 2021-05-20 15:25:44 UTC (rev 1178)
+++ showeq/branches/cn187_devel/ChangeLog 2021-05-20 15:40:43 UTC (rev 1179)
@@ -1,3 +1,9 @@
+cn187 (05/20/21)
+----------------
+- Updated version to 6.1.2
+- Support for EQ patch 05/19/21
+- Opcode and struct updates
+
cn187 (04/22/21)
----------------
- Updated version to 6.1.1
Modified: showeq/branches/cn187_devel/conf/zoneopcodes.xml
===================================================================
--- showeq/branches/cn187_devel/conf/zoneopcodes.xml 2021-05-20 15:25:44 UTC (rev 1178)
+++ showeq/branches/cn187_devel/conf/zoneopcodes.xml 2021-05-20 15:40:43 UTC (rev 1179)
@@ -3,127 +3,127 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="73c6" name="OP_PlayerProfile" updated="04/21/21">
+ <opcode id="304d" name="OP_PlayerProfile" updated="05/19/21">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5982" name="OP_ZoneEntry" updated="04/21/21">
+ <opcode id="4e21" name="OP_ZoneEntry" updated="05/19/21">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5962" name="OP_TimeOfDay" updated="04/21/21">
+ <opcode id="0c8d" name="OP_TimeOfDay" updated="05/19/21">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="476e" name="OP_NewZone" updated="04/21/21">
+ <opcode id="1afe" name="OP_NewZone" updated="05/19/21">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="348a" name="OP_SpawnDoor" updated="04/21/21">
+ <opcode id="239b" name="OP_SpawnDoor" updated="05/19/21">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="6479" name="OP_GroundSpawn" updated="04/21/21">
+ <opcode id="208f" name="OP_GroundSpawn" updated="05/19/21">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="600d" name="OP_SendZonePoints" updated="04/21/21">
+ <opcode id="3734" name="OP_SendZonePoints" updated="05/19/21">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="38f8" name="OP_AAExpUpdate" updated="04/21/21">
+ <opcode id="386d" name="OP_AAExpUpdate" updated="05/19/21">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="44af" name="OP_ExpUpdate" updated="04/21/21">
+ <opcode id="405b" name="OP_ExpUpdate" updated="05/19/21">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="72c8" name="OP_GuildMOTD" updated="04/21/21">
+ <opcode id="4089" name="OP_GuildMOTD" updated="05/19/21">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="3f4f" name="OP_ClientUpdate" updated="04/21/21">
+ <opcode id="3b56" name="OP_ClientUpdate" updated="05/19/21">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="19ad" name="OP_NpcMoveUpdate" updated="04/21/21">
+ <opcode id="29d3" name="OP_NpcMoveUpdate" updated="05/19/21">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="6284" name="OP_MobUpdate" updated="04/21/21">
+ <opcode id="1b37" name="OP_MobUpdate" updated="05/19/21">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="6241" name="OP_DeleteSpawn" updated="04/21/21">
+ <opcode id="317f" name="OP_DeleteSpawn" updated="05/19/21">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4732" name="OP_RemoveSpawn" updated="04/21/21">
+ <opcode id="7718" name="OP_RemoveSpawn" updated="05/19/21">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="19a8" name="OP_Death" updated="04/21/21">
+ <opcode id="2241" name="OP_Death" updated="05/19/21">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7d1b" name="OP_WearChange" updated="04/21/21">
+ <opcode id="1ac5" name="OP_WearChange" updated="05/19/21">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="26cb" name="OP_SpawnAppearance" updated="04/21/21">
+ <opcode id="702c" name="OP_SpawnAppearance" updated="05/19/21">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1e83" name="OP_Stamina" updated="04/21/21">
+ <opcode id="1f40" name="OP_Stamina" updated="05/19/21">
<comment>Server updating on hunger/thirst</comment>
<payload dir="server" typename="staminaStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5a2a" name="OP_HPUpdate" updated="04/21/21">
+ <opcode id="53c0" name="OP_HPUpdate" updated="05/19/21">
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6427" name="OP_GuildMemberUpdate" updated="04/21/21">
+ <opcode id="31f2" name="OP_GuildMemberUpdate" updated="05/19/21">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="51f2" name="OP_ClickObject" updated="04/21/21">
+ <opcode id="1b9a" name="OP_ClickObject" updated="05/19/21">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2c05" name="OP_Action" updated="04/21/21">
+ <opcode id="1efb" name="OP_Action" updated="05/19/21">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="217b" name="OP_Action2" updated="04/21/21">
+ <opcode id="799e" name="OP_Action2" updated="05/19/21">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="29ca" name="OP_Consider" updated="04/21/21">
+ <opcode id="107c" name="OP_Consider" updated="05/19/21">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0621" name="OP_TargetMouse" updated="04/21/21">
+ <opcode id="0a6d" name="OP_TargetMouse" updated="05/19/21">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6223" name="OP_SpawnRename" updated="04/21/21">
+ <opcode id="2a6a" name="OP_SpawnRename" updated="05/19/21">
<comment>Spawns getting renamed after initial NewSpawn</comment>
<payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
</opcode>
- <opcode id="50d9" name="OP_Illusion" updated="04/21/21">
+ <opcode id="0134" name="OP_Illusion" updated="05/19/21">
<comment>Spawn being illusioned (changing forms)</comment>
<payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4119" name="OP_Shroud" updated="04/21/21">
+ <opcode id="7d4d" name="OP_Shroud" updated="05/19/21">
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="35da" name="OP_ZoneChange" updated="04/21/21">
+ <opcode id="4be3" name="OP_ZoneChange" updated="05/19/21">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -163,55 +163,55 @@
<comment>Group leader change</comment>
<payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/>
</opcode>
- <opcode id="22bc" name="OP_Buff" updated="04/21/21">
+ <opcode id="6b8d" name="OP_Buff" updated="05/19/21">
<comment>old BuffDropCode</comment>
<payload dir="both" typename="buffStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3dbe" name="OP_BeginCast" updated="04/21/21">
+ <opcode id="41c3" name="OP_BeginCast" updated="05/19/21">
<comment>BeginCastCode</comment>
<payload dir="both" typename="beginCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5a44" name="OP_CastSpell" updated="04/21/21">
+ <opcode id="198c" name="OP_CastSpell" updated="05/19/21">
<comment>StartCastCode</comment>
<payload dir="both" typename="startCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="32ee" name="OP_SwapSpell" updated="04/21/21">
+ <opcode id="7edf" name="OP_SwapSpell" updated="05/19/21">
<comment>TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5c57" name="OP_MemorizeSpell" updated="04/21/21">
+ <opcode id="54b6" name="OP_MemorizeSpell" updated="05/19/21">
<comment>MemSpellCode</comment>
<payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6db3" name="OP_InspectAnswer" updated="04/21/21">
+ <opcode id="28ec" name="OP_InspectAnswer" updated="05/19/21">
<comment>InspectDataCode</comment>
<payload dir="both" typename="inspectDataStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6265" name="OP_Emote" updated="04/21/21">
+ <opcode id="599f" name="OP_Emote" updated="05/19/21">
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="11e0" name="OP_SimpleMessage" updated="04/21/21">
+ <opcode id="045c" name="OP_SimpleMessage" updated="05/19/21">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4e52" name="OP_FormattedMessage" updated="04/21/21">
+ <opcode id="0458" name="OP_FormattedMessage" updated="05/19/21">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="6f00" name="OP_CommonMessage" updated="04/21/21">
+ <opcode id="6a82" name="OP_CommonMessage" updated="05/19/21">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="165c" name="OP_SpecialMesg" updated="04/21/21">
+ <opcode id="3164" name="OP_SpecialMesg" updated="05/19/21">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="260d" name="OP_RandomReq" updated="04/21/21">
+ <opcode id="0039" name="OP_RandomReq" updated="05/19/21">
<comment>RandomReqCode</comment>
<payload dir="client" typename="randomReqStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5b74" name="OP_RandomReply" updated="04/21/21">
+ <opcode id="2ab4" name="OP_RandomReply" updated="05/19/21">
<comment>RandomCode</comment>
<payload dir="server" typename="randomStruct" sizechecktype="match"/>
</opcode>
@@ -223,36 +223,36 @@
<comment>Server replying with deny information after /deny</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7d0f" name="OP_ManaChange" updated="04/21/21">
+ <opcode id="432b" name="OP_ManaChange" updated="05/19/21">
<comment>Mana change. Bards send this up with no size. Casters receive this for mana updates.</comment>
<payload dir="server" typename="manaDecrementStruct" sizechecktype="match"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="03d6" name="OP_BazaarSearchRequest" updated="04/21/21">
+ <opcode id="2203" name="OP_BazaarSearchRequest" updated="05/19/21">
<comment>Bazaar search request </comment>
<payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/>
</opcode>
- <opcode id="32e1" name="OP_BazaarSearchResponse" updated="04/21/21">
+ <opcode id="41ab" name="OP_BazaarSearchResponse" updated="05/19/21">
<comment>Bazaar search Response - Struct incorrect </comment>
<payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="ffff" name="OP_MoneyOnCorpse" updated="02/17/21">
+ <opcode id="08a8" name="OP_MoneyOnCorpse" updated="05/19/21">
<comment>MoneyOnCorpseCode</comment>
<payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0eaa" name="OP_SkillUpdate" updated="04/21/21">
+ <opcode id="0b4f" name="OP_SkillUpdate" updated="05/19/21">
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="494d" name="OP_LevelUpdate" updated="04/21/21">
+ <opcode id="1b81" name="OP_LevelUpdate" updated="05/19/21">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3382" name="OP_DzSwitchInfo" updated="04/21/21">
+ <opcode id="697c" name="OP_DzSwitchInfo" updated="05/19/21">
<comment>Expedition compass etc</comment>
<payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/>
</opcode>
- <opcode id="784b" name="OP_DzInfo" updated="04/21/21">
+ <opcode id="4e0e" name="OP_DzInfo" updated="05/19/21">
<comment>Expedition Information</comment>
<payload dir="server" typename="dzInfo" sizechecktype="match"/>
</opcode>
@@ -260,11 +260,11 @@
<comment>Environmental Damage</comment>
<payload dir="client" typename="environmentDamageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="358d" name="OP_SetRunMode" updated="04/21/21">
+ <opcode id="17ad" name="OP_SetRunMode" updated="05/19/21">
<comment>old cRunToggleCode</comment>
<payload dir="client" typename="cRunToggleStruct" sizechecktype="match"/>
</opcode>
- <opcode id="ffff" name="OP_Trader" updated="02/17/21">
+ <opcode id="6626" name="OP_Trader" updated="05/19/21">
<comment>PC's turning trader on and off</comment>
<payload dir="server" typename="bazaarTraderRequest" sizechecktype="match"/>
</opcode>
@@ -307,15 +307,15 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="562f" name="OP_GuildMemberList" updated="04/21/21">
+ <opcode id="0840" name="OP_GuildMemberList" updated="05/19/21">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="3a2e" name="OP_ManaUpdate" updated="04/21/21">
+ <opcode id="4584" name="OP_ManaUpdate" updated="05/19/21">
<comment>Mana Update opcode - 10 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="3d4c" name="OP_EndUpdate" updated="04/21/21">
+ <opcode id="6d4b" name="OP_EndUpdate" updated="05/19/21">
<comment>Endurance Update opcode - 10 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5bbe" name="OP_ExpandedGuildInfo" updated="04/21/21">
+ <opcode id="5299" name="OP_ExpandedGuildInfo" updated="05/19/21">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -535,11 +535,11 @@
<comment>Listing of all guilds. Can be triggered by /lfg search?</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4697" name="OP_GuildsInZoneList" updated="04/21/21">
+ <opcode id="55bf" name="OP_GuildsInZoneList" updated="05/19/21">
<comment>Listing of guild names present in the current zone. Generally seen on zoning</comment>
<payload dir="server" typename="guildsInZoneListStruct" sizechecktype="none"/>
</opcode>
- <opcode id="2a7c" name="OP_NewGuildInZone" updated="04/21/21">
+ <opcode id="1712" name="OP_NewGuildInZone" updated="05/19/21">
<comment>An additional guild name has appeared in the current zone. Seen when a guilded player enters the current zone</comment>
<payload dir="server" typename="newGuildInZoneStruct" sizechecktype="none"/>
</opcode>
@@ -595,7 +595,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="6765" name="OP_Find" updated="04/21/21">
+ <opcode id="69d3" name="OP_Find" updated="05/19/21">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
Modified: showeq/branches/cn187_devel/configure.in
===================================================================
--- showeq/branches/cn187_devel/configure.in 2021-05-20 15:25:44 UTC (rev 1178)
+++ showeq/branches/cn187_devel/configure.in 2021-05-20 15:40:43 UTC (rev 1179)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.1.1)
+AC_INIT(showeq, 6.1.2)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
Modified: showeq/branches/cn187_devel/src/everquest.h
===================================================================
--- showeq/branches/cn187_devel/src/everquest.h 2021-05-20 15:25:44 UTC (rev 1178)
+++ showeq/branches/cn187_devel/src/everquest.h 2021-05-20 15:40:43 UTC (rev 1179)
@@ -1112,25 +1112,26 @@
{
struct
{
- signed z:19; // z coord (3rd loc value)
+
+ signed deltaX:13; // change in x
signed animation:10; // current animation
- unsigned padding00:3;
+ unsigned padding00:9;
+ signed y:19; // y coord (2nd loc value)
+ signed deltaY:13; // change in y
+
+ unsigned heading:12; // heading
signed deltaZ:13; // change in z
+ unsigned padding02:7;
+
signed deltaHeading:10; // change in heading
- unsigned padding01:9;
+ signed x:19; // x coord (1st loc value)
+ unsigned padding03:3;
- signed deltaY:13; // change in y
- signed y:19; // y coord (2nd loc value)
-
+ signed z:19; // z coord (3rd loc value)
unsigned pitch:12; // pitch (up/down heading)
- signed x:19; // x coord (1st loc value)
- unsigned padding03:1;
+ unsigned padding04:1;
- signed deltaX:13; // change in x
- unsigned heading:12; // heading
- unsigned padding04:7;
-
};
int32_t posData[5];
};
@@ -2392,24 +2393,24 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/
- signed z:19; // z coord (3rd loc value)
+ signed deltaX:13; // change in x
signed animation:10; // current animation
- unsigned padding00:3;
+ unsigned padding00:9;
/*0008*/
+ signed y:19; // y coord (2nd loc value)
+ signed deltaY:13; // change in y
+/*0012*/
+ unsigned heading:12; // heading
signed deltaZ:13; // change in z
+ unsigned padding02:7;
+/*0016*/
signed deltaHeading:10; // change in heading
- unsigned padding01:9;
-/*0012*/
- signed deltaY:13; // change in y
- signed y:19; // y coord (2nd loc value)
-/*0016*/
- unsigned pitch:12; // pitch (up/down heading)
signed x:19; // x coord (1st loc value)
- unsigned padding03:1;
+ unsigned padding03:3;
/*0020*/
- signed deltaX:13; // change in x
- unsigned heading:12; // heading
- unsigned padding04:7;
+ signed z:19; // z coord (3rd loc value)
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding04:1;
/*0024*/
};
@@ -2424,27 +2425,27 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
- signed animation:10; // current animation
- unsigned heading:12; // heading
- unsigned padding00:10;
+ float x; // x coord (1st loc value)
/*0010*/
float y; // y coord (2nd loc value)
/*0014*/
- float deltaY; // change in y
+ float deltaX; // change in x
/*0018*/
signed deltaHeading:10; // change in heading
unsigned padding03:22;
/*0022*/
- float deltaX; // change in x
+ float z; // z coord (3rd loc value)
/*0026*/
- unsigned pitch:12; // pitch (up/down heading)
+ unsigned heading:12; // heading
unsigned padding05:20;
/*0030*/
+ float deltaY; // change in y
+/*0034*/
float deltaZ; // change in z
-/*0034*/
- float x; // x coord (1st loc value)
/*0038*/
- float z; // z coord (3rd loc value)
+ signed animation:10; // current animation
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding08:10;
/*0042*/
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-05-20 15:25:44
|
Revision: 1178
http://sourceforge.net/p/seq/svn/1178
Author: cn187
Date: 2021-05-20 15:25:44 +0000 (Thu, 20 May 2021)
Log Message:
-----------
Tag for release 6.1.2
Added Paths:
-----------
showeq/tags/v6_1_2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-05-20 15:22:51
|
Revision: 1177
http://sourceforge.net/p/seq/svn/1177
Author: cn187
Date: 2021-05-20 15:22:45 +0000 (Thu, 20 May 2021)
Log Message:
-----------
Release 6.1.2
- Updated version to 6.1.2
- Support for EQ patch 05/19/21
- Struct and opcode updates
Modified Paths:
--------------
showeq/trunk/ChangeLog
showeq/trunk/conf/zoneopcodes.xml
showeq/trunk/configure.in
showeq/trunk/src/everquest.h
Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog 2021-04-30 17:43:34 UTC (rev 1176)
+++ showeq/trunk/ChangeLog 2021-05-20 15:22:45 UTC (rev 1177)
@@ -1,3 +1,9 @@
+cn187 (05/20/21)
+----------------
+- Updated version to 6.1.2
+- Support for EQ patch 05/19/21
+- Opcode and struct updates
+
cn187 (04/22/21)
----------------
- Updated version to 6.1.1
Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml 2021-04-30 17:43:34 UTC (rev 1176)
+++ showeq/trunk/conf/zoneopcodes.xml 2021-05-20 15:22:45 UTC (rev 1177)
@@ -3,127 +3,127 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="73c6" name="OP_PlayerProfile" updated="04/21/21">
+ <opcode id="304d" name="OP_PlayerProfile" updated="05/19/21">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5982" name="OP_ZoneEntry" updated="04/21/21">
+ <opcode id="4e21" name="OP_ZoneEntry" updated="05/19/21">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5962" name="OP_TimeOfDay" updated="04/21/21">
+ <opcode id="0c8d" name="OP_TimeOfDay" updated="05/19/21">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="476e" name="OP_NewZone" updated="04/21/21">
+ <opcode id="1afe" name="OP_NewZone" updated="05/19/21">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="348a" name="OP_SpawnDoor" updated="04/21/21">
+ <opcode id="239b" name="OP_SpawnDoor" updated="05/19/21">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="6479" name="OP_GroundSpawn" updated="04/21/21">
+ <opcode id="208f" name="OP_GroundSpawn" updated="05/19/21">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="600d" name="OP_SendZonePoints" updated="04/21/21">
+ <opcode id="3734" name="OP_SendZonePoints" updated="05/19/21">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="38f8" name="OP_AAExpUpdate" updated="04/21/21">
+ <opcode id="386d" name="OP_AAExpUpdate" updated="05/19/21">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="44af" name="OP_ExpUpdate" updated="04/21/21">
+ <opcode id="405b" name="OP_ExpUpdate" updated="05/19/21">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="72c8" name="OP_GuildMOTD" updated="04/21/21">
+ <opcode id="4089" name="OP_GuildMOTD" updated="05/19/21">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="3f4f" name="OP_ClientUpdate" updated="04/21/21">
+ <opcode id="3b56" name="OP_ClientUpdate" updated="05/19/21">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="19ad" name="OP_NpcMoveUpdate" updated="04/21/21">
+ <opcode id="29d3" name="OP_NpcMoveUpdate" updated="05/19/21">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="6284" name="OP_MobUpdate" updated="04/21/21">
+ <opcode id="1b37" name="OP_MobUpdate" updated="05/19/21">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="6241" name="OP_DeleteSpawn" updated="04/21/21">
+ <opcode id="317f" name="OP_DeleteSpawn" updated="05/19/21">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4732" name="OP_RemoveSpawn" updated="04/21/21">
+ <opcode id="7718" name="OP_RemoveSpawn" updated="05/19/21">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="19a8" name="OP_Death" updated="04/21/21">
+ <opcode id="2241" name="OP_Death" updated="05/19/21">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7d1b" name="OP_WearChange" updated="04/21/21">
+ <opcode id="1ac5" name="OP_WearChange" updated="05/19/21">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="26cb" name="OP_SpawnAppearance" updated="04/21/21">
+ <opcode id="702c" name="OP_SpawnAppearance" updated="05/19/21">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1e83" name="OP_Stamina" updated="04/21/21">
+ <opcode id="1f40" name="OP_Stamina" updated="05/19/21">
<comment>Server updating on hunger/thirst</comment>
<payload dir="server" typename="staminaStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5a2a" name="OP_HPUpdate" updated="04/21/21">
+ <opcode id="53c0" name="OP_HPUpdate" updated="05/19/21">
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6427" name="OP_GuildMemberUpdate" updated="04/21/21">
+ <opcode id="31f2" name="OP_GuildMemberUpdate" updated="05/19/21">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="51f2" name="OP_ClickObject" updated="04/21/21">
+ <opcode id="1b9a" name="OP_ClickObject" updated="05/19/21">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2c05" name="OP_Action" updated="04/21/21">
+ <opcode id="1efb" name="OP_Action" updated="05/19/21">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="217b" name="OP_Action2" updated="04/21/21">
+ <opcode id="799e" name="OP_Action2" updated="05/19/21">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="29ca" name="OP_Consider" updated="04/21/21">
+ <opcode id="107c" name="OP_Consider" updated="05/19/21">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0621" name="OP_TargetMouse" updated="04/21/21">
+ <opcode id="0a6d" name="OP_TargetMouse" updated="05/19/21">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6223" name="OP_SpawnRename" updated="04/21/21">
+ <opcode id="2a6a" name="OP_SpawnRename" updated="05/19/21">
<comment>Spawns getting renamed after initial NewSpawn</comment>
<payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
</opcode>
- <opcode id="50d9" name="OP_Illusion" updated="04/21/21">
+ <opcode id="0134" name="OP_Illusion" updated="05/19/21">
<comment>Spawn being illusioned (changing forms)</comment>
<payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4119" name="OP_Shroud" updated="04/21/21">
+ <opcode id="7d4d" name="OP_Shroud" updated="05/19/21">
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="35da" name="OP_ZoneChange" updated="04/21/21">
+ <opcode id="4be3" name="OP_ZoneChange" updated="05/19/21">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -163,55 +163,55 @@
<comment>Group leader change</comment>
<payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/>
</opcode>
- <opcode id="22bc" name="OP_Buff" updated="04/21/21">
+ <opcode id="6b8d" name="OP_Buff" updated="05/19/21">
<comment>old BuffDropCode</comment>
<payload dir="both" typename="buffStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3dbe" name="OP_BeginCast" updated="04/21/21">
+ <opcode id="41c3" name="OP_BeginCast" updated="05/19/21">
<comment>BeginCastCode</comment>
<payload dir="both" typename="beginCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5a44" name="OP_CastSpell" updated="04/21/21">
+ <opcode id="198c" name="OP_CastSpell" updated="05/19/21">
<comment>StartCastCode</comment>
<payload dir="both" typename="startCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="32ee" name="OP_SwapSpell" updated="04/21/21">
+ <opcode id="7edf" name="OP_SwapSpell" updated="05/19/21">
<comment>TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5c57" name="OP_MemorizeSpell" updated="04/21/21">
+ <opcode id="54b6" name="OP_MemorizeSpell" updated="05/19/21">
<comment>MemSpellCode</comment>
<payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6db3" name="OP_InspectAnswer" updated="04/21/21">
+ <opcode id="28ec" name="OP_InspectAnswer" updated="05/19/21">
<comment>InspectDataCode</comment>
<payload dir="both" typename="inspectDataStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6265" name="OP_Emote" updated="04/21/21">
+ <opcode id="599f" name="OP_Emote" updated="05/19/21">
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="11e0" name="OP_SimpleMessage" updated="04/21/21">
+ <opcode id="045c" name="OP_SimpleMessage" updated="05/19/21">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4e52" name="OP_FormattedMessage" updated="04/21/21">
+ <opcode id="0458" name="OP_FormattedMessage" updated="05/19/21">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="6f00" name="OP_CommonMessage" updated="04/21/21">
+ <opcode id="6a82" name="OP_CommonMessage" updated="05/19/21">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="165c" name="OP_SpecialMesg" updated="04/21/21">
+ <opcode id="3164" name="OP_SpecialMesg" updated="05/19/21">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="260d" name="OP_RandomReq" updated="04/21/21">
+ <opcode id="0039" name="OP_RandomReq" updated="05/19/21">
<comment>RandomReqCode</comment>
<payload dir="client" typename="randomReqStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5b74" name="OP_RandomReply" updated="04/21/21">
+ <opcode id="2ab4" name="OP_RandomReply" updated="05/19/21">
<comment>RandomCode</comment>
<payload dir="server" typename="randomStruct" sizechecktype="match"/>
</opcode>
@@ -223,36 +223,36 @@
<comment>Server replying with deny information after /deny</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7d0f" name="OP_ManaChange" updated="04/21/21">
+ <opcode id="432b" name="OP_ManaChange" updated="05/19/21">
<comment>Mana change. Bards send this up with no size. Casters receive this for mana updates.</comment>
<payload dir="server" typename="manaDecrementStruct" sizechecktype="match"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="03d6" name="OP_BazaarSearchRequest" updated="04/21/21">
+ <opcode id="2203" name="OP_BazaarSearchRequest" updated="05/19/21">
<comment>Bazaar search request </comment>
<payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/>
</opcode>
- <opcode id="32e1" name="OP_BazaarSearchResponse" updated="04/21/21">
+ <opcode id="41ab" name="OP_BazaarSearchResponse" updated="05/19/21">
<comment>Bazaar search Response - Struct incorrect </comment>
<payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="ffff" name="OP_MoneyOnCorpse" updated="02/17/21">
+ <opcode id="08a8" name="OP_MoneyOnCorpse" updated="05/19/21">
<comment>MoneyOnCorpseCode</comment>
<payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0eaa" name="OP_SkillUpdate" updated="04/21/21">
+ <opcode id="0b4f" name="OP_SkillUpdate" updated="05/19/21">
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="494d" name="OP_LevelUpdate" updated="04/21/21">
+ <opcode id="1b81" name="OP_LevelUpdate" updated="05/19/21">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3382" name="OP_DzSwitchInfo" updated="04/21/21">
+ <opcode id="697c" name="OP_DzSwitchInfo" updated="05/19/21">
<comment>Expedition compass etc</comment>
<payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/>
</opcode>
- <opcode id="784b" name="OP_DzInfo" updated="04/21/21">
+ <opcode id="4e0e" name="OP_DzInfo" updated="05/19/21">
<comment>Expedition Information</comment>
<payload dir="server" typename="dzInfo" sizechecktype="match"/>
</opcode>
@@ -260,11 +260,11 @@
<comment>Environmental Damage</comment>
<payload dir="client" typename="environmentDamageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="358d" name="OP_SetRunMode" updated="04/21/21">
+ <opcode id="17ad" name="OP_SetRunMode" updated="05/19/21">
<comment>old cRunToggleCode</comment>
<payload dir="client" typename="cRunToggleStruct" sizechecktype="match"/>
</opcode>
- <opcode id="ffff" name="OP_Trader" updated="02/17/21">
+ <opcode id="6626" name="OP_Trader" updated="05/19/21">
<comment>PC's turning trader on and off</comment>
<payload dir="server" typename="bazaarTraderRequest" sizechecktype="match"/>
</opcode>
@@ -307,15 +307,15 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="562f" name="OP_GuildMemberList" updated="04/21/21">
+ <opcode id="0840" name="OP_GuildMemberList" updated="05/19/21">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="3a2e" name="OP_ManaUpdate" updated="04/21/21">
+ <opcode id="4584" name="OP_ManaUpdate" updated="05/19/21">
<comment>Mana Update opcode - 10 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="3d4c" name="OP_EndUpdate" updated="04/21/21">
+ <opcode id="6d4b" name="OP_EndUpdate" updated="05/19/21">
<comment>Endurance Update opcode - 10 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5bbe" name="OP_ExpandedGuildInfo" updated="04/21/21">
+ <opcode id="5299" name="OP_ExpandedGuildInfo" updated="05/19/21">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -535,11 +535,11 @@
<comment>Listing of all guilds. Can be triggered by /lfg search?</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4697" name="OP_GuildsInZoneList" updated="04/21/21">
+ <opcode id="55bf" name="OP_GuildsInZoneList" updated="05/19/21">
<comment>Listing of guild names present in the current zone. Generally seen on zoning</comment>
<payload dir="server" typename="guildsInZoneListStruct" sizechecktype="none"/>
</opcode>
- <opcode id="2a7c" name="OP_NewGuildInZone" updated="04/21/21">
+ <opcode id="1712" name="OP_NewGuildInZone" updated="05/19/21">
<comment>An additional guild name has appeared in the current zone. Seen when a guilded player enters the current zone</comment>
<payload dir="server" typename="newGuildInZoneStruct" sizechecktype="none"/>
</opcode>
@@ -595,7 +595,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="6765" name="OP_Find" updated="04/21/21">
+ <opcode id="69d3" name="OP_Find" updated="05/19/21">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2021-04-30 17:43:34 UTC (rev 1176)
+++ showeq/trunk/configure.in 2021-05-20 15:22:45 UTC (rev 1177)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.1.1)
+AC_INIT(showeq, 6.1.2)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
Modified: showeq/trunk/src/everquest.h
===================================================================
--- showeq/trunk/src/everquest.h 2021-04-30 17:43:34 UTC (rev 1176)
+++ showeq/trunk/src/everquest.h 2021-05-20 15:22:45 UTC (rev 1177)
@@ -1112,25 +1112,26 @@
{
struct
{
- signed z:19; // z coord (3rd loc value)
+
+ signed deltaX:13; // change in x
signed animation:10; // current animation
- unsigned padding00:3;
+ unsigned padding00:9;
+ signed y:19; // y coord (2nd loc value)
+ signed deltaY:13; // change in y
+
+ unsigned heading:12; // heading
signed deltaZ:13; // change in z
+ unsigned padding02:7;
+
signed deltaHeading:10; // change in heading
- unsigned padding01:9;
+ signed x:19; // x coord (1st loc value)
+ unsigned padding03:3;
- signed deltaY:13; // change in y
- signed y:19; // y coord (2nd loc value)
-
+ signed z:19; // z coord (3rd loc value)
unsigned pitch:12; // pitch (up/down heading)
- signed x:19; // x coord (1st loc value)
- unsigned padding03:1;
+ unsigned padding04:1;
- signed deltaX:13; // change in x
- unsigned heading:12; // heading
- unsigned padding04:7;
-
};
int32_t posData[5];
};
@@ -2392,24 +2393,24 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/
- signed z:19; // z coord (3rd loc value)
+ signed deltaX:13; // change in x
signed animation:10; // current animation
- unsigned padding00:3;
+ unsigned padding00:9;
/*0008*/
+ signed y:19; // y coord (2nd loc value)
+ signed deltaY:13; // change in y
+/*0012*/
+ unsigned heading:12; // heading
signed deltaZ:13; // change in z
+ unsigned padding02:7;
+/*0016*/
signed deltaHeading:10; // change in heading
- unsigned padding01:9;
-/*0012*/
- signed deltaY:13; // change in y
- signed y:19; // y coord (2nd loc value)
-/*0016*/
- unsigned pitch:12; // pitch (up/down heading)
signed x:19; // x coord (1st loc value)
- unsigned padding03:1;
+ unsigned padding03:3;
/*0020*/
- signed deltaX:13; // change in x
- unsigned heading:12; // heading
- unsigned padding04:7;
+ signed z:19; // z coord (3rd loc value)
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding04:1;
/*0024*/
};
@@ -2424,27 +2425,27 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
- signed animation:10; // current animation
- unsigned heading:12; // heading
- unsigned padding00:10;
+ float x; // x coord (1st loc value)
/*0010*/
float y; // y coord (2nd loc value)
/*0014*/
- float deltaY; // change in y
+ float deltaX; // change in x
/*0018*/
signed deltaHeading:10; // change in heading
unsigned padding03:22;
/*0022*/
- float deltaX; // change in x
+ float z; // z coord (3rd loc value)
/*0026*/
- unsigned pitch:12; // pitch (up/down heading)
+ unsigned heading:12; // heading
unsigned padding05:20;
/*0030*/
+ float deltaY; // change in y
+/*0034*/
float deltaZ; // change in z
-/*0034*/
- float x; // x coord (1st loc value)
/*0038*/
- float z; // z coord (3rd loc value)
+ signed animation:10; // current animation
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding08:10;
/*0042*/
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 17:43:35
|
Revision: 1176
http://sourceforge.net/p/seq/svn/1176
Author: cn187
Date: 2021-04-30 17:43:34 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
[Qt5] Improve qt5 autodetection on certain platforms
Modified Paths:
--------------
showeq/branches/cn187_devel/acinclude.m4
Modified: showeq/branches/cn187_devel/acinclude.m4
===================================================================
--- showeq/branches/cn187_devel/acinclude.m4 2021-04-30 17:43:22 UTC (rev 1175)
+++ showeq/branches/cn187_devel/acinclude.m4 2021-04-30 17:43:34 UTC (rev 1176)
@@ -1,6 +1,6 @@
## -*- autoconf -*-
-# serial 3 add qt5 support
+# serial 4 improve qt5 autodetection on certain plaforms
dnl This file is part of ShowEQ and is based on the file from KDE.
dnl Copyright (C) 1997 Janos Farkas (ch...@sh...)
@@ -862,10 +862,11 @@
dnl qt5 (and later?) has QT_VERSION_STR in qconfig.h, while qt4 has it in qglobal.h
-AC_FIND_FILE("QtCore/qconfig.h", $qt_incdirs, qt5_incdir)
AC_FIND_FILE("Qt/qglobal.h", $qt_incdirs, qt4_incdir)
+AC_FIND_FILE("QtCore/qconfig.h", $qt_incdirs, qt5_incdir_base)
+AC_FIND_FILE("QtCore/qconfig-32.h", $qt_incdirs, qt5_incdir_32)
+AC_FIND_FILE("QtCore/qconfig-64.h", $qt_incdirs, qt5_incdir_64)
-
dnl *************************************************
dnl * At this point, we extract the Qt version from *
dnl * the includes that we located... *
@@ -887,10 +888,20 @@
if [[ -n "$qt_version_string" ]]; then
qt_incdir="$qt4_incdir"
-else
+else
+ if [[ "$qt5_incdir_64" != "NO" ]]; then
+ qt_version_source="$qt5_incdir_64/QtCore/qconfig-64.h"
+ qt_incdir="$qt5_incdir_64"
+ else
+ if [[ "$qt5_incdir_32" != "NO" ]]; then
+ qt_version_source="$qt5_incdir_32/QtCore/qconfig-32.h"
+ qt_incdir="$qt5_incdir_32"
+ else
+ qt_version_source="$qt5_incdir_base/QtCore/qconfig.h"
+ qt_incdir="$qt5_incdir_base"
+ fi
+ fi
- qt_version_source="$qt5_incdir/QtCore/qconfig.h"
-
qt_version_string=`cat $qt_version_source 2> configure.dbg |\
grep "#define QT_VERSION_STR" |\
sed 's/QT_VERSION_STR//' |\
@@ -899,10 +910,8 @@
sed 's/ //g' |\
sed 's/"//g'`;
- qt_incdir="$qt5_incdir"
fi
-
qt_version_number=`cat $qt_version_source 2> configure.dbg |\
grep "#define QT_VERSION[^_]" |\
sed 's/QT_VERSION//' |\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 17:43:29
|
Revision: 1175
http://sourceforge.net/p/seq/svn/1175
Author: cn187
Date: 2021-04-30 17:43:22 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
Add checks for libpng and libICE to reduce silent configure failures
Modified Paths:
--------------
showeq/branches/cn187_devel/configure.in
Modified: showeq/branches/cn187_devel/configure.in
===================================================================
--- showeq/branches/cn187_devel/configure.in 2021-04-30 16:21:14 UTC (rev 1174)
+++ showeq/branches/cn187_devel/configure.in 2021-04-30 17:43:22 UTC (rev 1175)
@@ -162,6 +162,8 @@
AC_CHECK_LIB(X11, _init, [], AC_MSG_ERROR(cannot find X11 library. Install the X11 development package))
AC_CHECK_LIB(Xext, _init, [], AC_MSG_ERROR(cannot find Xext library. Install the Xext development package))
+AC_CHECK_LIB(png, _init, [], AC_MSG_ERROR(cannot find PNG library. Install the png development package))
+AC_CHECK_LIB(ICE, _init, [], AC_MSG_ERROR(cannot find ICE library. Install the ICE development package))
AC_PATH_QT_MOC
AC_PATH_QT_UIC
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 16:21:19
|
Revision: 1174
http://sourceforge.net/p/seq/svn/1174
Author: cn187
Date: 2021-04-30 16:21:14 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
Add checks for libpng and libICE to reduce silent configure failures
Modified Paths:
--------------
showeq/trunk/configure.in
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2021-04-30 04:12:01 UTC (rev 1173)
+++ showeq/trunk/configure.in 2021-04-30 16:21:14 UTC (rev 1174)
@@ -162,6 +162,8 @@
AC_CHECK_LIB(X11, _init, [], AC_MSG_ERROR(cannot find X11 library. Install the X11 development package))
AC_CHECK_LIB(Xext, _init, [], AC_MSG_ERROR(cannot find Xext library. Install the Xext development package))
+AC_CHECK_LIB(png, _init, [], AC_MSG_ERROR(cannot find PNG library. Install the png development package))
+AC_CHECK_LIB(ICE, _init, [], AC_MSG_ERROR(cannot find ICE library. Install the ICE development package))
AC_PATH_QT_MOC
AC_PATH_QT_UIC
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 04:12:02
|
Revision: 1173
http://sourceforge.net/p/seq/svn/1173
Author: cn187
Date: 2021-04-30 04:12:01 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
[Qt5] Update autotools files to allow building with Qt5
Modified Paths:
--------------
showeq/branches/cn187_devel/acinclude.m4
showeq/branches/cn187_devel/configure.in
showeq/branches/cn187_devel/src/Makefile.am
Modified: showeq/branches/cn187_devel/acinclude.m4
===================================================================
--- showeq/branches/cn187_devel/acinclude.m4 2021-04-30 04:11:48 UTC (rev 1172)
+++ showeq/branches/cn187_devel/acinclude.m4 2021-04-30 04:12:01 UTC (rev 1173)
@@ -1,6 +1,6 @@
## -*- autoconf -*-
-# serial 2 qt4 update
+# serial 3 add qt5 support
dnl This file is part of ShowEQ and is based on the file from KDE.
dnl Copyright (C) 1997 Janos Farkas (ch...@sh...)
@@ -97,53 +97,42 @@
AC_DEFUN([AC_PATH_QT_MOC],
[
if [[ -n "$ac_qt_includes" ]]; then
+
+ moc_name=moc-qt${qt_major_version}
- AC_MSG_CHECKING([for Qt4 MOC]);
- AC_FIND_FILE(moc-qt4, [ $ac_qt_bindir \
+ AC_MSG_CHECKING([for Qt MOC]);
+ AC_FIND_FILE($moc_name, [ $ac_qt_bindir \
$QTDIR/bin \
$QTDIR/src/moc \
- /usr/local/qt4/bin \
- /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt4/bin \
- /usr/lib/${host_cpu}-${host_os}/qt4/bin \
- /usr/lib/arm-linux-gnueabihf/qt4/bin \
- /usr/lib/*/qt4/bin \
- /usr/lib/qt4/bin \
- /usr/X11R6/bin/qt4 \
- /usr/X11R6/bin/qt4/bin \
- /usr/X11R6/bin/X11/qt4 \
- /usr/X11R6/bin/X11/qt4/bin \
/usr/local/qt*/bin \
+ /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt*/bin \
+ /usr/lib/${host_cpu}-${host_os}/qt*/bin \
+ /usr/lib/arm-linux-gnueabihf/qt*/bin \
/usr/lib/*/qt*/bin \
+ /usr/lib/qt*/bin \
/usr/X11R6/bin/qt* \
/usr/X11R6/bin/qt*/bin \
/usr/X11R6/bin/X11/qt* \
/usr/X11R6/bin/X11/qt*/bin \
- /usr/lib/qt*/bin \
/usr/bin \
/usr/X11R6/bin \
/usr/src/qt-*/bin ],
MOC)
- ac_qt_moc_bin=moc-qt4
+ ac_qt_moc_bin=$moc_name
-dnl if we don't find it named "moc-qt4" then we should check for "moc"
- if [[ -z "$MOC" ]]; then
+dnl if we don't find it named with the specific version then we should check for "moc"
+ if [[ -z "$MOC" ]] || [[ "$MOC" == "NO" ]]; then
AC_FIND_FILE(moc, [ $ac_qt_bindir \
$QTDIR/bin \
$QTDIR/src/moc \
- /usr/local/qt4/bin \
- /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt4/bin \
- /usr/lib/${host_cpu}-${host_os}/qt4/bin \
- /usr/lib/arm-linux-gnueabihf/qt4/bin \
- /usr/lib/*/qt4/bin \
- /usr/lib/qt4/bin \
- /usr/X11R6/bin/qt4 \
- /usr/X11R6/bin/qt4/bin \
- /usr/X11R6/bin/X11/qt4 \
- /usr/X11R6/bin/X11/qt4/bin \
/usr/local/qt*/bin \
+ /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt*/bin \
+ /usr/lib/${host_cpu}-${host_os}/qt*/bin \
+ /usr/lib/arm-linux-gnueabihf/qt*/bin \
/usr/lib/*/qt*/bin \
+ /usr/lib/qt*/bin \
/usr/X11R6/bin/qt* \
/usr/X11R6/bin/qt*/bin \
/usr/X11R6/bin/X11/qt* \
@@ -175,7 +164,12 @@
MOC_ERROR_MESSAGE
fi
- output=`eval "$ac_cv_path_moc -v 2>&1 | sed -e '1q' | grep Qt"`
+ output=""
+ if [[ $qt_major_version -eq 4 ]]; then
+ output=`eval "$ac_cv_path_moc -v 2>&1 | sed -e '1q' | grep Qt"`
+ else
+ output=`eval "$ac_cv_path_moc -v 2>&1 | sed -e '1q' | grep moc"`
+ fi
echo "configure:__oline__: tried to call $ac_cv_path_moc -v 2>&1 | sed -e '1q' | grep Qt" >&AC_FD_CC
echo "configure:__oline__: moc output: $output" >&AC_FD_CC
@@ -238,25 +232,17 @@
[
if [[ -n "$ac_qt_includes" ]]; then
- AC_MSG_CHECKING([for Qt4 UIC]);
+ AC_MSG_CHECKING([for Qt UIC]);
AC_FIND_FILE(uic, [ $ac_qt_bindir \
$QTDIR/bin \
$QTDIR/src/uic \
- /usr/local/qt4/bin \
- /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt4/bin \
- /usr/lib/${host_cpu}-${host_os}/qt4/bin \
- /usr/lib/arm-linux-gnueabihf/qt4/bin \
- /usr/lib/*/qt4/bin \
- /usr/lib64/*/qt4/bin \
+ /usr/local/qt*/bin \
+ /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt*/bin \
+ /usr/lib/${host_cpu}-${host_os}/qt*/bin \
+ /usr/lib/arm-linux-gnueabihf/qt*/bin \
+ /usr/lib/*/qt*/bin \
+ /usr/lib64/*/qt*/bin \
/usr/bin \
- /usr/X11R6/bin/qt4 \
- /usr/X11R6/bin/qt4/bin \
- /usr/X11R6/bin/X11/qt4 \
- /usr/X11R6/bin/X11/qt4/bin \
- /usr/lib/qt4/bin \
- /usr/lib64/qt4/bin \
- /usr/local/qt*/bin \
- /usr/X11R6/bin \
/usr/X11R6/bin/qt* \
/usr/X11R6/bin/qt*/bin \
/usr/X11R6/bin/X11/qt* \
@@ -263,8 +249,6 @@
/usr/X11R6/bin/X11/qt*/bin \
/usr/lib/qt*/bin \
/usr/lib64/qt*/bin \
- /usr/lib/*/qt*/bin \
- /usr/lib64/*/qt*/bin \
/usr/src/qt-*/bin ],
UIC)
@@ -281,7 +265,12 @@
UIC_ERROR_MESSAGE
fi
- output=`eval "$ac_cv_path_uic -v 2>&1 | grep -i 'Qt user interface'"`
+ output=""
+ if [[ $qt_major_version -eq 4 ]]; then
+ output=`eval "$ac_cv_path_uic -v 2>&1 | grep -i 'Qt user interface'"`
+ else
+ output=`eval "$ac_cv_path_uic -v 2>&1 | grep -i 'uic'"`
+ fi
echo "configure:__oline__: tried to call $ac_cv_path_uic -v 2>&1 | sed -e '1q' | grep Qt" >&AC_FD_CC
echo "configure:__oline__: uic output: $output" >&AC_FD_CC
@@ -580,179 +569,34 @@
])
dnl ------------------------------------------------------------------------
-dnl Try to find the Qt headers and libraries.
+dnl Try to find the Qt libraries.
dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
dnl ------------------------------------------------------------------------
dnl
-AC_DEFUN([AC_PATH_QT_4],
+AC_DEFUN([AC_PATH_QT_LIBS],
[
AC_REQUIRE([K_PATH_X])
-LIBQT="-lQtCore"
+AC_REQUIRE([AC_PATH_QT_HEADERS])
+LIBQT=""
+if [[ $qt_major_version -eq 4 ]]; then
+ LIBQT="-lQtCore"
+else
+ LIBQT="-lQt${qt_major_version}Core -lQt${qt_major_version}Widgets"
+fi
AC_REQUIRE([AC_FIND_PNG])
LIBQT="$LIBQT $LIBPNG"
-AC_MSG_CHECKING([for Qt4])
-
LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSOCKET"
-ac_qt_includes=""
ac_qt_libraries=""
ac_qt_bindir=""
-ac_qt_docs=""
qt_libraries=""
-qt_includes=""
qt_docs=""
-AC_ARG_WITH(qt-dir,
- [ --with-qt-dir=DIR where the root of Qt is installed ],
- [ ac_qt_includes="$withval"/include
- ac_qt_libraries="$withval"/lib
- ac_qt_bindir="$withval"/bin
- ac_qt_docs="$withval"/doc/html
- ])
-AC_ARG_WITH(qt-includes,
- [ --with-qt-includes=DIR where the Qt includes are. ],
- [
- ac_qt_includes="$withval"
- ])
-
-AC_ARG_WITH(qt-docs,
- [ --with-qt-docs=DIR where the Qt docs are. ],
- [
- ac_qt_docs="$withval"
- ])
-
-ac_qt_libs_given=no
-
-AC_ARG_WITH(qt-libraries,
- [ --with-qt-libraries=DIR where the Qt library is installed. ],
- [ ac_qt_libraries="$withval"
- ac_qt_libs_given=yes
- ])
-
-AC_ARG_WITH(qt-validation,
- [ --without-qt-validation disables extra Qt checks... ],
- [ ac_validate_qt="yes" ]
- [ ac_validate_qt="no" ])
-
-AC_CACHE_VAL(ac_cv_have_qt,
-[
-dnl *******************************************
-dnl * Build a relatively large search path... *
-dnl *******************************************
-
-qt_incdirs=" $QTDIR/include \
- $QTINC \
- /usr/include \
- /usr/local/qt4/include \
- /usr/qt/4/include \
- /usr/include/qt4 \
- /usr/include/${host_cpu}-${host_vendor}-${host_os}/qt4 \
- /usr/include/${host_cpu}-${host_os}/qt4 \
- /usr/include/arm-linux-gnueabihf/qt4 \
- /usr/include/*/qt4 \
- /usr/lib/qt4/include \
- /usr/X11R6/include/X11/qt4 \
- /usr/X11R6/include/X11/qt4/include \
- /usr/X11R6/include/qt4 \
- /usr/X11R6/include/qt4/include \
- /usr/local/qt*/include \
- /usr/qt/*/include \
- /usr/include/qt* \
- /usr/lib/qt*/include \
- /usr/lib/qt*/include \
- /usr/X11R6/include/X11/qt* \
- /usr/X11R6/include/X11/qt*/include \
- /usr/X11R6/include/qt* \
- /usr/X11R6/include/qt*/include \
- /usr/src/qt-*/include \
- $x_includes \
- $qt_incdirs"
-
-[[ "$ac_qt_includes" != "NO" ]] && \
-qt_incdirs="$ac_qt_includes $qt_incdirs"
-
-qt_version_source="qglobal.h"
-
-
-AC_FIND_FILE("Qt/qstyle.h", $qt_incdirs, qt_incdir1)
-AC_FIND_FILE("Qt/$qt_version_source", $qt_incdir1, qt_incdir)
-
-
-dnl *************************************************
-dnl * At this point, we extract the Qt version from *
-dnl * the includes that we located... *
-dnl *************************************************
-dnl * This is necessary to ensure that we don't end *
-dnl * up using the wrong Qt lib path when linking!! *
-dnl *************************************************
-
-qt_version_string=`cat $qt_incdir/Qt/$qt_version_source 2> configure.dbg |\
- grep "#define QT_VERSION_STR" |\
- sed 's/QT_VERSION_STR//' |\
- sed 's/#define//g' |\
- sed 's/ //g' |\
- sed 's/ //g' |\
- sed 's/"//g'`;
-
-qt_version_number=`cat $qt_incdir/Qt/$qt_version_source 2> configure.dbg |\
- grep "#define QT_VERSION[^_]" |\
- sed 's/QT_VERSION//' |\
- sed 's/#define//g' |\
- sed 's/ //g' |\
- sed 's/ //g' |\
- sed 's/0x//'`;
-
-
-qt_major_version=`echo ${[qt_version_string%%.[0-9]*]}`
-qt_minor_version=`echo ${[qt_version_string#[0-9]*.]}`
-qt_minor_version=`echo ${[qt_minor_version%.[0-9]*]}`
-qt_major_build=`echo ${[qt_version_string##[0-9]*.]}`
-
-
-if [[ -n "$qt_version_string" ]]; then
- echo -e "yes\n>> Found version.:\t$qt_version_string"
- echo -e ">>> Headers......:\t$qt_incdir"
- ac_qt_includes="$qt_incdir"
-else
- echo -e "no\n>> Unable to locate your Qt includes..."
- AC_MSG_ERROR([Please verify your Qt devel install!]);
-fi;
-
-qt_target_version="4.3.0"
-
-case $qt_major_version in
- 4)
- if [[ $qt_minor_version -lt 3 ]]; then
- AC_MSG_ERROR([ShowEQ requires qt $qt_target_version or later, but does not support qt 5 yet. Please make sure qt $qt_target_version or later is installed!!!]);
- fi
- qt_lib=libQtCore
- ;;
-# 5)
-# qt_lib=libQt5Core
-# ;;
- *)
- AC_MSG_ERROR([ShowEQ requires qt $qt_target_version or later, but does not support qt 5 yet. Please make sure qt $qt_target_version or later is installed!!!]);
- ;;
-esac
-
-qt_lib_major_ver="${qt_lib}.so.$qt_major_version"
-
-qt_lib_minor_ver="${qt_lib}.so.$qt_major_version.$qt_minor_version"
-qt_lib_major_bld="${qt_lib}.so.$qt_major_version.$qt_minor_version.$qt_major_build"
-
-if [[ -n $qt_incdir ]]; then
- for dir in `ls -1 -d $qt_incdir/Qt*`; do
- ac_qt_includes="$ac_qt_includes -I$dir"
- done;
-fi
-
-
dnl ************************************
dnl * Build yet another search path... *
dnl ************************************
@@ -764,14 +608,6 @@
/usr/lib/${host_cpu}-${host_vendor}-${host_os} \
/usr/lib/${host_cpu}-${host_os} \
/usr/lib/arm-linux-gnueabihf \
- /usr/local/qt4/lib \
- /usr/qt/4/lib \
- /usr/lib/qt4/lib \
- /usr/lib/qt4 \
- /usr/X11R6/lib/X11/qt4 \
- /usr/X11R6/lib/X11/qt4/lib \
- /usr/X11R6/lib/qt4 \
- /usr/X11R6/lib/qt4/lib \
/usr/local/qt*/lib \
/usr/qt/*/lib \
/usr/lib/qt*/lib \
@@ -792,10 +628,6 @@
/usr/lib/${host_cpu}-${host_vendor}-${host_os} \
/usr/lib/${host_cpu}-${host_os} \
/usr/lib/arm-linux-gnueabihf \
- /usr/local/qt4/lib64 \
- /usr/qt/4/lib64 \
- /usr/lib/qt4/lib64 \
- /usr/X11R6/lib/X11/qt4/lib64 \
/usr/local/qt*/lib64 \
/usr/qt/*/lib64 \
/usr/lib/qt*/lib64 \
@@ -839,7 +671,12 @@
ac_ldflags_safe="$LDFLAGS"
ac_libs_safe="$LIBS"
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes -I$qt_incdir/Qt"
+if [[ $qt_major_version -eq 4 ]]; then
+ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes -I$qt_incdir/Qt"
+else
+ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes -I$qt_incdir/QtCore -I$qt_incdir/QtWidgets -fPIC"
+fi
+
LDFLAGS="-L$qt_libdir $all_libraries"
LIBS="$LIBS $LIBQT"
@@ -871,44 +708,6 @@
AC_LANG_RESTORE
-dnl ************************************
-dnl * Build yet another search path... *
-dnl ************************************
-
-qt_docdirs=" $QTDIR/doc/html \
- $qt_incdir../doc/html \
- /usr/local/qt4/doc/html \
- /usr/local/qt*/doc/html \
- /usr/qt/4/doc/html \
- /usr/qt/*/doc/html \
- /usr/lib/qt4/doc/html \
- /usr/lib/qt*/doc/html \
- /usr/lib/doc/html \
- /usr/lib/qt*/doc/html \
- /usr/share/qt4/doc/html \
- /usr/X11R6/lib/X11/qt4/doc/html \
- /usr/X11R6/lib/X11/qt*/doc/html \
- /usr/X11R6/lib/X11/qt4/doc/html \
- /usr/X11R6/lib/X11/qt*/doc/html \
- /usr/X11R6/lib/qt4/doc/html \
- /usr/X11R6/lib/qt*/doc/html \
- /usr/src/qt-*/doc/html \
- $qt_docdirs"
-
-[[ "$ac_qt_docs" != "NO" ]] && \
-qt_docdirs="$ac_qt_docs $qt_docdirs"
-
-AC_FIND_FILE("qobject.html", $qt_docdirs, qt_docdir)
-
-ac_qt_docs="$qt_docdir"
-
-if [[ -n "$ac_qt_docs" -a "$ac_qt_docs" != "NO" ]]; then
- echo -e ">>>> Documentation...:\t$ac_qt_docs/"
-else
- echo -e ">>>> Documentation...:\tUnable to locate?!?"
- AC_MSG_WARN([Qt documenation not installed?!]);
-fi;
-
if [[ -z "$ac_qt_includes" ]] || [[ -z "$ac_qt_libraries" ]]; then
ac_cv_have_qt="have_qt=no";
ac_qt_notfound="";
@@ -930,7 +729,6 @@
if [[ "$have_qt" != "yes" ]]; then
AC_MSG_ERROR([Something wicked happened while trying to validate your Qt installation!!! Please verify your $ac_qt_notfound...]);
fi
-])
@@ -979,7 +777,6 @@
qt_libraries=$ac_qt_libraries
qt_includes=$ac_qt_includes
- qt_docs=$ac_qt_docs
fi
@@ -987,9 +784,8 @@
AC_PATH_QT_UIC
CHECK_QT_DIRECT(qt_libraries= ,[])
+AC_SUBST(qt_includes)
AC_SUBST(qt_libraries)
-AC_SUBST(qt_includes)
-AC_SUBST(qt_docs)
if [[ "$qt_includes" == "$x_includes" ]] ||
[[ -z "$qt_includes" ]]; then
@@ -1007,20 +803,218 @@
all_libraries="$all_libraries $QT_LDFLAGS"
fi
-QT_DOCS="$qt_docs"
-
AC_SUBST(QT_INCLUDES)
AC_SUBST(QT_LDFLAGS)
-AC_SUBST(QT_DOCS)
-LIB_QT='-lQtCore $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)'
+if [[ $qt_major_version -eq 4 ]]; then
+ LIB_QT="-lQtCore ${LIBPNG} -lXext ${LIB_X11} ${X_PRE_LIBS}"
+else
+ LIB_QT="-lQt${qt_major_version}Core -lQt${qt_major_version}Widgets ${LIBPNG} -lXext ${LIB_X11} ${X_PRE_LIBS}"
+fi
AC_SUBST(LIB_QT)
])
+
+dnl ------------------------------------------------------------------------
+dnl Try to find the Qt headers
+dnl $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl ------------------------------------------------------------------------
+dnl
+AC_DEFUN([AC_PATH_QT_HEADERS],
+[
+
+ac_qt_includes=""
+qt_includes=""
+qt_incdir=""
+
+AC_MSG_CHECKING([for Qt])
+
+AC_CACHE_VAL(ac_cv_have_qt,
+[
+
+dnl *******************************************
+dnl * Build a relatively large search path... *
+dnl *******************************************
+
+qt_incdirs=" $QTDIR/include \
+ $QTINC \
+ /usr/include \
+ /usr/local/qt*/include \
+ /usr/qt/*/include \
+ /usr/include/qt* \
+ /usr/include/${host_cpu}-${host_vendor}-${host_os}/qt* \
+ /usr/include/${host_cpu}-${host_os}/qt* \
+ /usr/include/arm-linux-gnueabihf/qt* \
+ /usr/include/*/qt* \
+ /usr/lib/qt*/include \
+ /usr/X11R6/include/X11/qt* \
+ /usr/X11R6/include/X11/qt*/include \
+ /usr/X11R6/include/qt* \
+ /usr/X11R6/include/qt*/include \
+ /usr/src/qt-*/include \
+ $x_includes \
+ $qt_incdirs"
+
+[[ "$ac_qt_includes" != "NO" ]] && \
+qt_incdirs="$ac_qt_includes $qt_incdirs"
+
+
+
+dnl qt5 (and later?) has QT_VERSION_STR in qconfig.h, while qt4 has it in qglobal.h
+AC_FIND_FILE("QtCore/qconfig.h", $qt_incdirs, qt5_incdir)
+AC_FIND_FILE("Qt/qglobal.h", $qt_incdirs, qt4_incdir)
+
+
+dnl *************************************************
+dnl * At this point, we extract the Qt version from *
+dnl * the includes that we located... *
+dnl *************************************************
+dnl * This is necessary to ensure that we don't end *
+dnl * up using the wrong Qt lib path when linking!! *
+dnl *************************************************
+
+qt_version_source="$qt4_incdir/Qt/qglobal.h"
+qt_version_string=`cat $qt_version_source 2> configure.dbg |\
+ grep "#define QT_VERSION_STR" |\
+ sed 's/QT_VERSION_STR//' |\
+ sed 's/#define//g' |\
+ sed 's/ //g' |\
+ sed 's/ //g' |\
+ sed 's/"//g'`;
+
+
+if [[ -n "$qt_version_string" ]]; then
+ qt_incdir="$qt4_incdir"
+
+else
+
+ qt_version_source="$qt5_incdir/QtCore/qconfig.h"
+
+ qt_version_string=`cat $qt_version_source 2> configure.dbg |\
+ grep "#define QT_VERSION_STR" |\
+ sed 's/QT_VERSION_STR//' |\
+ sed 's/#define//g' |\
+ sed 's/ //g' |\
+ sed 's/ //g' |\
+ sed 's/"//g'`;
+
+ qt_incdir="$qt5_incdir"
+fi
+
+
+qt_version_number=`cat $qt_version_source 2> configure.dbg |\
+ grep "#define QT_VERSION[^_]" |\
+ sed 's/QT_VERSION//' |\
+ sed 's/#define//g' |\
+ sed 's/ //g' |\
+ sed 's/ //g' |\
+ sed 's/0x//'`;
+
+
+qt_major_version=`echo ${[qt_version_string%%.[0-9]*]}`
+qt_minor_version=`echo ${[qt_version_string#[0-9]*.]}`
+qt_minor_version=`echo ${[qt_minor_version%.[0-9]*]}`
+qt_major_build=`echo ${[qt_version_string##[0-9]*.]}`
+
+AC_SUBST(qt_major_version)
+
+
+if [[ -n "$qt_version_string" ]]; then
+ echo -e "yes\n>> Found version.:\t$qt_version_string"
+
+ if [[ $qt_major_version -eq 5 ]]; then
+ echo -e "NOTICE: Support for Qt5 is EXPERIMENTAL. If you experience issues, please report them on the forum."
+ fi
+ echo -e ">>> Headers......:\t$qt_incdir"
+ ac_qt_includes="$qt_incdir"
+else
+ echo -e "no\n>> Unable to locate your Qt includes..."
+ AC_MSG_ERROR([Please verify your Qt devel install!]);
+fi;
+
+qt4_target_version="4.4.0"
+qt5_target_version="5.5.0"
+
+case $qt_major_version in
+ 4)
+ if [[ $qt_minor_version -lt 3 ]]; then
+ AC_MSG_ERROR([ShowEQ requires qt $qt4_target_version or later. Please make sure qt $qt4_target_version or later is installed!!!]);
+ fi
+ qt_lib=libQtCore
+ ;;
+ 5)
+ if [[ $qt_minor_version -lt 5 ]]; then
+ AC_MSG_ERROR([ShowEQ requires qt $qt5_target_version or later. Please make sure qt $qt5_target_version or later is installed!!!]);
+ fi
+ qt_lib=libQt5Core
+ ;;
+ 6)
+ AC_MSG_ERROR([ShowEQ does not yet support qt6. Please install qt4 or qt5.]);
+ ;;
+ *)
+ AC_MSG_ERROR([ShowEQ requires qt $qt4_target_version or later. Please make sure qt $qt4_target_version or later is installed!!!]);
+ ;;
+esac
+
+qt_lib_major_ver="${qt_lib}.so.$qt_major_version"
+
+qt_lib_minor_ver="${qt_lib}.so.$qt_major_version.$qt_minor_version"
+qt_lib_major_bld="${qt_lib}.so.$qt_major_version.$qt_minor_version.$qt_major_build"
+
+if [[ -n $qt_incdir ]]; then
+ for dir in `ls -1 -d $qt_incdir/Qt*`; do
+ ac_qt_includes="$ac_qt_includes -I$dir"
+ done;
+fi
+
+
+])
+])
+
+
AC_DEFUN([AC_PATH_QT],
[
-AC_PATH_QT_4
+
+ac_qt_includes=""
+ac_qt_libraries=""
+ac_qt_bindir=""
+ac_qt_docs=""
+
+qt_libraries=""
+qt_includes=""
+
+
+AC_ARG_WITH(qt-dir,
+ [ --with-qt-dir=DIR where the root of Qt is installed ],
+ [ ac_qt_includes="$withval"/include
+ ac_qt_libraries="$withval"/lib
+ ac_qt_bindir="$withval"/bin
+ ac_qt_docs="$withval"/doc/html
+ ])
+
+AC_ARG_WITH(qt-includes,
+ [ --with-qt-includes=DIR where the Qt includes are. ],
+ [
+ ac_qt_includes="$withval"
+ ])
+
+ac_qt_libs_given=no
+
+AC_ARG_WITH(qt-libraries,
+ [ --with-qt-libraries=DIR where the Qt library is installed. ],
+ [ ac_qt_libraries="$withval"
+ ac_qt_libs_given=yes
+ ])
+
+AC_ARG_WITH(qt-validation,
+ [ --without-qt-validation disables extra Qt checks... ],
+ [ ac_validate_qt="yes" ]
+ [ ac_validate_qt="no" ])
+
+
+AC_PATH_QT_HEADERS
+AC_PATH_QT_LIBS
])
AC_DEFUN([KDE_CHECK_FINAL],
Modified: showeq/branches/cn187_devel/configure.in
===================================================================
--- showeq/branches/cn187_devel/configure.in 2021-04-30 04:11:48 UTC (rev 1172)
+++ showeq/branches/cn187_devel/configure.in 2021-04-30 04:12:01 UTC (rev 1173)
@@ -167,6 +167,12 @@
AC_PATH_QT_UIC
AC_PATH_QT
+if [[ $qt_major_version == 4 ]]; then
+ LIB_QT+=" -lQtGui -lQtXml "
+else
+ LIB_QT+=" -lQt${qt_major_version}Gui -lQt${qt_major_version}Xml "
+fi
+
dnl The below needs to be re-defined since the Qt defines from KDE destroy it
AC_LANG_CPLUSPLUS
Modified: showeq/branches/cn187_devel/src/Makefile.am
===================================================================
--- showeq/branches/cn187_devel/src/Makefile.am 2021-04-30 04:11:48 UTC (rev 1172)
+++ showeq/branches/cn187_devel/src/Makefile.am 2021-04-30 04:12:01 UTC (rev 1173)
@@ -1,6 +1,6 @@
INCLUDES = $(QT_INCLUDES) $(X_INCLUDES) -DPKGDATADIR=\"$(pkgdatadir)/\" -I/usr/include/pcap $(USER_INCLUDES)
-QT_LIBS = -lQtCore -lQtGui -lQtXml
+QT_LIBS = $(LIB_QT)
bin_PROGRAMS = showeq
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 04:11:55
|
Revision: 1172
http://sourceforge.net/p/seq/svn/1172
Author: cn187
Date: 2021-04-30 04:11:48 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
[Qt5] Use QHeader::setSectionResizeMode if Qt5+
Modified Paths:
--------------
showeq/branches/cn187_devel/src/seqlistview.cpp
Modified: showeq/branches/cn187_devel/src/seqlistview.cpp
===================================================================
--- showeq/branches/cn187_devel/src/seqlistview.cpp 2021-04-30 04:11:41 UTC (rev 1171)
+++ showeq/branches/cn187_devel/src/seqlistview.cpp 2021-04-30 04:11:48 UTC (rev 1172)
@@ -27,6 +27,7 @@
#include <QHeaderView>
#include <QSizePolicy>
+#include <QtGlobal>
#include "seqlistview.h"
#include "main.h"
@@ -186,7 +187,11 @@
width = header()->sectionSizeHint(i);
}
+#if QT_VERSION >= 0x050000
+ header()->setSectionResizeMode(i, QHeaderView::Interactive);
+#else
header()->setResizeMode(i, QHeaderView::Interactive);
+#endif
header()->resizeSection(i, width);
setColumnWidth(i, width);
}
@@ -193,7 +198,11 @@
else
{
// column is not visible, hide it.
+#if QT_VERSION >= 0x050000
+ header()->setSectionResizeMode(i, QHeaderView::Interactive);
+#else
header()->setResizeMode(i, QHeaderView::Interactive);
+#endif
header()->resizeSection(i, 0);
setColumnWidth(i, 0);
}
@@ -249,7 +258,11 @@
width = 40;
}
+#if QT_VERSION >= 0x050000
+ header()->setSectionResizeMode(column, QHeaderView::Interactive);
+#else
header()->setResizeMode(column, QHeaderView::Interactive);
+#endif
header()->resizeSection(column, width);
setColumnWidth(column, width);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 04:11:42
|
Revision: 1171
http://sourceforge.net/p/seq/svn/1171
Author: cn187
Date: 2021-04-30 04:11:41 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
[Qt] Don't tag Qt library versions
Modified Paths:
--------------
showeq/branches/cn187_devel/configure.in
Modified: showeq/branches/cn187_devel/configure.in
===================================================================
--- showeq/branches/cn187_devel/configure.in 2021-04-30 04:11:33 UTC (rev 1170)
+++ showeq/branches/cn187_devel/configure.in 2021-04-30 04:11:41 UTC (rev 1171)
@@ -463,7 +463,7 @@
AC_CHECK_RPATH
CFLAGS="$USE_THREADS $USE_OPT_C $USE_DEBUG_C $USE_INLINE_C $USE_PROFILE_C $CFLAGS"
-CXXFLAGS="$USE_THREADS $USE_OPT_CXX $USE_DEBUG_CXX $USE_INLINE_CXX $USE_PROFILE_CXX -DQT_THREAD_SUPPORT=1 -DDISPLAY_ICONS=${CGI_ICONS} -DICON_DIR=\\\"${CGI_ICON_DIR}\\\" $CXXFLAGS -std=c++11"
+CXXFLAGS="$USE_THREADS $USE_OPT_CXX $USE_DEBUG_CXX $USE_INLINE_CXX $USE_PROFILE_CXX -DQT_THREAD_SUPPORT=1 -DDISPLAY_ICONS=${CGI_ICONS} -DICON_DIR=\\\"${CGI_ICON_DIR}\\\" $CXXFLAGS -std=c++11 -fPIC -DQT_NO_VERSION_TAGGING"
AC_DEFUN([SUCCESS],[
echo "Success!"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 04:11:34
|
Revision: 1170
http://sourceforge.net/p/seq/svn/1170
Author: cn187
Date: 2021-04-30 04:11:33 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
[Qt5] More QVariant enum fixes
Modified Paths:
--------------
showeq/branches/cn187_devel/src/spawnlistcommon.cpp
showeq/branches/cn187_devel/src/spawnpointlist.cpp
showeq/branches/cn187_devel/src/xmlconv.cpp
Modified: showeq/branches/cn187_devel/src/spawnlistcommon.cpp
===================================================================
--- showeq/branches/cn187_devel/src/spawnlistcommon.cpp 2021-04-30 04:11:26 UTC (rev 1169)
+++ showeq/branches/cn187_devel/src/spawnlistcommon.cpp 2021-04-30 04:11:33 UTC (rev 1170)
@@ -108,7 +108,7 @@
case Qt::ForegroundRole:
if (filterFlags & FILTER_FLAG_FILTERED)
// color filtered spawns grey
- return Qt::gray;
+ return QColor(Qt::gray);
else
return m_textColor;
Modified: showeq/branches/cn187_devel/src/spawnpointlist.cpp
===================================================================
--- showeq/branches/cn187_devel/src/spawnpointlist.cpp 2021-04-30 04:11:26 UTC (rev 1169)
+++ showeq/branches/cn187_devel/src/spawnpointlist.cpp 2021-04-30 04:11:33 UTC (rev 1170)
@@ -124,7 +124,7 @@
case Qt::ForegroundRole:
if (m_spawnPoint->age() > 220)
- return Qt::red;
+ return QColor(Qt::red);
else
return treeWidget()->foregroundRole();
Modified: showeq/branches/cn187_devel/src/xmlconv.cpp
===================================================================
--- showeq/branches/cn187_devel/src/xmlconv.cpp 2021-04-30 04:11:26 UTC (rev 1169)
+++ showeq/branches/cn187_devel/src/xmlconv.cpp 2021-04-30 04:11:33 UTC (rev 1170)
@@ -256,7 +256,7 @@
else if (e.tagName() == "cursor")
{
if (e.hasAttribute("shape"))
- v = QVariant(QCursor(e.attribute("shape").toInt(&ok, 10)));
+ v = QVariant(QCursor(static_cast<Qt::CursorShape>(e.attribute("shape").toInt(&ok, 10))));
else
qWarning("%s element without value!", e.tagName().toLatin1().data());
}
@@ -517,7 +517,7 @@
case QVariant::KeySequence:
e.setTagName("key");
- e.setAttribute("sequence", (QString)v.value<QKeySequence>());
+ e.setAttribute("sequence", (QString)v.value<QKeySequence>().toString());
break;
case QVariant::ByteArray: // this is only for [u]int64_t
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 04:11:28
|
Revision: 1169
http://sourceforge.net/p/seq/svn/1169
Author: cn187
Date: 2021-04-30 04:11:26 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
[Qt5] Use QVariant::value instead of qVariantValue
Modified Paths:
--------------
showeq/branches/cn187_devel/src/xmlpreferences.cpp
Modified: showeq/branches/cn187_devel/src/xmlpreferences.cpp
===================================================================
--- showeq/branches/cn187_devel/src/xmlpreferences.cpp 2021-04-30 04:11:18 UTC (rev 1168)
+++ showeq/branches/cn187_devel/src/xmlpreferences.cpp 2021-04-30 04:11:26 UTC (rev 1169)
@@ -656,7 +656,7 @@
QVariant* preference = getPref(inName, inSection, pers); \
\
if (preference) \
- return qVariantValue< retType >(*preference); \
+ return preference->value< retType >(); \
\
return def; \
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 04:11:19
|
Revision: 1168
http://sourceforge.net/p/seq/svn/1168
Author: cn187
Date: 2021-04-30 04:11:18 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
[Qt5] Rename QFileDialog::selectedFilter to QFileDialog::selectedNameFilter
Modified Paths:
--------------
showeq/branches/cn187_devel/src/map.cpp
Modified: showeq/branches/cn187_devel/src/map.cpp
===================================================================
--- showeq/branches/cn187_devel/src/map.cpp 2021-04-30 04:11:06 UTC (rev 1167)
+++ showeq/branches/cn187_devel/src/map.cpp 2021-04-30 04:11:18 UTC (rev 1168)
@@ -4597,7 +4597,7 @@
if (fileDlg.exec() != QDialog::Accepted)
return;
- QString filter = fileDlg.selectedFilter();
+ QString filter = fileDlg.selectedNameFilter();
QStringList files = fileDlg.selectedFiles();
QString filename;
if (!files.isEmpty())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 04:11:12
|
Revision: 1167
http://sourceforge.net/p/seq/svn/1167
Author: cn187
Date: 2021-04-30 04:11:06 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
[Qt5] Cast enum types for QVariant usage
Modified Paths:
--------------
showeq/branches/cn187_devel/src/map.cpp
Modified: showeq/branches/cn187_devel/src/map.cpp
===================================================================
--- showeq/branches/cn187_devel/src/map.cpp 2021-04-30 04:10:53 UTC (rev 1166)
+++ showeq/branches/cn187_devel/src/map.cpp 2021-04-30 04:11:06 UTC (rev 1167)
@@ -1046,63 +1046,63 @@
m_action_FOVNoBrush = subSubMenu->addAction("No Background");
m_action_FOVNoBrush->setCheckable(true);
- m_action_FOVNoBrush->setData(Qt::NoBrush);
+ m_action_FOVNoBrush->setData(static_cast<int>(Qt::NoBrush));
m_action_FOVSolidPattern = subSubMenu->addAction("Solid");
m_action_FOVSolidPattern->setCheckable(true);
- m_action_FOVSolidPattern->setData(Qt::SolidPattern);
+ m_action_FOVSolidPattern->setData(static_cast<int>(Qt::SolidPattern));
m_action_FOVDense1Pattern = subSubMenu->addAction("94% fill");
m_action_FOVDense1Pattern->setCheckable(true);
- m_action_FOVDense1Pattern->setData(Qt::Dense1Pattern);
+ m_action_FOVDense1Pattern->setData(static_cast<int>(Qt::Dense1Pattern));
m_action_FOVDense2Pattern = subSubMenu->addAction("88% fill");
m_action_FOVDense2Pattern->setCheckable(true);
- m_action_FOVDense2Pattern->setData(Qt::Dense2Pattern);
+ m_action_FOVDense2Pattern->setData(static_cast<int>(Qt::Dense2Pattern));
m_action_FOVDense3Pattern = subSubMenu->addAction("63% fill");
m_action_FOVDense3Pattern ->setCheckable(true);
- m_action_FOVDense3Pattern ->setData(Qt::Dense3Pattern);
+ m_action_FOVDense3Pattern ->setData(static_cast<int>(Qt::Dense3Pattern));
m_action_FOVDense4Pattern = subSubMenu->addAction("50% fill");
m_action_FOVDense4Pattern->setCheckable(true);
- m_action_FOVDense4Pattern->setData(Qt::Dense4Pattern);
+ m_action_FOVDense4Pattern->setData(static_cast<int>(Qt::Dense4Pattern));
m_action_FOVDense5Pattern = subSubMenu->addAction("37% fill");
m_action_FOVDense5Pattern->setCheckable(true);
- m_action_FOVDense5Pattern->setData(Qt::Dense5Pattern);
+ m_action_FOVDense5Pattern->setData(static_cast<int>(Qt::Dense5Pattern));
m_action_FOVDense6Pattern = subSubMenu->addAction("12% fill");
m_action_FOVDense6Pattern->setCheckable(true);
- m_action_FOVDense6Pattern->setData(Qt::Dense6Pattern);
+ m_action_FOVDense6Pattern->setData(static_cast<int>(Qt::Dense6Pattern));
m_action_FOVDense7Pattern = subSubMenu->addAction("6% fill");
m_action_FOVDense7Pattern->setCheckable(true);
- m_action_FOVDense7Pattern->setData(Qt::Dense7Pattern);
+ m_action_FOVDense7Pattern->setData(static_cast<int>(Qt::Dense7Pattern));
m_action_FOVHorPattern = subSubMenu->addAction("Horizontal lines");
m_action_FOVHorPattern->setCheckable(true);
- m_action_FOVHorPattern->setData(Qt::HorPattern);
+ m_action_FOVHorPattern->setData(static_cast<int>(Qt::HorPattern));
m_action_FOVVerPattern = subSubMenu->addAction("Vertical lines");
m_action_FOVVerPattern->setCheckable(true);
- m_action_FOVVerPattern->setData(Qt::VerPattern);
+ m_action_FOVVerPattern->setData(static_cast<int>(Qt::VerPattern));
m_action_FOVCrossPattern = subSubMenu->addAction("Crossing lines");
m_action_FOVCrossPattern->setCheckable(true);
- m_action_FOVCrossPattern->setData(Qt::CrossPattern);
+ m_action_FOVCrossPattern->setData(static_cast<int>(Qt::CrossPattern));
m_action_FOVBDiagPattern = subSubMenu->addAction("Diagonal lines (directed /)");
m_action_FOVBDiagPattern->setCheckable(true);
- m_action_FOVBDiagPattern->setData(Qt::BDiagPattern);
+ m_action_FOVBDiagPattern->setData(static_cast<int>(Qt::BDiagPattern));
m_action_FOVFDiagPattern = subSubMenu->addAction("Diagonal lines (directed \\)");
m_action_FOVFDiagPattern->setCheckable(true);
- m_action_FOVFDiagPattern->setData(Qt::FDiagPattern);
+ m_action_FOVFDiagPattern->setData(static_cast<int>(Qt::FDiagPattern));
m_action_FOVDiagCrossPattern = subSubMenu->addAction("Diagonal crossing lines");
m_action_FOVDiagCrossPattern->setCheckable(true);
- m_action_FOVDiagCrossPattern->setData(Qt::DiagCrossPattern);
+ m_action_FOVDiagCrossPattern->setData(static_cast<int>(Qt::DiagCrossPattern));
connect(subSubMenu, SIGNAL(triggered(QAction*)), this,
SLOT(select_fovStyle(QAction*)));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 04:10:55
|
Revision: 1166
http://sourceforge.net/p/seq/svn/1166
Author: cn187
Date: 2021-04-30 04:10:53 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
[Qt5] Remove includes for now-private QStyles
Modified Paths:
--------------
showeq/branches/cn187_devel/src/interface.cpp
showeq/branches/cn187_devel/src/main.cpp
Modified: showeq/branches/cn187_devel/src/interface.cpp
===================================================================
--- showeq/branches/cn187_devel/src/interface.cpp 2021-04-30 04:10:41 UTC (rev 1165)
+++ showeq/branches/cn187_devel/src/interface.cpp 2021-04-30 04:10:53 UTC (rev 1166)
@@ -89,11 +89,6 @@
#include <QInputDialog>
#include <QFontDialog>
#include <QColorDialog>
-#include <QWindowsStyle>
-#include <QPlastiqueStyle>
-#include <QMotifStyle>
-#include <QCDEStyle>
-#include <QCleanlooksStyle>
#include <QMenu>
#include <QWidgetAction>
#include <QDesktopWidget>
Modified: showeq/branches/cn187_devel/src/main.cpp
===================================================================
--- showeq/branches/cn187_devel/src/main.cpp 2021-04-30 04:10:41 UTC (rev 1165)
+++ showeq/branches/cn187_devel/src/main.cpp 2021-04-30 04:10:53 UTC (rev 1166)
@@ -48,7 +48,6 @@
#endif
#include <QApplication>
-#include <QWindowsStyle>
#if 1 // ZBTEMP
#include <QDir>
#endif
@@ -202,7 +201,6 @@
#endif
/* Create application instance */
- // QApplication::setStyle( new QWindowsStyle );
QApplication qapp (argc, argv);
/* Print the version number */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 04:10:49
|
Revision: 1165
http://sourceforge.net/p/seq/svn/1165
Author: cn187
Date: 2021-04-30 04:10:41 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
[Qt5] Replace TRUE/FALSE constants with true/false built-ins
Modified Paths:
--------------
showeq/branches/cn187_devel/src/editor.cpp
showeq/branches/cn187_devel/src/interface.cpp
showeq/branches/cn187_devel/src/map.cpp
showeq/branches/cn187_devel/src/spawnlist2.cpp
Modified: showeq/branches/cn187_devel/src/editor.cpp
===================================================================
--- showeq/branches/cn187_devel/src/editor.cpp 2021-04-30 04:10:33 UTC (rev 1164)
+++ showeq/branches/cn187_devel/src/editor.cpp 2021-04-30 04:10:41 UTC (rev 1165)
@@ -157,7 +157,7 @@
f.close();
e->repaint();
- e->document()->setModified( FALSE );
+ e->document()->setModified( false );
setWindowTitle( fileName );
QString s;
s.sprintf( "Opened %s", fileName );
@@ -183,7 +183,7 @@
t << text;
f.close();
- e->document()->setModified( FALSE );
+ e->document()->setModified( false );
setWindowTitle( filename );
Modified: showeq/branches/cn187_devel/src/interface.cpp
===================================================================
--- showeq/branches/cn187_devel/src/interface.cpp 2021-04-30 04:10:33 UTC (rev 1164)
+++ showeq/branches/cn187_devel/src/interface.cpp 2021-04-30 04:10:41 UTC (rev 1165)
@@ -5122,7 +5122,7 @@
QString address =
QInputDialog::getItem(this, "ShowEQ - EQ Client IP Address",
"Enter IP address of EQ client",
- iplst, 0, TRUE, &ok);
+ iplst, 0, true, &ok);
if (ok)
{
for (int i = 4; i > 0; i--)
@@ -5145,7 +5145,7 @@
QString address =
QInputDialog::getItem(this, "ShowEQ - EQ Client MAC Address",
"Enter MAC address of EQ client",
- maclst, 0, TRUE, &ok);
+ maclst, 0, true, &ok);
if (ok)
{
if (address.length() != 17)
Modified: showeq/branches/cn187_devel/src/map.cpp
===================================================================
--- showeq/branches/cn187_devel/src/map.cpp 2021-04-30 04:10:33 UTC (rev 1164)
+++ showeq/branches/cn187_devel/src/map.cpp 2021-04-30 04:10:41 UTC (rev 1165)
@@ -1801,7 +1801,7 @@
// m_offscreen.setOptimization(m_param.pixmapOptimizationMethod());
m_mapTip = new MapLabel( this );
- this->setMouseTracking( TRUE );
+ this->setMouseTracking( true );
m_mapPanning = false;
Modified: showeq/branches/cn187_devel/src/spawnlist2.cpp
===================================================================
--- showeq/branches/cn187_devel/src/spawnlist2.cpp 2021-04-30 04:10:33 UTC (rev 1164)
+++ showeq/branches/cn187_devel/src/spawnlist2.cpp 2021-04-30 04:10:41 UTC (rev 1165)
@@ -85,7 +85,7 @@
// Create the Spawn Counter
m_totalSpawns = new QLineEdit(this);
- m_totalSpawns->setReadOnly(TRUE);
+ m_totalSpawns->setReadOnly(true);
m_totalSpawns->setAlignment(Qt::AlignCenter);
m_totalSpawns->setMinimumWidth(5);
m_totalSpawns->setMaximumWidth(50);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 04:10:33
|
Revision: 1164
http://sourceforge.net/p/seq/svn/1164
Author: cn187
Date: 2021-04-30 04:10:33 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
[Qt5] Replace WFlags with WindowFlags
Modified Paths:
--------------
showeq/branches/cn187_devel/src/seqlistview.cpp
showeq/branches/cn187_devel/src/seqlistview.h
showeq/branches/cn187_devel/src/seqwindow.cpp
showeq/branches/cn187_devel/src/seqwindow.h
Modified: showeq/branches/cn187_devel/src/seqlistview.cpp
===================================================================
--- showeq/branches/cn187_devel/src/seqlistview.cpp 2021-04-30 04:10:23 UTC (rev 1163)
+++ showeq/branches/cn187_devel/src/seqlistview.cpp 2021-04-30 04:10:33 UTC (rev 1164)
@@ -34,7 +34,7 @@
SEQListView::SEQListView(const QString prefName,
QWidget* parent,
const char* name,
- Qt::WFlags f)
+ Qt::WindowFlags f)
: QTreeWidget(parent),
m_preferenceName(prefName),
m_sortColumn(0),
Modified: showeq/branches/cn187_devel/src/seqlistview.h
===================================================================
--- showeq/branches/cn187_devel/src/seqlistview.h 2021-04-30 04:10:23 UTC (rev 1163)
+++ showeq/branches/cn187_devel/src/seqlistview.h 2021-04-30 04:10:33 UTC (rev 1164)
@@ -45,7 +45,7 @@
SEQListView(const QString prefName,
QWidget* parent = 0,
const char* name = 0,
- Qt::WFlags f = 0);
+ Qt::WindowFlags f = 0);
~SEQListView();
const QString& preferenceName() const { return m_preferenceName; }
Modified: showeq/branches/cn187_devel/src/seqwindow.cpp
===================================================================
--- showeq/branches/cn187_devel/src/seqwindow.cpp 2021-04-30 04:10:23 UTC (rev 1163)
+++ showeq/branches/cn187_devel/src/seqwindow.cpp 2021-04-30 04:10:33 UTC (rev 1164)
@@ -33,7 +33,7 @@
#include <QPixmap>
SEQWindow::SEQWindow(const QString prefName, const QString caption,
- QWidget* parent, const char* name, Qt::WFlags f)
+ QWidget* parent, const char* name, Qt::WindowFlags f)
: QDockWidget(parent),
m_preferenceName(prefName)
{
Modified: showeq/branches/cn187_devel/src/seqwindow.h
===================================================================
--- showeq/branches/cn187_devel/src/seqwindow.h 2021-04-30 04:10:23 UTC (rev 1163)
+++ showeq/branches/cn187_devel/src/seqwindow.h 2021-04-30 04:10:33 UTC (rev 1164)
@@ -43,7 +43,7 @@
public:
SEQWindow(const QString prefName, const QString caption,
- QWidget* parent = 0, const char* name = 0, Qt::WFlags f = 0);
+ QWidget* parent = 0, const char* name = 0, Qt::WindowFlags f = 0);
~SEQWindow();
virtual QMenu* menu();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-30 04:10:24
|
Revision: 1163
http://sourceforge.net/p/seq/svn/1163
Author: cn187
Date: 2021-04-30 04:10:23 +0000 (Fri, 30 Apr 2021)
Log Message:
-----------
[Qt5] Replace toAscii with toLatin1
Modified Paths:
--------------
showeq/branches/cn187_devel/src/bazaarlog.cpp
showeq/branches/cn187_devel/src/combatlog.cpp
showeq/branches/cn187_devel/src/datalocationmgr.cpp
showeq/branches/cn187_devel/src/db3conv.cpp
showeq/branches/cn187_devel/src/drawmap.cpp
showeq/branches/cn187_devel/src/editor.cpp
showeq/branches/cn187_devel/src/experiencelog.cpp
showeq/branches/cn187_devel/src/filter.cpp
showeq/branches/cn187_devel/src/filteredspawnlog.cpp
showeq/branches/cn187_devel/src/filtermgr.cpp
showeq/branches/cn187_devel/src/filternotifications.cpp
showeq/branches/cn187_devel/src/gdbmconv.cpp
showeq/branches/cn187_devel/src/group.cpp
showeq/branches/cn187_devel/src/guild.cpp
showeq/branches/cn187_devel/src/interface.cpp
showeq/branches/cn187_devel/src/logger.cpp
showeq/branches/cn187_devel/src/main.cpp
showeq/branches/cn187_devel/src/map.cpp
showeq/branches/cn187_devel/src/mapcore.cpp
showeq/branches/cn187_devel/src/mapicon.cpp
showeq/branches/cn187_devel/src/messageshell.cpp
showeq/branches/cn187_devel/src/messagewindow.cpp
showeq/branches/cn187_devel/src/packet.cpp
showeq/branches/cn187_devel/src/packetinfo.cpp
showeq/branches/cn187_devel/src/packetlog.cpp
showeq/branches/cn187_devel/src/packetstream.cpp
showeq/branches/cn187_devel/src/player.cpp
showeq/branches/cn187_devel/src/spawnlist.cpp
showeq/branches/cn187_devel/src/spawnlist2.cpp
showeq/branches/cn187_devel/src/spawnlistcommon.cpp
showeq/branches/cn187_devel/src/spawnlog.cpp
showeq/branches/cn187_devel/src/spawnmonitor.cpp
showeq/branches/cn187_devel/src/spawnpointlist.cpp
showeq/branches/cn187_devel/src/spawnshell.cpp
showeq/branches/cn187_devel/src/util.cpp
showeq/branches/cn187_devel/src/xmlconv.cpp
showeq/branches/cn187_devel/src/xmlpreferences.cpp
showeq/branches/cn187_devel/src/zonemgr.cpp
Modified: showeq/branches/cn187_devel/src/bazaarlog.cpp
===================================================================
--- showeq/branches/cn187_devel/src/bazaarlog.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/bazaarlog.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -67,7 +67,7 @@
Item *merchant = m_shell.spawns().value(resp.player_id, nullptr);
const char *merchant_name = "unknown";
if (merchant)
- merchant_name = merchant->name().toAscii().data();
+ merchant_name = merchant->name().toLatin1().data();
QString csv;
csv.sprintf("1^%d^%d^%d^%s^%s",
int(time(NULL)),resp.price,resp.count,
Modified: showeq/branches/cn187_devel/src/combatlog.cpp
===================================================================
--- showeq/branches/cn187_devel/src/combatlog.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/combatlog.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -631,12 +631,12 @@
case 52: // Tiger Claw
{
// this is a normal skill
- s_type.sprintf("%s(%d)", skill_name(iType).toAscii().data(), iType);
+ s_type.sprintf("%s(%d)", skill_name(iType).toLatin1().data(), iType);
break;
}
case 231: // Non Melee Damage
{
- s_type.sprintf("Spell: %s(%d)", spell_name(iSpell).toAscii().data(), iSpell);
+ s_type.sprintf("Spell: %s(%d)", spell_name(iSpell).toLatin1().data(), iSpell);
break;
}
default: // Damage Shield?
Modified: showeq/branches/cn187_devel/src/datalocationmgr.cpp
===================================================================
--- showeq/branches/cn187_devel/src/datalocationmgr.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/datalocationmgr.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -55,7 +55,7 @@
// no, then attempt to create it.
if (!userDataDir.mkdir(m_userData))
{
- seqWarn("Failed to create '%s'\n", userDataDir.absolutePath().toAscii().data());
+ seqWarn("Failed to create '%s'\n", userDataDir.absolutePath().toLatin1().data());
return false;
}
}
Modified: showeq/branches/cn187_devel/src/db3conv.cpp
===================================================================
--- showeq/branches/cn187_devel/src/db3conv.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/db3conv.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -94,7 +94,7 @@
if (!dirInfo.exists())
{
fprintf(stderr, "DB3Convenience: Data Directory '%s' doesn't exist.\n",
- dirInfo.absoluteFilePath().toAscii().data());
+ dirInfo.absoluteFilePath().toLatin1().data());
// nothing more to do, just return NULL
return (Db*)NULL;
@@ -104,7 +104,7 @@
if (!dirInfo.isDir())
{
fprintf(stderr, "DB3Convenience: Data Directory '%s isn't a directory.\n",
- dirInfo.absoluteFilePath().toAscii().data());
+ dirInfo.absoluteFilePath().toLatin1().data());
// nothing more to do, just return NULL
return (Db*)NULL;
@@ -119,7 +119,7 @@
{
// if the file isn't readable, no point in going on is there...
fprintf(stderr, "DB3Convenience: Data File '%s isn't readable.\n",
- dirInfo.absoluteFilePath().toAscii().data());
+ dirInfo.absoluteFilePath().toLatin1().data());
// nothing more to do, just return NULL
return (Db*)NULL;
@@ -156,7 +156,7 @@
// setup the common database environment for all databases opened
// using this object
- ret = m_dbEnv->open(dirInfo.absoluteFilePath().toAscii().data(), dbEnvFlags,
+ ret = m_dbEnv->open(dirInfo.absoluteFilePath().toLatin1().data(), dbEnvFlags,
0664);
if (ret != 0)
@@ -187,16 +187,16 @@
#if 1 // can't do verify with transactions, logging, or locking
// verify the database before we go any further
- ret = retdbp->verify(dbName.toAscii().data(), NULL, NULL, 0);
+ ret = retdbp->verify(dbName.toLatin1().data(), NULL, NULL, 0);
if (ret != 0)
{
// display a human readable error
fprintf(stderr, "DB3Convenience: Db::verify() failed on file '%s': %s\n",
- dbName.toAscii().data(), DbEnv::strerror(ret));
+ dbName.toLatin1().data(), DbEnv::strerror(ret));
if (ret == DB_RUNRECOVERY)
fprintf(stderr, "DB3Convenience: Please run db_recover on file '%s'\n",
- dbName.toAscii().data());
+ dbName.toLatin1().data());
// check if it's a file access problem
if (openForReadOnly)
@@ -221,7 +221,7 @@
// display a human readable error
fprintf(stderr,
"DB3Convenience: Db::set_flags(0) failed on file '%s': %s\n",
- dbName.toAscii().data(), DbEnv::strerror(ret));
+ dbName.toLatin1().data(), DbEnv::strerror(ret));
// delete the database handle since it's not usable
delete retdbp;
@@ -233,13 +233,13 @@
// open the database
// ret = retdbp->open((const char*)dbName, NULL, DB_HASH, dbOpenFlags, 0664);
- ret = retdbp->open(NULL, dbName.toAscii().data(), NULL, DB_BTREE, dbOpenFlags, 0664);
+ ret = retdbp->open(NULL, dbName.toLatin1().data(), NULL, DB_BTREE, dbOpenFlags, 0664);
if (ret != 0)
{
// display a human readable error
fprintf(stderr, "DB3Convenience: Db::open() failed on file '%s': %s\n",
- dbName.toAscii().data(), DbEnv::strerror(ret));
+ dbName.toLatin1().data(), DbEnv::strerror(ret));
// check if it's a file access problem
if (openForReadOnly)
@@ -283,7 +283,7 @@
success = true;
break;
default:
- displayDB3Error(ret, "Insert: put", dbName.toAscii().data());
+ displayDB3Error(ret, "Insert: put", dbName.toLatin1().data());
}
}
@@ -307,7 +307,7 @@
success = true;
break;
default:
- displayDB3Error(ret, "Delete: del", dbName.toAscii().data());
+ displayDB3Error(ret, "Delete: del", dbName.toLatin1().data());
}
}
@@ -335,7 +335,7 @@
success = false;
break;
default:
- displayDB3Error(ret, "IsEntryExist: get", dbName.toAscii().data());
+ displayDB3Error(ret, "IsEntryExist: get", dbName.toLatin1().data());
}
}
@@ -368,7 +368,7 @@
success = false;
break;
default:
- displayDB3Error(ret, "GetEntry: get", dbName.toAscii().data());
+ displayDB3Error(ret, "GetEntry: get", dbName.toLatin1().data());
}
}
@@ -404,7 +404,7 @@
int ret = db->close(0);
if (ret != 0)
- displayDB3Error(ret, "Close: close", dbName.toAscii().data());
+ displayDB3Error(ret, "Close: close", dbName.toLatin1().data());
// remove the db from the dictionary
m_dbDict.remove(dbName);
@@ -440,7 +440,7 @@
ret = db->close(0);
if (ret != 0)
- displayDB3Error(ret, "Shutdown: close", dbName.toAscii().data());
+ displayDB3Error(ret, "Shutdown: close", dbName.toLatin1().data());
// remove the db from the dictionary
m_dbDict.remove(dbName);
@@ -510,7 +510,7 @@
if (ret != 0)
{
- displayDB3Error(ret, "GetFirstKey: cursor", dbName.toAscii().data());
+ displayDB3Error(ret, "GetFirstKey: cursor", dbName.toLatin1().data());
return false;
}
@@ -528,7 +528,7 @@
// display an error on any other error returns
if (ret != 0)
{
- displayDB3Error(ret, "GetFirstKey: get", m_dbName.toAscii().data());
+ displayDB3Error(ret, "GetFirstKey: get", m_dbName.toLatin1().data());
return false;
}
@@ -579,7 +579,7 @@
// display an error on any other error returns
if (ret != 0)
{
- displayDB3Error(ret, "GetNextKey: get", m_dbName.toAscii().data());
+ displayDB3Error(ret, "GetNextKey: get", m_dbName.toLatin1().data());
return false;
}
@@ -642,7 +642,7 @@
int ret = m_db->close(0);
if (ret != 0)
- displayDB3Error(ret, "Done: close", m_dbName.toAscii().data());
+ displayDB3Error(ret, "Done: close", m_dbName.toLatin1().data());
}
// if there is any data left over that the user didn't get, then free it
Modified: showeq/branches/cn187_devel/src/drawmap.cpp
===================================================================
--- showeq/branches/cn187_devel/src/drawmap.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/drawmap.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -527,7 +527,7 @@
gdImageString (im, gdFontSmall,
calcXOffset (locationX[n]) - 2,
calcYOffset (locationY[n]) - 2,
- (unsigned char*)locationName[n].toAscii().data(), tmpcolor);
+ (unsigned char*)locationName[n].toLatin1().data(), tmpcolor);
}
/* Print the http header */
@@ -583,7 +583,7 @@
mapName.replace(slashExp, "_");
mapName.prepend(PKGDATADIR "maps/");
- loadFileMap (mapName.toAscii().data());
+ loadFileMap (mapName.toLatin1().data());
paintMap();
}
else
Modified: showeq/branches/cn187_devel/src/editor.cpp
===================================================================
--- showeq/branches/cn187_devel/src/editor.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/editor.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -136,7 +136,7 @@
{
QString fn = QFileDialog::getOpenFileName(this);
if ( !fn.isEmpty() )
- load(fn.toAscii().data());
+ load(fn.toLatin1().data());
else
statusBar()->showMessage( "File Open Cancelled", 2000 );
}
Modified: showeq/branches/cn187_devel/src/experiencelog.cpp
===================================================================
--- showeq/branches/cn187_devel/src/experiencelog.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/experiencelog.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -324,7 +324,7 @@
QFileInfo fileInfo = m_dataLocMgr->findWriteFile("logs", "exp.log");
- m_log = fopen(fileInfo.absoluteFilePath().toAscii().data(), "a");
+ m_log = fopen(fileInfo.absoluteFilePath().toLatin1().data(), "a");
if (m_log == 0)
{
m_log_exp = 0;
@@ -363,7 +363,7 @@
#ifdef DEBUGEXP
resize( sizeHint() );
qDebug("ExperienceWindow::addExpRecord() '%s', lvl %d, exp %d",
- mob_name.toAscii().data(), mob_level, xp_gained);
+ mob_name.toLatin1().data(), mob_level, xp_gained);
#endif
if (m_log_exp)
@@ -418,7 +418,7 @@
FILE* newlogfp = NULL;
// open the file for append
- newlogfp = fopen(m_newExpLogFile.toAscii().data(), "a");
+ newlogfp = fopen(m_newExpLogFile.toLatin1().data(), "a");
if (newlogfp != NULL)
{
@@ -426,11 +426,11 @@
fprintf(newlogfp,
"0\t%s\t%s\t%d\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%d\t%d\t%lu",
- s_time, s_mob_name.toAscii().data(), mob_level,
- s_xp_value.toAscii().data(), s_xp_valueZEM.toAscii().data(),
- s_xp_valuep.toAscii().data(), s_xp_valueg.toAscii().data(),
- s_xp_gained.toAscii().data(), m_player->name().toAscii().data(),
- m_player->lastName().toAscii().data(), m_player->level(),
+ s_time, s_mob_name.toLatin1().data(), mob_level,
+ s_xp_value.toLatin1().data(), s_xp_valueZEM.toLatin1().data(),
+ s_xp_valuep.toLatin1().data(), s_xp_valueg.toLatin1().data(),
+ s_xp_gained.toLatin1().data(), m_player->name().toLatin1().data(),
+ m_player->lastName().toLatin1().data(), m_player->level(),
m_player->classVal(), m_group->groupSize());
const Spawn* spawn;
Modified: showeq/branches/cn187_devel/src/filter.cpp
===================================================================
--- showeq/branches/cn187_devel/src/filter.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/filter.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -181,7 +181,7 @@
// For the pattern, save off the original. This is what will be saved
// during save operations. But the actual regexp we filter with will
// mark the # in spawn names as optional to aid in filter writing.
- m_regexpOriginalPattern = QString(regexString.toAscii().data());
+ m_regexpOriginalPattern = QString(regexString.toLatin1().data());
QString fixedFilterPattern = regexString;
fixedFilterPattern.replace("Name:", "Name:#?", Qt::CaseInsensitive);
@@ -190,8 +190,8 @@
if (!m_regexp.isValid())
{
seqWarn("Filter Error: '%s' - %s",
- m_regexp.pattern().toAscii().data(),
- m_regexp.errorString().toAscii().data());
+ m_regexp.pattern().toLatin1().data(),
+ m_regexp.errorString().toLatin1().data());
}
}
@@ -203,8 +203,8 @@
if (!m_regexp.isValid())
{
seqWarn("Filter Error: '%s' - %s",
- m_regexp.pattern().toAscii().data(),
- m_regexp.errorString().toAscii().data());
+ m_regexp.pattern().toLatin1().data(),
+ m_regexp.errorString().toLatin1().data());
}
}
@@ -604,13 +604,13 @@
FilterMap::const_iterator it;
seqInfo("Filters from file '%s':",
- m_file.toAscii().data());
+ m_file.toLatin1().data());
// iterate over the filters
for (it = m_filters.begin(); it != m_filters.end(); it++)
{
// print the header
seqInfo("Filter Type '%s':",
- m_types.name(it->first).toAscii().data());
+ m_types.name(it->first).toLatin1().data());
// list off the actual filters
it->second->listFilters();
Modified: showeq/branches/cn187_devel/src/filteredspawnlog.cpp
===================================================================
--- showeq/branches/cn187_devel/src/filteredspawnlog.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/filteredspawnlog.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -92,12 +92,12 @@
// log the information
outputf("%s %s %s LOC %dy, %dx, %dz at %s (%s)\n",
- m_filterMgr->filterString(flag).toAscii().data(),
+ m_filterMgr->filterString(flag).toLatin1().data(),
action,
- item->name().toAscii().data(),
+ item->name().toLatin1().data(),
item->y(), item->x(), item->z(),
- eqDate.isValid() ? eqDate.toString().toAscii().data() : "",
- item->spawnTimeStr().toAscii().data());
+ eqDate.isValid() ? eqDate.toString().toLatin1().data() : "",
+ item->spawnTimeStr().toLatin1().data());
flush();
}
Modified: showeq/branches/cn187_devel/src/filtermgr.cpp
===================================================================
--- showeq/branches/cn187_devel/src/filtermgr.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/filtermgr.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -138,7 +138,7 @@
m_filterFile = fileInfo.absoluteFilePath();
- seqInfo("Loading Filters from '%s'", m_filterFile.toAscii().data());
+ seqInfo("Loading Filters from '%s'", m_filterFile.toLatin1().data());
m_filters->load(m_filterFile);
@@ -152,7 +152,7 @@
m_filterFile = fileInfo.absoluteFilePath();
- seqInfo("Loading Filters from '%s'", m_filterFile.toAscii().data());
+ seqInfo("Loading Filters from '%s'", m_filterFile.toLatin1().data());
m_filters->load(m_filterFile);
@@ -168,7 +168,7 @@
m_filterFile = fileInfo.absoluteFilePath();
- seqInfo("Saving filters to %s", m_filterFile.toAscii().data());
+ seqInfo("Saving filters to %s", m_filterFile.toLatin1().data());
m_filters->save(m_filterFile);
}
@@ -243,7 +243,7 @@
m_zoneFilterFile = fileInfo.absoluteFilePath();
- seqInfo("Loading Zone Filter File: %s", m_zoneFilterFile.toAscii().data());
+ seqInfo("Loading Zone Filter File: %s", m_zoneFilterFile.toLatin1().data());
m_zoneFilters->load(m_zoneFilterFile);
@@ -259,7 +259,7 @@
m_zoneFilterFile = fileInfo.absoluteFilePath();
- seqInfo("Loading Zone Filter File: %s", m_zoneFilterFile.toAscii().data());
+ seqInfo("Loading Zone Filter File: %s", m_zoneFilterFile.toLatin1().data());
m_zoneFilters->load(m_zoneFilterFile);
@@ -281,7 +281,7 @@
m_zoneFilterFile = fileInfo.absoluteFilePath();
- seqInfo("Saving filters to %s", m_zoneFilterFile.toAscii().data());
+ seqInfo("Saving filters to %s", m_zoneFilterFile.toLatin1().data());
if (! m_zoneFilters->save(m_zoneFilterFile))
{
Modified: showeq/branches/cn187_devel/src/filternotifications.cpp
===================================================================
--- showeq/branches/cn187_devel/src/filternotifications.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/filternotifications.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -141,7 +141,7 @@
command.replace(cueExp, audioCue);
// fire off the command
- system (command.toAscii().data());
+ system (command.toLatin1().data());
}
#ifndef QMAKEBUILD
Modified: showeq/branches/cn187_devel/src/gdbmconv.cpp
===================================================================
--- showeq/branches/cn187_devel/src/gdbmconv.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/gdbmconv.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -75,7 +75,7 @@
dbName += ".dbm";
// attempt to open the database for write
- if ((dbf = gdbm_open(dbName.toAscii().data(), 0, GDBM_WRCREAT, 0644, 0))
+ if ((dbf = gdbm_open(dbName.toLatin1().data(), 0, GDBM_WRCREAT, 0644, 0))
!= NULL)
{
// if successful, then attempt to insert or replace data under key
@@ -86,7 +86,7 @@
success = true;
break;
default:
- displayGDBMError("Insert: gdbm_store", dbName.toAscii().data());
+ displayGDBMError("Insert: gdbm_store", dbName.toLatin1().data());
}
// close the database
@@ -95,7 +95,7 @@
else
{
// display GDBM Error
- displayGDBMError("Insert: gdbm_open", dbName.toAscii().data());
+ displayGDBMError("Insert: gdbm_open", dbName.toLatin1().data());
// attempt to diagnose the open for write failure
diagFileWriteFail(dbName);
@@ -116,7 +116,7 @@
dbName += ".dbm";
// attempt to open the database for write
- if ((dbf = gdbm_open(dbName.toAscii().data(), 0, GDBM_WRITER, 0644, 0))
+ if ((dbf = gdbm_open(dbName.toLatin1().data(), 0, GDBM_WRITER, 0644, 0))
!= NULL)
{
// if successful, then attempt to insert or replace data under key
@@ -123,7 +123,7 @@
if (gdbm_delete(dbf, key_) == 0)
success = true;
else
- displayGDBMError("Delete: gdbm_delete", dbName.toAscii().data());
+ displayGDBMError("Delete: gdbm_delete", dbName.toLatin1().data());
// close the database
gdbm_close(dbf);
@@ -131,7 +131,7 @@
else
{
// display GDBM Error
- displayGDBMError("Delete: gdbm_open", dbName.toAscii().data());
+ displayGDBMError("Delete: gdbm_open", dbName.toLatin1().data());
// attempt to diagnose the open for write failure
diagFileWriteFail(dbName);
@@ -153,7 +153,7 @@
dbName += ".dbm";
// attempt to open the database for read
- if ((dbf = gdbm_open(dbName.toAscii().data(), 0, GDBM_READER,
+ if ((dbf = gdbm_open(dbName.toLatin1().data(), 0, GDBM_READER,
0644, 0)) != NULL)
{
// attempt to retrieve the entry from the database
@@ -188,7 +188,7 @@
dbName += ".dbm";
// attmpet to open the database for read
- if ((dbf = gdbm_open(dbName.toAscii().data(), 0, GDBM_READER,
+ if ((dbf = gdbm_open(dbName.toLatin1().data(), 0, GDBM_READER,
0644, 0)) != NULL)
{
// attempt to retrieve the entry from the database
@@ -208,7 +208,7 @@
else
{
// display the notice (this isn't necessarily bad)
- displayGDBMError("GetEntry: gdbm_open", dbName.toAscii().data(), "Notice");
+ displayGDBMError("GetEntry: gdbm_open", dbName.toLatin1().data(), "Notice");
// attempt to diagnose the open for read failure
diagFileReadFail(dbName);
@@ -227,7 +227,7 @@
dbName += ".dbm";
// attempt to open the database for write
- if ((dbf = gdbm_open(dbName.toAscii().data(), 0, GDBM_WRITER, 0644, 0))
+ if ((dbf = gdbm_open(dbName.toLatin1().data(), 0, GDBM_WRITER, 0644, 0))
!= NULL)
{
// if successful, then attempt to insert or replace data under key
@@ -234,7 +234,7 @@
if (gdbm_reorganize(dbf) == 0)
success = true;
else
- displayGDBMError("Reorganize: gdbm_reorganize", dbName.toAscii().data());
+ displayGDBMError("Reorganize: gdbm_reorganize", dbName.toLatin1().data());
// close the database
gdbm_close(dbf);
@@ -242,7 +242,7 @@
else
{
// display GDBM Error
- displayGDBMError("Reorganize: gdbm_open", dbName.toAscii().data());
+ displayGDBMError("Reorganize: gdbm_open", dbName.toLatin1().data());
// attempt to diagnose the open for write failure
diagFileWriteFail(dbName);
@@ -311,13 +311,13 @@
dbName += ".dbm";
// open the specified DB file for reading
- m_dbf = gdbm_open(dbName.toAscii().data(), 0, GDBM_READER,
+ m_dbf = gdbm_open(dbName.toLatin1().data(), 0, GDBM_READER,
0644, 0);
// if failed, then nothing to read
if (m_dbf == NULL)
{
- displayGDBMError("GetFirstKey: gdbm_open", dbName.toAscii().data());
+ displayGDBMError("GetFirstKey: gdbm_open", dbName.toLatin1().data());
// attempt to diagnose the open for read failure
diagFileReadFail(dbName);
Modified: showeq/branches/cn187_devel/src/group.cpp
===================================================================
--- showeq/branches/cn187_devel/src/group.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/group.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -198,7 +198,7 @@
const groupDisbandStruct* gmem = (const groupDisbandStruct*)data;
// If we're disbanding, reset counters and clear member slots
- if(!strcmp(gmem->membername, m_player->name().toAscii().data()))
+ if(!strcmp(gmem->membername, m_player->name().toLatin1().data()))
{
m_memberCount = 0;
m_membersInZoneCount = 0;
Modified: showeq/branches/cn187_devel/src/guild.cpp
===================================================================
--- showeq/branches/cn187_devel/src/guild.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/guild.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -197,7 +197,7 @@
seqInfo("GuildMgr: Guildsfile loaded");
}
else
- seqWarn("GuildMgr: Could not load guildsfile, %s", guildsFileName.toAscii().data());
+ seqWarn("GuildMgr: Could not load guildsfile, %s", guildsFileName.toLatin1().data());
}
void GuildMgr::guildList2text(QString fn)
@@ -237,7 +237,7 @@
for (auto itr = m_guildList.begin(); itr != m_guildList.end(); ++itr)
{
if (!itr->second.isNull())
- seqInfo("%d\t%s", itr->first, itr->second.toAscii().data());
+ seqInfo("%d\t%s", itr->first, itr->second.toLatin1().data());
}
}
Modified: showeq/branches/cn187_devel/src/interface.cpp
===================================================================
--- showeq/branches/cn187_devel/src/interface.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/interface.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -2493,7 +2493,7 @@
bool usePos = pSEQPrefs->getPrefBool("UseWindowPos", section, true);
if (usePos)
{
- if (!restoreGeometry(QByteArray::fromBase64(dockPrefsGeometry.toAscii())))
+ if (!restoreGeometry(QByteArray::fromBase64(dockPrefsGeometry.toLatin1())))
seqWarn("Could not restore dock/window geometry. Rearrange windows "
"as desired and then re-save preferences");
else
@@ -2501,7 +2501,7 @@
if (isMaximized())
setGeometry(QApplication::desktop()->availableGeometry(this));
- if (!restoreState(QByteArray::fromBase64(dockPrefsState.toAscii())))
+ if (!restoreState(QByteArray::fromBase64(dockPrefsState.toLatin1())))
seqWarn("Could not restore dock/window state. Rearrange windows as"
" desired and then re-save prefrences");
}
@@ -3491,7 +3491,7 @@
// dump the spawns
m_spawnShell->dumpSpawns(tSpawn, out);
- seqInfo(outText.toAscii().data());
+ seqInfo(outText.toLatin1().data());
}
void EQInterface::listDrops (void)
@@ -3507,7 +3507,7 @@
// dump the drops
m_spawnShell->dumpSpawns(tDrop, out);
- seqInfo(outText.toAscii().data());
+ seqInfo(outText.toLatin1().data());
}
void EQInterface::listMapInfo(void)
@@ -3531,7 +3531,7 @@
m_map[i]->dumpInfo(out);
}
- seqInfo(outText.toAscii().data());
+ seqInfo(outText.toLatin1().data());
}
void EQInterface::listInterfaceInfo(void)
@@ -3556,7 +3556,7 @@
out << "FIXME" << endl;
out << "-----------------------" << endl;
- seqInfo(outText.toAscii().data());
+ seqInfo(outText.toLatin1().data());
}
void EQInterface::listGroup(void)
@@ -3572,7 +3572,7 @@
// dump the drops
m_groupMgr->dumpInfo(out);
- seqInfo(outText.toAscii().data());
+ seqInfo(outText.toLatin1().data());
}
@@ -3589,7 +3589,7 @@
// dump the drops
m_guildShell->dumpMembers(out);
- seqInfo(outText.toAscii().data());
+ seqInfo(outText.toLatin1().data());
}
void EQInterface::dumpSpawns (void)
@@ -3772,7 +3772,7 @@
void
EQInterface::launch_editor_filters(void)
{
- EditorWindow * ew = new EditorWindow(m_filterMgr->filterFile().toAscii().data());
+ EditorWindow * ew = new EditorWindow(m_filterMgr->filterFile().toLatin1().data());
ew->setWindowTitle(m_filterMgr->filterFile());
ew->show();
}
@@ -3780,7 +3780,7 @@
void
EQInterface::launch_editor_zoneFilters(void)
{
- EditorWindow * ew = new EditorWindow(m_filterMgr->zoneFilterFile().toAscii().data());
+ EditorWindow * ew = new EditorWindow(m_filterMgr->zoneFilterFile().toLatin1().data());
ew->setWindowTitle(m_filterMgr->zoneFilterFile());
ew->show();
}
@@ -4397,7 +4397,7 @@
pSEQPrefs->setPrefString("OpCodeList", section, opCodeList);
- seqInfo("OpCode monitoring is now ENABLED...\nUsing list:\t%s", opCodeList.toAscii().data());
+ seqInfo("OpCode monitoring is now ENABLED...\nUsing list:\t%s", opCodeList.toLatin1().data());
}
}
else
@@ -4424,7 +4424,7 @@
m_opcodeMonitorLog->init(opCodeList);
seqInfo("The monitored OpCode list has been reloaded...\nUsing list:\t%s",
- opCodeList.toAscii().data());
+ opCodeList.toLatin1().data());
// set the list of monitored opcodes
pSEQPrefs->setPrefString("OpCodeList", section, opCodeList);
@@ -5013,7 +5013,7 @@
void EQInterface::saveSelectedSpawnPath(void)
{
QString fileName;
- fileName.sprintf("%s_mobpath.map", m_zoneMgr->shortZoneName().toAscii().data());
+ fileName.sprintf("%s_mobpath.map", m_zoneMgr->shortZoneName().toLatin1().data());
QFileInfo fileInfo = m_dataLocationMgr->findWriteFile("maps", fileName, false);
@@ -5024,7 +5024,7 @@
// append the selected spawns path to the end
saveSpawnPath(out, m_selectedSpawn);
- seqInfo("Finished appending '%s'!\n", fileName.toAscii().data());
+ seqInfo("Finished appending '%s'!\n", fileName.toLatin1().data());
}
}
@@ -5031,7 +5031,7 @@
void EQInterface::saveSpawnPaths(void)
{
QString fileName;
- fileName.sprintf("%s_mobpath.map", m_zoneMgr->shortZoneName().toAscii().data());
+ fileName.sprintf("%s_mobpath.map", m_zoneMgr->shortZoneName().toLatin1().data());
QFileInfo fileInfo = m_dataLocationMgr->findWriteFile("maps", fileName, false);
@@ -5059,7 +5059,7 @@
saveSpawnPath(out, it.value());
}
- seqInfo("Finished writing '%s'!\n", fileName.toAscii().data());
+ seqInfo("Finished writing '%s'!\n", fileName.toLatin1().data());
}
}
@@ -5150,7 +5150,7 @@
{
if (address.length() != 17)
{
- seqWarn("Invalid MAC Address (%s)! Ignoring!", address.toAscii().data());
+ seqWarn("Invalid MAC Address (%s)! Ignoring!", address.toLatin1().data());
return;
}
for (int i = 4; i > 0; i--)
@@ -5782,7 +5782,7 @@
m_spawnMonitor,
mapPrefName,
mapCaption,
- mapName.toAscii().data(),
+ mapName.toLatin1().data(),
0);
@@ -5837,7 +5837,7 @@
m_messageWindow[i] = new MessageWindow(m_messages, m_messageFilters,
prefName, caption,
- 0, name.toAscii().data());
+ 0, name.toLatin1().data());
setDockEnabled(m_messageWindow[i],
pSEQPrefs->getPrefBool(QString("Dockable") + prefName,
Modified: showeq/branches/cn187_devel/src/logger.cpp
===================================================================
--- showeq/branches/cn187_devel/src/logger.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/logger.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -52,7 +52,7 @@
if (m_fp)
return true;
- m_fp = fopen(m_filename.toAscii().data(),"a");
+ m_fp = fopen(m_filename.toLatin1().data(),"a");
if (!m_fp)
{
@@ -59,7 +59,7 @@
if (!m_errOpen)
{
::fprintf(stderr, "Error opening %s: %s (will keep trying)\n",
- m_filename.toAscii().data(), strerror(errno));
+ m_filename.toLatin1().data(), strerror(errno));
m_errOpen = true;
}
Modified: showeq/branches/cn187_devel/src/main.cpp
===================================================================
--- showeq/branches/cn187_devel/src/main.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/main.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -250,7 +250,7 @@
}
/* NOTE: See preferencefile.cpp for info on how to use prefrences class */
- printf("Using config file '%s'\n", configFile.toAscii().data());
+ printf("Using config file '%s'\n", configFile.toLatin1().data());
pSEQPrefs = new XMLPreferences(configFileDef, configFile);
showeq_params = new ShowEQParams;
Modified: showeq/branches/cn187_devel/src/map.cpp
===================================================================
--- showeq/branches/cn187_devel/src/map.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/map.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -350,7 +350,7 @@
{
#ifdef DEBUGMAP
qDebug ("zoneEnd(%s, %s)",
- longZoneName.toAscii().data(), shortZoneName.toAscii().data());
+ longZoneName.toLatin1().data(), shortZoneName.toLatin1().data());
#endif /* DEBUGMAP */
// atttempt to load the new map
@@ -381,14 +381,14 @@
}
else
{
- seqInfo("No Map found for zone '%s'!", shortZoneName.toAscii().data());
+ seqInfo("No Map found for zone '%s'!", shortZoneName.toLatin1().data());
seqInfo(" Checked for all variants of '%s.map', '%s.txt', and '%s_1.txt'",
- shortZoneName.toAscii().data(),
- shortZoneName.toAscii().data(),
- shortZoneName.toAscii().data());
+ shortZoneName.toLatin1().data(),
+ shortZoneName.toLatin1().data(),
+ shortZoneName.toLatin1().data());
seqInfo(" in directories '%s' and '%s'!",
- m_dataLocMgr->userDataDir("maps").absolutePath().toAscii().data(),
- m_dataLocMgr->pkgDataDir("maps").absolutePath().toAscii().data());
+ m_dataLocMgr->userDataDir("maps").absolutePath().toLatin1().data(),
+ m_dataLocMgr->pkgDataDir("maps").absolutePath().toLatin1().data());
}
}
@@ -410,7 +410,7 @@
if (fileName.isEmpty ())
return;
- seqInfo("Attempting to load map: %s", fileName.toAscii().data());
+ seqInfo("Attempting to load map: %s", fileName.toLatin1().data());
// load the map
loadFileMap(fileName, false, true);
@@ -434,7 +434,7 @@
if (fileName.isEmpty ())
return;
- seqInfo("Attempting to import map: %s", fileName.toAscii().data());
+ seqInfo("Attempting to import map: %s", fileName.toLatin1().data());
// load the map
loadFileMap(fileName, true, true);
@@ -3012,7 +3012,7 @@
// first create the dialog
m_mapIconDialog = new MapIconDialog(this);
m_mapIconDialog->setObjectName(
- QString(windowTitle() + " Icon Dialog").toAscii().data());
+ QString(windowTitle() + " Icon Dialog").toLatin1().data());
// then pass it this objects map icons object
m_mapIconDialog->setMapIcons(m_mapIcons);
@@ -4230,14 +4230,14 @@
"%.3s/Z: %5d/%5d/%5d\n"
"Last: %s\n"
"Spawned: %s\t Remaining: %s\t Count: %d",
- sp->name().toAscii().data(),
+ sp->name().toLatin1().data(),
showeq_params->retarded_coords ? "Y/X" : "X/Y",
showeq_params->retarded_coords ? sp->y() : sp->x(),
showeq_params->retarded_coords ? sp->x() : sp->y(),
sp->z(),
- sp->last().toAscii().data(),
- spawned.toAscii().data(),
- remaining.toAscii().data(),
+ sp->last().toLatin1().data(),
+ spawned.toLatin1().data(),
+ remaining.toLatin1().data(),
sp->count());
m_mapTip->setText( string );
@@ -4259,7 +4259,7 @@
{
QString guild;
if (!spawn->guildTag().isEmpty())
- guild.sprintf("<%s>", spawn->guildTag().toAscii().data());
+ guild.sprintf("<%s>", spawn->guildTag().toLatin1().data());
else if (spawn->guildID())
guild = QString::number(spawn->guildID());
else
@@ -4293,13 +4293,13 @@
spawn->transformedName().toUtf8().data(),
lastName.toUtf8().data(),
guild.toLatin1().data(),
- spawn->level(), hp.toAscii().data(),
+ spawn->level(), hp.toLatin1().data(),
showeq_params->retarded_coords ? "Y/X" : "X/Y",
showeq_params->retarded_coords ? spawn->y() : spawn->x(),
showeq_params->retarded_coords ? spawn->x() : spawn->y(),
item->z(),
- spawn->raceString().toAscii().data(),
- spawn->classString().toAscii().data());
+ spawn->raceString().toLatin1().data(),
+ spawn->classString().toLatin1().data());
if (m_deityPvP)
string += " Deity: " + spawn->deityName();
@@ -4320,8 +4320,8 @@
showeq_params->retarded_coords ? item->y() : item->x(),
showeq_params->retarded_coords ? item->x() : item->y(),
item->z(),
- item->raceString().toAscii().data(),
- item->classString().toAscii().data());
+ item->raceString().toLatin1().data(),
+ item->classString().toLatin1().data());
if ((door) && (door->zonePoint() != 0xFFFFFFFF))
{
@@ -4604,8 +4604,8 @@
filename = files[0];
if (!filename.isEmpty())
- m_offscreen.save(filename.toAscii().data(),
- filter.left(filter.indexOf(' ')).toAscii().data());
+ m_offscreen.save(filename.toLatin1().data(),
+ filter.left(filter.indexOf(' ')).toLatin1().data());
}
//----------------------------------------------------------------------
Modified: showeq/branches/cn187_devel/src/mapcore.cpp
===================================================================
--- showeq/branches/cn187_devel/src/mapcore.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/mapcore.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -508,7 +508,7 @@
return;
- const char* filename = fileName.toAscii().data();
+ const char* filename = fileName.toLatin1().data();
QFile mapFile(fileName);
@@ -607,7 +607,7 @@
bool ok;
- switch (entryType.toAscii())
+ switch (entryType.toLatin1())
{
case 'M':
{
@@ -918,7 +918,7 @@
if (m_image.load(imageFileName))
{
m_imageLoaded = true;
- seqInfo("Loaded map image: '%s'", imageFileName.toAscii().data());
+ seqInfo("Loaded map image: '%s'", imageFileName.toLatin1().data());
}
seqInfo("Loaded map: '%s'", filename);
@@ -952,7 +952,7 @@
if (fileName.contains("/.txt") != 0)
return;
- const char* filename = fileName.toAscii().data();
+ const char* filename = fileName.toLatin1().data();
QFile mapFile(fileName);
@@ -1027,7 +1027,7 @@
// get the field count
count = fields.count();
- switch (entryType.toAscii())
+ switch (entryType.toLatin1())
{
case 'L':
{
@@ -1148,7 +1148,7 @@
if (m_image.load(imageFileName))
{
m_imageLoaded = true;
- seqInfo("Loaded map image: '%s'", imageFileName.toAscii().data());
+ seqInfo("Loaded map image: '%s'", imageFileName.toLatin1().data());
}
seqInfo("Loaded SOE map: '%s'", filename);
@@ -1164,9 +1164,9 @@
const char* filename;
if (!fileName.isEmpty())
- filename = fileName.toAscii().data();
+ filename = fileName.toLatin1().data();
else
- filename = m_fileName.toAscii().data();
+ filename = m_fileName.toLatin1().data();
if ((fh = fopen(filename, "w")) == NULL)
{
@@ -1175,8 +1175,8 @@
}
// write out header info
- fprintf(fh, "%s,%s,%d,%d\n", m_zoneLongName.toAscii().data(),
- m_zoneShortName.toAscii().data(), m_size.width(), m_size.height());
+ fprintf(fh, "%s,%s,%d,%d\n", m_zoneLongName.toLatin1().data(),
+ m_zoneShortName.toLatin1().data(), m_size.width(), m_size.height());
// write out ZEM info if non-default
if (m_zoneZEM != 75)
@@ -1210,8 +1210,8 @@
// write out the start of the line info
fprintf (fh, "L,%s,%s,%d",
- currentLineL->name().toAscii().data(),
- currentLineL->colorName().toAscii().data(),
+ currentLineL->name().toLatin1().data(),
+ currentLineL->colorName().toLatin1().data(),
currentLineL->size());
// write out all the 2D points in the line
@@ -1235,8 +1235,8 @@
currentLineM = *mmit;
// write out the start of the line info
fprintf (fh, "M,%s,%s,%d",
- currentLineM->name().toAscii().data(),
- currentLineM->colorName().toAscii().data(),
+ currentLineM->name().toLatin1().data(),
+ currentLineM->colorName().toLatin1().data(),
currentLineM->size());
// write out all the 3D points in the line
@@ -1259,14 +1259,14 @@
if (!currentLoc->heightSet())
fprintf (fh, "P,%s,%s,%d,%d\n",
- currentLoc->name().toAscii().data(),
- currentLoc->colorName().toAscii().data(),
+ currentLoc->name().toLatin1().data(),
+ currentLoc->colorName().toLatin1().data(),
currentLoc->x(),
currentLoc->y());
else
fprintf (fh, "P,%s,%s,%d,%d,%d\n",
- currentLoc->name().toAscii().data(),
- currentLoc->colorName().toAscii().data(),
+ currentLoc->name().toLatin1().data(),
+ currentLoc->colorName().toLatin1().data(),
currentLoc->x(),
currentLoc->y(),
currentLoc->z());
@@ -1279,7 +1279,7 @@
MapAggro* currentAggro = *ait;
fprintf (fh, "A,%s,%d\n",
- currentAggro->name().toAscii().data(), currentAggro->range());
+ currentAggro->name().toLatin1().data(), currentAggro->range());
}
#ifdef DEBUGMAP
@@ -1302,9 +1302,9 @@
const char* filename;
if (!fileName.isEmpty())
- filename = fileName.toAscii().data();
+ filename = fileName.toLatin1().data();
else
- filename = m_fileName.toAscii().data();
+ filename = m_fileName.toLatin1().data();
if ((fh = fopen(filename, "w")) == NULL)
{
@@ -1392,7 +1392,7 @@
-float(currentLoc->x()), -float(currentLoc->y()),
float(currentLoc->z()),
color.red(), color.green(), color.blue(),
- name.toAscii().data());
+ name.toLatin1().data());
}
#ifdef DEBUGMAP
seqDebug("saveMap() - map '%s' saved with %d L lines, %d M lines, %d locations", filename,
Modified: showeq/branches/cn187_devel/src/mapicon.cpp
===================================================================
--- showeq/branches/cn187_devel/src/mapicon.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/mapicon.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -1103,7 +1103,7 @@
spawnNameText.sprintf("%2d: %s",
spawn->level(),
- spawn->name().toAscii().data());
+ spawn->name().toLatin1().data());
QFontMetrics fm(param.font());
int width = fm.width(spawnNameText);
@@ -1216,8 +1216,8 @@
QString spawnNameText;
spawnNameText.sprintf("sp:%s %s (%d)",
- sp->name().toAscii().data(),
- sp->last().toAscii().data(),
+ sp->name().toLatin1().data(),
+ sp->last().toLatin1().data(),
sp->count());
QFontMetrics fm(param.font());
Modified: showeq/branches/cn187_devel/src/messageshell.cpp
===================================================================
--- showeq/branches/cn187_devel/src/messageshell.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/messageshell.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -110,7 +110,7 @@
cmsg->sender,
cmsg->target,
cmsg->message,
- language_name(cmsg->language).toAscii().data()
+ language_name(cmsg->language).toLatin1().data()
);
}
else
@@ -118,7 +118,7 @@
tempStr.sprintf( "'%s' - %s {%s}",
cmsg->sender,
cmsg->message,
- language_name(cmsg->language).toAscii().data()
+ language_name(cmsg->language).toLatin1().data()
);
}
}
@@ -549,8 +549,8 @@
if (mem->param1 != 4)
tempStr.sprintf("%s%s', slot %d.",
- tempStr.toAscii().data(),
- spellName.toAscii().data(),
+ tempStr.toLatin1().data(),
+ spellName.toLatin1().data(),
mem->slotId);
else
@@ -598,8 +598,8 @@
spellName = spell_name(bcast->spellId);
tempStr.sprintf( "%s%s' - Casting time is %g Second%s",
- tempStr.toAscii().data(),
- spellName.toAscii().data(), casttime,
+ tempStr.toLatin1().data(),
+ spellName.toLatin1().data(), casttime,
casttime == 1 ? "" : "s");
m_messages->addMessage(MT_Spell, tempStr);
@@ -626,7 +626,7 @@
QString tempStr;
if (item != NULL)
tempStr.sprintf("%s(%d): %s",
- item->name().toAscii().data(), icast->spawnId, icast->message);
+ item->name().toLatin1().data(), icast->spawnId, icast->message);
else
tempStr.sprintf("spawn(%d): %s",
icast->spawnId, icast->message);
@@ -657,7 +657,7 @@
QString tempStr;
tempStr.sprintf("You begin casting %s. Current Target is %s(%d)",
- spellName.toAscii().data(), targetName.toAscii().data(),
+ spellName.toLatin1().data(), targetName.toLatin1().data(),
cast->targetId);
m_messages->addMessage(MT_Spell, tempStr);
@@ -742,7 +742,7 @@
const groupFollowStruct* gFollow = (const groupFollowStruct*)data;
QString tempStr;
- if(!strcmp(gFollow->invitee, m_player->name().toAscii().data()))
+ if(!strcmp(gFollow->invitee, m_player->name().toLatin1().data()))
tempStr = "Follow: You have joined the group";
else
tempStr.sprintf("Follow: %s has joined the group", gFollow->invitee);
@@ -872,7 +872,7 @@
const skillIncStruct* skilli = (const skillIncStruct*)data;
QString tempStr;
tempStr.sprintf("Skill: %s has increased (%d)",
- skill_name(skilli->skillId).toAscii().data(),
+ skill_name(skilli->skillId).toLatin1().data(),
skilli->value);
m_messages->addMessage(MT_Player, tempStr);
}
Modified: showeq/branches/cn187_devel/src/messagewindow.cpp
===================================================================
--- showeq/branches/cn187_devel/src/messagewindow.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/messagewindow.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -1151,8 +1151,8 @@
QString styleCaption = windowTitle() + " - " + typeName + " Style";
MessageTypeStyleDialog dialog(m_typeStyles[id],
m_defaultColor, m_defaultBGColor,
- styleCaption.toAscii().data(),
- this, styleCaption.toAscii().data());
+ styleCaption.toLatin1().data(),
+ this, styleCaption.toLatin1().data());
// popup the modal dialog
int result = dialog.exec();
Modified: showeq/branches/cn187_devel/src/packet.cpp
===================================================================
--- showeq/branches/cn187_devel/src/packet.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/packet.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -132,7 +132,7 @@
// load the world opcode db
if (!m_worldOPCodeDB->load(*m_packetTypeDB, worldopcodesxml))
- seqFatal("Error loading '%s'!", worldopcodesxml.toAscii().data());
+ seqFatal("Error loading '%s'!", worldopcodesxml.toLatin1().data());
#ifdef PACKET_OPCODEDB_DIAG
m_worldOPCodeDB->list();
@@ -145,7 +145,7 @@
// load the zone opcode db
if (!m_zoneOPCodeDB->load(*m_packetTypeDB, zoneopcodesxml))
- seqFatal("Error loading '%s'!", zoneopcodesxml.toAscii().data());
+ seqFatal("Error loading '%s'!", zoneopcodesxml.toLatin1().data());
#ifdef PACKET_OPCODEDB_DIAG
m_zoneOPCodeDB->list();
@@ -201,11 +201,11 @@
if (m_ip == "auto")
inet_aton (AUTOMATIC_CLIENT_IP, &ia);
- else if (inet_aton (m_ip.toAscii().data(), &ia) == 0)
+ else if (inet_aton (m_ip.toLatin1().data(), &ia) == 0)
{
- he = gethostbyname(m_ip.toAscii().data());
+ he = gethostbyname(m_ip.toLatin1().data());
if (!he)
- seqFatal("Invalid address; %s", m_ip.toAscii().data());
+ seqFatal("Invalid address; %s", m_ip.toLatin1().data());
memcpy (&ia, he->h_addr_list[0], he->h_length);
}
@@ -220,7 +220,7 @@
else
{
m_detectingClient = false;
- seqInfo("Listening for client: %s", m_ip.toAscii().data());
+ seqInfo("Listening for client: %s", m_ip.toLatin1().data());
}
}
@@ -229,12 +229,12 @@
// create the pcap object and initialize, either with MAC or IP
m_packetCapture = new PacketCaptureThread();
if (m_mac.length() == 17)
- m_packetCapture->start(m_device.toAscii().data(),
- m_mac.toAscii().data(),
+ m_packetCapture->start(m_device.toLatin1().data(),
+ m_mac.toLatin1().data(),
m_realtime, MAC_ADDRESS_TYPE );
else
- m_packetCapture->start(m_device.toAscii().data(),
- m_ip.toAscii().data(),
+ m_packetCapture->start(m_device.toLatin1().data(),
+ m_ip.toLatin1().data(),
m_realtime, IP_ADDRESS_TYPE );
emit filterChanged();
}
@@ -245,9 +245,9 @@
QString filename = pSEQPrefs->getPrefString("Filename", "VPacket");
- m_packetCapture->startOffline(filename.toAscii().data(), m_playbackSpeed);
+ m_packetCapture->startOffline(filename.toLatin1().data(), m_playbackSpeed);
seqInfo("Playing back packets from '%s' at speed '%d'",
- filename.toAscii().data(), m_playbackSpeed);
+ filename.toLatin1().data(), m_playbackSpeed);
}
// Flag session tracking properly on streams
@@ -285,9 +285,9 @@
if (m_recordPackets)
{
- m_vPacket = new VPacket(filename.toAscii().data(), 1, true);
+ m_vPacket = new VPacket(filename.toLatin1().data(), 1, true);
// Must appear befire next call to getPrefString, which uses a static string
- seqInfo("Recording packets to '%s' for future playback", filename.toAscii().data());
+ seqInfo("Recording packets to '%s' for future playback", filename.toLatin1().data());
if (!pSEQPrefs->getPrefString("FlushPackets", section).isNull())
m_vPacket->setFlushPacket(true);
@@ -294,11 +294,11 @@
}
else if (m_playbackPackets == PLAYBACK_FORMAT_SEQ)
{
- m_vPacket = new VPacket(filename.toAscii().data(), 1, false);
+ m_vPacket = new VPacket(filename.toLatin1().data(), 1, false);
m_vPacket->setCompressTime(pSEQPrefs->getPrefInt("CompressTime", section, 0));
m_vPacket->setPlaybackSpeed(m_playbackSpeed);
- seqInfo("Playing back packets from '%s' at speed '%d'", filename.toAscii().data(),
+ seqInfo("Playing back packets from '%s' at speed '%d'", filename.toLatin1().data(),
m_playbackSpeed);
}
@@ -611,7 +611,7 @@
m_client_addr = packet.getIPv4DestN();
m_detectingClient = false;
emit clientChanged(m_client_addr);
- seqInfo("Client Detected: %s", m_ip.toAscii().data());
+ seqInfo("Client Detected: %s", m_ip.toLatin1().data());
}
else if (m_detectingClient &&
(packet.getDestPort() >= WorldServerGeneralMinPort
@@ -621,7 +621,7 @@
m_client_addr = packet.getIPv4SourceN();
m_detectingClient = false;
emit clientChanged(m_client_addr);
- seqInfo("Client Detected: %s", m_ip.toAscii().data());
+ seqInfo("Client Detected: %s", m_ip.toLatin1().data());
}
// Dispatch based on known streams
@@ -690,7 +690,7 @@
(m_playbackPackets == PLAYBACK_OFF ||
m_playbackPackets == PLAYBACK_FORMAT_TCPDUMP))
{
- m_packetCapture->setFilter(m_device.toAscii().data(), m_ip.toAscii().data(),
+ m_packetCapture->setFilter(m_device.toLatin1().data(), m_ip.toLatin1().data(),
m_realtime, IP_ADDRESS_TYPE, 0, 0);
emit filterChanged();
}
@@ -710,7 +710,7 @@
emit clientPortLatched(m_clientPort);
seqInfo("EQPacket: SessionDisconnect detected, awaiting next zone session, pcap filter: EQ Client %s",
- m_ip.toAscii().data());
+ m_ip.toLatin1().data());
}
}
@@ -726,8 +726,8 @@
{
if (m_mac.length() == 17)
{
- m_packetCapture->setFilter(m_device.toAscii().data(),
- m_mac.toAscii().data(),
+ m_packetCapture->setFilter(m_device.toLatin1().data(),
+ m_mac.toLatin1().data(),
m_realtime,
MAC_ADDRESS_TYPE, 0,
m_clientPort);
@@ -735,8 +735,8 @@
}
else
{
- m_packetCapture->setFilter(m_device.toAscii().data(),
- m_ip.toAscii().data(),
+ m_packetCapture->setFilter(m_device.toLatin1().data(),
+ m_ip.toLatin1().data(),
m_realtime,
IP_ADDRESS_TYPE, 0,
m_clientPort);
@@ -748,12 +748,12 @@
if (m_mac.length() == 17)
{
seqInfo("EQPacket: SessionRequest detected, pcap filter: EQ Client %s, Client port %d. Server port %d",
- m_mac.toAscii().data(), m_clientPort, m_serverPort);
+ m_mac.toLatin1().data(), m_clientPort, m_serverPort);
}
else
{
seqInfo("EQPacket: SessionRequest detected, pcap filter: EQ Client %s, Client port %d. Server port %d",
- m_ip.toAscii().data(), m_clientPort, m_serverPort);
+ m_ip.toLatin1().data(), m_clientPort, m_serverPort);
}
emit clientPortLatched(m_clientPort);
@@ -917,18 +917,18 @@
{
m_ip = ip;
struct in_addr ia;
- inet_aton (m_ip.toAscii().data(), &ia);
+ inet_aton (m_ip.toLatin1().data(), &ia);
m_client_addr = ia.s_addr;
emit clientChanged(m_client_addr);
resetEQPacket();
- seqInfo("Listening for IP client: %s", m_ip.toAscii().data());
+ seqInfo("Listening for IP client: %s", m_ip.toLatin1().data());
if (m_playbackPackets == PLAYBACK_OFF ||
m_playbackPackets == PLAYBACK_FORMAT_TCPDUMP)
{
- m_packetCapture->setFilter(m_device.toAscii().data(),
- m_ip.toAscii().data(),
+ m_packetCapture->setFilter(m_device.toLatin1().data(),
+ m_ip.toLatin1().data(),
m_realtime,
IP_ADDRESS_TYPE, 0, 0);
emit filterChanged();
@@ -948,13 +948,13 @@
resetEQPacket();
- seqInfo("Listening for MAC client: %s", m_mac.toAscii().data());
+ seqInfo("Listening for MAC client: %s", m_mac.toLatin1().data());
if (m_playbackPackets == PLAYBACK_OFF ||
m_playbackPackets == PLAYBACK_FORMAT_TCPDUMP)
{
- m_packetCapture->setFilter(m_device.toAscii().data(),
- m_ip.toAscii().data(),
+ m_packetCapture->setFilter(m_device.toLatin1().data(),
+ m_ip.toLatin1().data(),
m_realtime,
IP_ADDRESS_TYPE, 0, 0);
emit filterChanged();
@@ -968,7 +968,7 @@
m_detectingClient = true;
m_ip = AUTOMATIC_CLIENT_IP;
struct in_addr ia;
- inet_aton (m_ip.toAscii().data(), &ia);
+ inet_aton (m_ip.toLatin1().data(), &ia);
m_client_addr = ia.s_addr;
emit clientChanged(m_client_addr);
@@ -979,7 +979,7 @@
if (m_playbackPackets == PLAYBACK_OFF ||
m_playbackPackets == PLAYBACK_FORMAT_TCPDUMP)
{
- m_packetCapture->setFilter(m_device.toAscii().data(), NULL,
+ m_packetCapture->setFilter(m_device.toLatin1().data(), NULL,
m_realtime,
DEFAULT_ADDRESS_TYPE, 0, 0);
emit filterChanged();
@@ -1011,11 +1011,11 @@
if (m_ip == "auto")
inet_aton (AUTOMATIC_CLIENT_IP, &ia);
- else if (inet_aton (m_ip.toAscii().data(), &ia) == 0)
+ else if (inet_aton (m_ip.toLatin1().data(), &ia) == 0)
{
- he = gethostbyname(m_ip.toAscii().data());
+ he = gethostbyname(m_ip.toLatin1().data());
if (!he)
- seqFatal("Invalid address; %s", m_ip.toAscii().data());
+ seqFatal("Invalid address; %s", m_ip.toLatin1().data());
memcpy (&ia, he->h_addr_list[0], he->h_length);
}
@@ -1030,7 +1030,7 @@
else
{
m_detectingClient = false;
- seqInfo("Listening for client: %s", m_ip.toAscii().data());
+ seqInfo("Listening for client: %s", m_ip.toLatin1().data());
}
}
@@ -1038,11 +1038,11 @@
// restart packet capture
if (m_mac.length() == 17)
- m_packetCapture->start(m_device.toAscii().data(),
- m_mac.toAscii().data(),
+ m_packetCapture->start(m_device.toLatin1().data(),
+ m_mac.toLatin1().data(),
m_realtime, MAC_ADDRESS_TYPE );
else
- m_packetCapture->start(m_device.toAscii().data(), m_ip.toAscii().data(),
+ m_packetCapture->start(m_device.toLatin1().data(), m_ip.toLatin1().data(),
m_realtime, IP_ADDRESS_TYPE );
emit filterChanged();
}
Modified: showeq/branches/cn187_devel/src/packetinfo.cpp
===================================================================
--- showeq/branches/cn187_devel/src/packetinfo.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/packetinfo.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -479,7 +479,7 @@
break;
seqInfo("\t\t\tdir=%d typename=%s size=%d sizechecktype=%d",
- currentPayload->dir(), currentPayload->typeName().toAscii().data(),
+ currentPayload->dir(), currentPayload->typeName().toLatin1().data(),
currentPayload->typeSize(), currentPayload->sizeCheckType());
}
}
@@ -691,7 +691,7 @@
if (!value.isEmpty())
{
- if (!m_currentPayload->setType(m_typeDB, value.toAscii().data()))
+ if (!m_currentPayload->setType(m_typeDB, value.toLatin1().data()))
seqWarn("Unknown payload typename '%s' for opcode '%04x'",
value.toLatin1().data(), m_currentOPCode->opcode());
}
Modified: showeq/branches/cn187_devel/src/packetlog.cpp
===================================================================
--- showeq/branches/cn187_devel/src/packetlog.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/packetlog.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -95,7 +95,7 @@
if (!open())
return;
- outputf ("%s\n", message.toAscii().data());
+ outputf ("%s\n", message.toLatin1().data());
flush();
}
@@ -300,13 +300,13 @@
uint16_t opcode, const QString& origPrefix)
{
if (!origPrefix.isEmpty())
- ::printf("%s ", origPrefix.toAscii().data());
+ ::printf("%s ", origPrefix.toLatin1().data());
else
::putchar('\n');
::printf("%s [Size: %lu]%s\n",
((dir == DIR_Server) ? "[Server->Client]" : "[Client->Server]"),
- len, opCodeToString(opcode).toAscii().data());
+ len, opCodeToString(opcode).toLatin1().data());
if (len)
{
@@ -415,7 +415,7 @@
}
seqInfo("OpCode monitoring ENABLED...");
- seqInfo("Using list:\t%s", monitoredOPCodes.toAscii().data());
+ seqInfo("Using list:\t%s", monitoredOPCodes.toLatin1().data());
QString qsCommaBuffer (""); /* Construct these outside the loop so we don't have to construct
@@ -483,7 +483,7 @@
#if 1 // ZBTEMP
seqDebug("opcode=%04x name='%s' dir=%d known=%d",
MonitoredOpCodeList [uiIndex] [0],
- MonitoredOpCodeAliasList [uiIndex].toAscii().data(),
+ MonitoredOpCodeAliasList [uiIndex].toLatin1().data(),
MonitoredOpCodeList [uiIndex] [1],
MonitoredOpCodeList [uiIndex] [2]);
#endif
Modified: showeq/branches/cn187_devel/src/packetstream.cpp
===================================================================
--- showeq/branches/cn187_devel/src/packetstream.cpp 2021-04-23 23:57:55 UTC (rev 1162)
+++ showeq/branches/cn187_devel/src/packetstream.cpp 2021-04-30 04:10:23 UTC (rev 1163)
@@ -118,9 +118,9 @@
if (!opcode)
{
seqDebug("connect2: Unknown opcode '%s' with payload type '%s'",
- opcodeName.toAscii().data(), payloadType);
+ opcodeName.toLatin1().data(), payloadType);
seqDebug("\tfor receiver '%s' of type '%s' to member '%s'",
- receiver->objectName().toAscii().data(),
+ receiver->objectName().toLatin1().data(),
receiver->metaObject()->className(), member);
return false;
}
@@ -145,11 +145,11 @@
if (!payload)
{
seqDebug("connect2: Warning! opcode '%s' has no matching payload.",
- opcodeName.toAscii().data());
+ opcodeName.toLatin1().data());
seqDebug("\tdir '%d' payload '%s' szt '%d'",
m_dir, payloadType, szt);
seqDebug("\tfor receiver '%s' of type '%s' to member '%s'",
- receiver->objectName().toAscii().data(),
+ receiver->objectName().toLatin1().data(),
receiver->metaObject()->className(), member);
return false;
@@ -164,12 +164,12 @@
// construct a name for the dispatch
QString dispatchName(256, '\0');
dispatchName.sprintf("PacketDispatch:%s:%s:%d:%s:%d",
- objectName().toAscii().data(), opcodeName.toAscii().data(),
- payload->dir(), payload->typeName().toAscii().data(),
+ objectName().toLatin1().data(), opcodeName.toLatin1().data(),
+ payload->dir(), payload->typeName().toLatin1().data(),
...
[truncated message content] |
|
From: <cn...@us...> - 2021-04-23 23:57:57
|
Revision: 1162
http://sourceforge.net/p/seq/svn/1162
Author: cn187
Date: 2021-04-23 23:57:55 +0000 (Fri, 23 Apr 2021)
Log Message:
-----------
Release 6.1.1
- Updated version to 6.1.1
- Support for EQ Patch 04/21/21
- Struct and opcode updates (Newby, cn187)
Modified Paths:
--------------
showeq/branches/cn187_devel/ChangeLog
showeq/branches/cn187_devel/conf/zoneopcodes.xml
showeq/branches/cn187_devel/configure.in
showeq/branches/cn187_devel/src/everquest.h
Modified: showeq/branches/cn187_devel/ChangeLog
===================================================================
--- showeq/branches/cn187_devel/ChangeLog 2021-04-22 14:45:46 UTC (rev 1161)
+++ showeq/branches/cn187_devel/ChangeLog 2021-04-23 23:57:55 UTC (rev 1162)
@@ -1,3 +1,9 @@
+cn187 (04/22/21)
+----------------
+- Updated version to 6.1.1
+- Support for EQ patch 04/21/21
+- Opcode and struct updates (Newby, cn187)
+
cn187 (03/10/21)
----------------
- Updated version to 6.1.0.0
Modified: showeq/branches/cn187_devel/conf/zoneopcodes.xml
===================================================================
--- showeq/branches/cn187_devel/conf/zoneopcodes.xml 2021-04-22 14:45:46 UTC (rev 1161)
+++ showeq/branches/cn187_devel/conf/zoneopcodes.xml 2021-04-23 23:57:55 UTC (rev 1162)
@@ -3,127 +3,127 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="5983" name="OP_PlayerProfile" updated="03/10/21">
+ <opcode id="73c6" name="OP_PlayerProfile" updated="04/21/21">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="0ed0" name="OP_ZoneEntry" updated="03/10/21">
+ <opcode id="5982" name="OP_ZoneEntry" updated="04/21/21">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="23bd" name="OP_TimeOfDay" updated="03/10/21">
+ <opcode id="5962" name="OP_TimeOfDay" updated="04/21/21">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2d9e" name="OP_NewZone" updated="03/10/21">
+ <opcode id="476e" name="OP_NewZone" updated="04/21/21">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7e49" name="OP_SpawnDoor" updated="03/10/21">
+ <opcode id="348a" name="OP_SpawnDoor" updated="04/21/21">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="4351" name="OP_GroundSpawn" updated="03/10/21">
+ <opcode id="6479" name="OP_GroundSpawn" updated="04/21/21">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="1857" name="OP_SendZonePoints" updated="03/10/21">
+ <opcode id="600d" name="OP_SendZonePoints" updated="04/21/21">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="01cf" name="OP_AAExpUpdate" updated="03/10/21">
+ <opcode id="38f8" name="OP_AAExpUpdate" updated="04/21/21">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6f2b" name="OP_ExpUpdate" updated="03/10/21">
+ <opcode id="44af" name="OP_ExpUpdate" updated="04/21/21">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6f37" name="OP_GuildMOTD" updated="03/10/21">
+ <opcode id="72c8" name="OP_GuildMOTD" updated="04/21/21">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="2c42" name="OP_ClientUpdate" updated="03/10/21">
+ <opcode id="3f4f" name="OP_ClientUpdate" updated="04/21/21">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3b1b" name="OP_NpcMoveUpdate" updated="03/10/21">
+ <opcode id="19ad" name="OP_NpcMoveUpdate" updated="04/21/21">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="47e4" name="OP_MobUpdate" updated="03/10/21">
+ <opcode id="6284" name="OP_MobUpdate" updated="04/21/21">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="3180" name="OP_DeleteSpawn" updated="03/10/21">
+ <opcode id="6241" name="OP_DeleteSpawn" updated="04/21/21">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4513" name="OP_RemoveSpawn" updated="03/10/21">
+ <opcode id="4732" name="OP_RemoveSpawn" updated="04/21/21">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="66d5" name="OP_Death" updated="03/10/21">
+ <opcode id="19a8" name="OP_Death" updated="04/21/21">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="01dd" name="OP_WearChange" updated="03/10/21">
+ <opcode id="7d1b" name="OP_WearChange" updated="04/21/21">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1360" name="OP_SpawnAppearance" updated="03/10/21">
+ <opcode id="26cb" name="OP_SpawnAppearance" updated="04/21/21">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2ceb" name="OP_Stamina" updated="03/10/21">
+ <opcode id="1e83" name="OP_Stamina" updated="04/21/21">
<comment>Server updating on hunger/thirst</comment>
<payload dir="server" typename="staminaStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0221" name="OP_HPUpdate" updated="03/10/21">
+ <opcode id="5a2a" name="OP_HPUpdate" updated="04/21/21">
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0a4a" name="OP_GuildMemberUpdate" updated="03/10/21">
+ <opcode id="6427" name="OP_GuildMemberUpdate" updated="04/21/21">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="3645" name="OP_ClickObject" updated="03/10/21">
+ <opcode id="51f2" name="OP_ClickObject" updated="04/21/21">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="269c" name="OP_Action" updated="03/10/21">
+ <opcode id="2c05" name="OP_Action" updated="04/21/21">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7880" name="OP_Action2" updated="03/10/21">
+ <opcode id="217b" name="OP_Action2" updated="04/21/21">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="35f7" name="OP_Consider" updated="03/10/21">
+ <opcode id="29ca" name="OP_Consider" updated="04/21/21">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="77ea" name="OP_TargetMouse" updated="03/10/21">
+ <opcode id="0621" name="OP_TargetMouse" updated="04/21/21">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
- <opcode id="360a" name="OP_SpawnRename" updated="03/10/21">
+ <opcode id="6223" name="OP_SpawnRename" updated="04/21/21">
<comment>Spawns getting renamed after initial NewSpawn</comment>
<payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3a49" name="OP_Illusion" updated="03/10/21">
+ <opcode id="50d9" name="OP_Illusion" updated="04/21/21">
<comment>Spawn being illusioned (changing forms)</comment>
<payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1886" name="OP_Shroud" updated="03/10/21">
+ <opcode id="4119" name="OP_Shroud" updated="04/21/21">
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="21c7" name="OP_ZoneChange" updated="03/10/21">
+ <opcode id="35da" name="OP_ZoneChange" updated="04/21/21">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -163,55 +163,55 @@
<comment>Group leader change</comment>
<payload dir="server" typename="groupLeaderChangeStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3e30" name="OP_Buff" updated="03/10/21">
+ <opcode id="22bc" name="OP_Buff" updated="04/21/21">
<comment>old BuffDropCode</comment>
<payload dir="both" typename="buffStruct" sizechecktype="match"/>
</opcode>
- <opcode id="52ee" name="OP_BeginCast" updated="03/10/21">
+ <opcode id="3dbe" name="OP_BeginCast" updated="04/21/21">
<comment>BeginCastCode</comment>
<payload dir="both" typename="beginCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4bb2" name="OP_CastSpell" updated="03/10/21">
+ <opcode id="5a44" name="OP_CastSpell" updated="04/21/21">
<comment>StartCastCode</comment>
<payload dir="both" typename="startCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2e32" name="OP_SwapSpell" updated="03/10/21">
+ <opcode id="32ee" name="OP_SwapSpell" updated="04/21/21">
<comment>TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5336" name="OP_MemorizeSpell" updated="03/10/21">
+ <opcode id="5c57" name="OP_MemorizeSpell" updated="04/21/21">
<comment>MemSpellCode</comment>
<payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
</opcode>
- <opcode id="19be" name="OP_InspectAnswer" updated="03/10/21">
+ <opcode id="6db3" name="OP_InspectAnswer" updated="04/21/21">
<comment>InspectDataCode</comment>
<payload dir="both" typename="inspectDataStruct" sizechecktype="match"/>
</opcode>
- <opcode id="01dc" name="OP_Emote" updated="03/10/21">
+ <opcode id="6265" name="OP_Emote" updated="04/21/21">
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="56ec" name="OP_SimpleMessage" updated="03/10/21">
+ <opcode id="11e0" name="OP_SimpleMessage" updated="04/21/21">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5881" name="OP_FormattedMessage" updated="03/10/21">
+ <opcode id="4e52" name="OP_FormattedMessage" updated="04/21/21">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="4e14" name="OP_CommonMessage" updated="03/10/21">
+ <opcode id="6f00" name="OP_CommonMessage" updated="04/21/21">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="7a84" name="OP_SpecialMesg" updated="03/10/21">
+ <opcode id="165c" name="OP_SpecialMesg" updated="04/21/21">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="5054" name="OP_RandomReq" updated="03/10/21">
+ <opcode id="260d" name="OP_RandomReq" updated="04/21/21">
<comment>RandomReqCode</comment>
<payload dir="client" typename="randomReqStruct" sizechecktype="match"/>
</opcode>
- <opcode id="686a" name="OP_RandomReply" updated="03/10/21">
+ <opcode id="5b74" name="OP_RandomReply" updated="04/21/21">
<comment>RandomCode</comment>
<payload dir="server" typename="randomStruct" sizechecktype="match"/>
</opcode>
@@ -223,16 +223,16 @@
<comment>Server replying with deny information after /deny</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5f03" name="OP_ManaChange" updated="03/10/21">
+ <opcode id="7d0f" name="OP_ManaChange" updated="04/21/21">
<comment>Mana change. Bards send this up with no size. Casters receive this for mana updates.</comment>
<payload dir="server" typename="manaDecrementStruct" sizechecktype="match"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="0a42" name="OP_BazaarSearchRequest" updated="03/10/21">
+ <opcode id="03d6" name="OP_BazaarSearchRequest" updated="04/21/21">
<comment>Bazaar search request </comment>
<payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/>
</opcode>
- <opcode id="521b" name="OP_BazaarSearchResponse" updated="03/10/21">
+ <opcode id="32e1" name="OP_BazaarSearchResponse" updated="04/21/21">
<comment>Bazaar search Response - Struct incorrect </comment>
<payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/>
</opcode>
@@ -240,19 +240,19 @@
<comment>MoneyOnCorpseCode</comment>
<payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1d16" name="OP_SkillUpdate" updated="03/10/21">
+ <opcode id="0eaa" name="OP_SkillUpdate" updated="04/21/21">
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="118a" name="OP_LevelUpdate" updated="03/10/21">
+ <opcode id="494d" name="OP_LevelUpdate" updated="04/21/21">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6632" name="OP_DzSwitchInfo" updated="03/10/21">
+ <opcode id="3382" name="OP_DzSwitchInfo" updated="04/21/21">
<comment>Expedition compass etc</comment>
<payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/>
</opcode>
- <opcode id="3b9e" name="OP_DzInfo" updated="03/10/21">
+ <opcode id="784b" name="OP_DzInfo" updated="04/21/21">
<comment>Expedition Information</comment>
<payload dir="server" typename="dzInfo" sizechecktype="match"/>
</opcode>
@@ -260,7 +260,7 @@
<comment>Environmental Damage</comment>
<payload dir="client" typename="environmentDamageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5d70" name="OP_SetRunMode" updated="03/10/21">
+ <opcode id="358d" name="OP_SetRunMode" updated="04/21/21">
<comment>old cRunToggleCode</comment>
<payload dir="client" typename="cRunToggleStruct" sizechecktype="match"/>
</opcode>
@@ -307,15 +307,15 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="3df2" name="OP_GuildMemberList" updated="03/10/21">
+ <opcode id="562f" name="OP_GuildMemberList" updated="04/21/21">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4f72" name="OP_ManaUpdate" updated="03/10/21">
+ <opcode id="3a2e" name="OP_ManaUpdate" updated="04/21/21">
<comment>Mana Update opcode - 10 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="1137" name="OP_EndUpdate" updated="03/10/21">
+ <opcode id="3d4c" name="OP_EndUpdate" updated="04/21/21">
<comment>Endurance Update opcode - 10 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4f4b" name="OP_ExpandedGuildInfo" updated="03/10/21">
+ <opcode id="5bbe" name="OP_ExpandedGuildInfo" updated="04/21/21">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -535,11 +535,11 @@
<comment>Listing of all guilds. Can be triggered by /lfg search?</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="616e" name="OP_GuildsInZoneList" updated="03/10/21">
+ <opcode id="4697" name="OP_GuildsInZoneList" updated="04/21/21">
<comment>Listing of guild names present in the current zone. Generally seen on zoning</comment>
<payload dir="server" typename="guildsInZoneListStruct" sizechecktype="none"/>
</opcode>
- <opcode id="5b4e" name="OP_NewGuildInZone" updated="03/10/21">
+ <opcode id="2a7c" name="OP_NewGuildInZone" updated="04/21/21">
<comment>An additional guild name has appeared in the current zone. Seen when a guilded player enters the current zone</comment>
<payload dir="server" typename="newGuildInZoneStruct" sizechecktype="none"/>
</opcode>
@@ -595,7 +595,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="10c6" name="OP_Find" updated="03/10/21">
+ <opcode id="6765" name="OP_Find" updated="04/21/21">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
Modified: showeq/branches/cn187_devel/configure.in
===================================================================
--- showeq/branches/cn187_devel/configure.in 2021-04-22 14:45:46 UTC (rev 1161)
+++ showeq/branches/cn187_devel/configure.in 2021-04-23 23:57:55 UTC (rev 1162)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.1.0.0)
+AC_INIT(showeq, 6.1.1)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
Modified: showeq/branches/cn187_devel/src/everquest.h
===================================================================
--- showeq/branches/cn187_devel/src/everquest.h 2021-04-22 14:45:46 UTC (rev 1161)
+++ showeq/branches/cn187_devel/src/everquest.h 2021-04-23 23:57:55 UTC (rev 1162)
@@ -1112,24 +1112,25 @@
{
struct
{
+ signed z:19; // z coord (3rd loc value)
+ signed animation:10; // current animation
+ unsigned padding00:3;
- unsigned heading:12; // heading
- signed deltaX:13; // change in x
- unsigned padding00:7;
+ signed deltaZ:13; // change in z
+ signed deltaHeading:10; // change in heading
+ unsigned padding01:9;
signed deltaY:13; // change in y
signed y:19; // y coord (2nd loc value)
unsigned pitch:12; // pitch (up/down heading)
- signed animation:10; // current animation
- signed deltaHeading:10; // change in heading
+ signed x:19; // x coord (1st loc value)
+ unsigned padding03:1;
- signed z:19; // z coord (3rd loc value)
- unsigned padding03:13;
+ signed deltaX:13; // change in x
+ unsigned heading:12; // heading
+ unsigned padding04:7;
- signed x:19; // x coord (1st loc value)
- signed deltaZ:13; // change in z
-
};
int32_t posData[5];
};
@@ -2391,28 +2392,30 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/
- unsigned heading:12; // heading
- signed deltaX:13; // change in x
- unsigned padding00:7;
+ signed z:19; // z coord (3rd loc value)
+ signed animation:10; // current animation
+ unsigned padding00:3;
/*0008*/
+ signed deltaZ:13; // change in z
+ signed deltaHeading:10; // change in heading
+ unsigned padding01:9;
+/*0012*/
signed deltaY:13; // change in y
signed y:19; // y coord (2nd loc value)
-/*0012*/
+/*0016*/
unsigned pitch:12; // pitch (up/down heading)
- signed animation:10; // current animation
- signed deltaHeading:10; // change in heading
-/*0016*/
- signed z:19; // z coord (3rd loc value)
- unsigned padding03:13;
+ signed x:19; // x coord (1st loc value)
+ unsigned padding03:1;
/*0020*/
- signed x:19; // x coord (1st loc value)
- signed deltaZ:13; // change in z
+ signed deltaX:13; // change in x
+ unsigned heading:12; // heading
+ unsigned padding04:7;
/*0024*/
};
/*
** Self Position Update
-** Length: 46 Octets
+** Length: 42 Octets
** OpCode: PlayerPosCode
*/
struct playerSelfPosStruct
@@ -2421,30 +2424,28 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
- float z; // z coord (3rd loc value)
+ signed animation:10; // current animation
+ unsigned heading:12; // heading
+ unsigned padding00:10;
/*0010*/
- float x; // x coord (1st loc value)
+ float y; // y coord (2nd loc value)
/*0014*/
+ float deltaY; // change in y
+/*0018*/
signed deltaHeading:10; // change in heading
- unsigned padding02:22;
-/*0018*/
+ unsigned padding03:22;
+/*0022*/
float deltaX; // change in x
-/*0022*/
+/*0026*/
unsigned pitch:12; // pitch (up/down heading)
- unsigned padding04:20;
-/*0026*/
- float y; // y coord (2nd loc value)
+ unsigned padding05:20;
/*0030*/
- float deltaY; // change in y
+ float deltaZ; // change in z
/*0034*/
- signed animation:10; // current animation
- unsigned padding07:22;
+ float x; // x coord (1st loc value)
/*0038*/
- float deltaZ; // change in z
+ float z; // z coord (3rd loc value)
/*0042*/
- unsigned heading:12; // heading
- unsigned padding09:20;
-/*0046*/
};
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-04-22 14:45:52
|
Revision: 1161
http://sourceforge.net/p/seq/svn/1161
Author: cn187
Date: 2021-04-22 14:45:46 +0000 (Thu, 22 Apr 2021)
Log Message:
-----------
Tag for release 6.1.1
Added Paths:
-----------
showeq/tags/v6_1_1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
