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-12-08 04:43:49
|
Revision: 1235
http://sourceforge.net/p/seq/svn/1235
Author: cn187
Date: 2021-12-08 04:43:46 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Tag for release 6.2.0.1
Added Paths:
-----------
showeq/tags/v6_2_0_1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-08 04:40:26
|
Revision: 1234
http://sourceforge.net/p/seq/svn/1234
Author: cn187
Date: 2021-12-08 04:40:24 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Release 6.2.0.1
- Update to version 6.2.0.1
- Add zones for Terror of Luclin release (Thanks Newby)
- Add races for Terror of Luclin release (Thanks llaffer)
Modified Paths:
--------------
showeq/trunk/ChangeLog
showeq/trunk/configure.in
Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog 2021-12-08 04:30:33 UTC (rev 1233)
+++ showeq/trunk/ChangeLog 2021-12-08 04:40:24 UTC (rev 1234)
@@ -1,5 +1,11 @@
cn187 (12/07/21)
----------------
+- Update to version 6.2.0.1
+- Add zones for Terror of Luclin release (Thanks Newby)
+- Add races for Terror of Luclin release (Thanks llaffer)
+
+cn187 (12/07/21)
+----------------
- Update to version 6.2.0
- Support for EQ patch 12/07/21
- Opcode and struct changes
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2021-12-08 04:30:33 UTC (rev 1233)
+++ showeq/trunk/configure.in 2021-12-08 04:40:24 UTC (rev 1234)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.2.0)
+AC_INIT(showeq, 6.2.0.1)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-08 04:30:37
|
Revision: 1233
http://sourceforge.net/p/seq/svn/1233
Author: cn187
Date: 2021-12-08 04:30:33 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Fix zone name typo
Modified Paths:
--------------
showeq/branches/cn187_devel/src/zones.h
Modified: showeq/branches/cn187_devel/src/zones.h
===================================================================
--- showeq/branches/cn187_devel/src/zones.h 2021-12-08 04:29:55 UTC (rev 1232)
+++ showeq/branches/cn187_devel/src/zones.h 2021-12-08 04:30:33 UTC (rev 1233)
@@ -869,7 +869,7 @@
{ "vexthaltwo", "Vex Thal" }, // 846
{ "shadowvalley", "Shadow Valley" }, // 847
{ "basilica", "Basilica of Adumbration" }, // 848
-{ "bloodfals", "Bloodfalls" }, // 849
+{ "bloodfalls", "Bloodfalls" }, // 849
{ NULL, NULL }, // 850
{ NULL, NULL }, // 851
{ NULL, NULL }, // 852
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-08 04:29:56
|
Revision: 1232
http://sourceforge.net/p/seq/svn/1232
Author: cn187
Date: 2021-12-08 04:29:55 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Fix zone name typo
Modified Paths:
--------------
showeq/trunk/src/zones.h
Modified: showeq/trunk/src/zones.h
===================================================================
--- showeq/trunk/src/zones.h 2021-12-08 04:18:30 UTC (rev 1231)
+++ showeq/trunk/src/zones.h 2021-12-08 04:29:55 UTC (rev 1232)
@@ -869,7 +869,7 @@
{ "vexthaltwo", "Vex Thal" }, // 846
{ "shadowvalley", "Shadow Valley" }, // 847
{ "basilica", "Basilica of Adumbration" }, // 848
-{ "bloodfals", "Bloodfalls" }, // 849
+{ "bloodfalls", "Bloodfalls" }, // 849
{ NULL, NULL }, // 850
{ NULL, NULL }, // 851
{ NULL, NULL }, // 852
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-08 04:18:34
|
Revision: 1231
http://sourceforge.net/p/seq/svn/1231
Author: cn187
Date: 2021-12-08 04:18:30 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Update zones for Terror of Luclin
Update zones.h for new expansion. Thanks Newby!
Modified Paths:
--------------
showeq/branches/cn187_devel/src/zones.h
Modified: showeq/branches/cn187_devel/src/zones.h
===================================================================
--- showeq/branches/cn187_devel/src/zones.h 2021-12-08 04:18:24 UTC (rev 1230)
+++ showeq/branches/cn187_devel/src/zones.h 2021-12-08 04:18:30 UTC (rev 1231)
@@ -863,13 +863,13 @@
{ NULL, NULL }, // 840
{ NULL, NULL }, // 841
{ NULL, NULL }, // 842
-{ NULL, NULL }, // 843
-{ NULL, NULL }, // 844
-{ NULL, NULL }, // 845
-{ NULL, NULL }, // 846
-{ NULL, NULL }, // 847
-{ NULL, NULL }, // 848
-{ NULL, NULL }, // 849
+{ "maidentwo", "The Maiden's Eye" }, // 843
+{ "umbraltwo", "Umbral Plains" }, // 844
+{ "akhevatwo", "Ka Vethan" }, // 845
+{ "vexthaltwo", "Vex Thal" }, // 846
+{ "shadowvalley", "Shadow Valley" }, // 847
+{ "basilica", "Basilica of Adumbration" }, // 848
+{ "bloodfals", "Bloodfalls" }, // 849
{ NULL, NULL }, // 850
{ NULL, NULL }, // 851
{ NULL, NULL }, // 852
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-08 04:18:25
|
Revision: 1230
http://sourceforge.net/p/seq/svn/1230
Author: cn187
Date: 2021-12-08 04:18:24 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Update races for Terror of Luclin
Update races.h with new expansion races. Thanks llaffer
Modified Paths:
--------------
showeq/branches/cn187_devel/src/races.h
Modified: showeq/branches/cn187_devel/src/races.h
===================================================================
--- showeq/branches/cn187_devel/src/races.h 2021-12-08 04:16:00 UTC (rev 1229)
+++ showeq/branches/cn187_devel/src/races.h 2021-12-08 04:18:24 UTC (rev 1230)
@@ -909,4 +909,19 @@
"Rabbit Mount", // 885
"Dragon", // 886
"Dragon", // 887
+ "Primal Vampire", // 888
+ "Blood Beast", // 889
+ "Tekuel", // 890
+ "Tegi", // 891
+ "Netherbian", // 892
+ "Zelniak", // 893
+ "Zelniak", // 894
+ "Shade", // 895
+ "Goranga", // 896
+ "Owlbear", // 897
+ "Owlbear Mount", // 898
+ "Blood Tick", // 899
+ "Blood Bag", // 900
+ "Stonegrabber", // 901
+ "Riding Dog", // 902
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-08 04:16:03
|
Revision: 1229
http://sourceforge.net/p/seq/svn/1229
Author: cn187
Date: 2021-12-08 04:16:00 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Update zones for Terror of Luclin
Update zones.h for new expansion. Thanks newby!
Modified Paths:
--------------
showeq/trunk/src/zones.h
Modified: showeq/trunk/src/zones.h
===================================================================
--- showeq/trunk/src/zones.h 2021-12-08 04:15:52 UTC (rev 1228)
+++ showeq/trunk/src/zones.h 2021-12-08 04:16:00 UTC (rev 1229)
@@ -863,13 +863,13 @@
{ NULL, NULL }, // 840
{ NULL, NULL }, // 841
{ NULL, NULL }, // 842
-{ NULL, NULL }, // 843
-{ NULL, NULL }, // 844
-{ NULL, NULL }, // 845
-{ NULL, NULL }, // 846
-{ NULL, NULL }, // 847
-{ NULL, NULL }, // 848
-{ NULL, NULL }, // 849
+{ "maidentwo", "The Maiden's Eye" }, // 843
+{ "umbraltwo", "Umbral Plains" }, // 844
+{ "akhevatwo", "Ka Vethan" }, // 845
+{ "vexthaltwo", "Vex Thal" }, // 846
+{ "shadowvalley", "Shadow Valley" }, // 847
+{ "basilica", "Basilica of Adumbration" }, // 848
+{ "bloodfals", "Bloodfalls" }, // 849
{ NULL, NULL }, // 850
{ NULL, NULL }, // 851
{ NULL, NULL }, // 852
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-08 04:15:55
|
Revision: 1228
http://sourceforge.net/p/seq/svn/1228
Author: cn187
Date: 2021-12-08 04:15:52 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Update races for Terror of Luclin
Update races.h with new expansion races. Thanks llaffer
Modified Paths:
--------------
showeq/trunk/src/races.h
Modified: showeq/trunk/src/races.h
===================================================================
--- showeq/trunk/src/races.h 2021-12-08 04:09:11 UTC (rev 1227)
+++ showeq/trunk/src/races.h 2021-12-08 04:15:52 UTC (rev 1228)
@@ -909,4 +909,19 @@
"Rabbit Mount", // 885
"Dragon", // 886
"Dragon", // 887
+ "Primal Vampire", // 888
+ "Blood Beast", // 889
+ "Tekuel", // 890
+ "Tegi", // 891
+ "Netherbian", // 892
+ "Zelniak", // 893
+ "Zelniak", // 894
+ "Shade", // 895
+ "Goranga", // 896
+ "Owlbear", // 897
+ "Owlbear Mount", // 898
+ "Blood Tick", // 899
+ "Blood Bag", // 900
+ "Stonegrabber", // 901
+ "Riding Dog", // 902
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-08 04:09:13
|
Revision: 1227
http://sourceforge.net/p/seq/svn/1227
Author: cn187
Date: 2021-12-08 04:09:11 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Honor depth filtered setting when drawing map locations
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-12-07 21:10:45 UTC (rev 1226)
+++ showeq/branches/cn187_devel/src/mapcore.cpp 2021-12-08 04:09:11 UTC (rev 1227)
@@ -2238,6 +2238,10 @@
{
MapLocation* currentLoc = *lit;
+ if (param.mapLineStyle() == tMap_DepthFiltered && currentLoc->heightSet() &&
+ !inRoom(param.playerHeadRoom(), param.playerFloorRoom(), currentLoc->z()))
+ continue; // outside of range, continue to the next location
+
// set the color
QColor color(currentLoc->color());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-07 21:10:47
|
Revision: 1226
http://sourceforge.net/p/seq/svn/1226
Author: cn187
Date: 2021-12-07 21:10:45 +0000 (Tue, 07 Dec 2021)
Log Message:
-----------
Release 6.2.0
- Update to version 6.2.0
- Support for EQ patch 12/07/21
- Opcode and struct changes
- Add support for building with Qt5 [EXPERIMENTAL]
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-12-07 20:43:51 UTC (rev 1225)
+++ showeq/branches/cn187_devel/ChangeLog 2021-12-07 21:10:45 UTC (rev 1226)
@@ -1,3 +1,10 @@
+cn187 (12/07/21)
+----------------
+- Update to version 6.2.0
+- Support for EQ patch 12/07/21
+- Opcode and struct changes
+- Add support for building with Qt5 [EXPERIMENTAL]
+
cn187 (11/17/21)
----------------
- Update to version 6.1.8
Modified: showeq/branches/cn187_devel/conf/zoneopcodes.xml
===================================================================
--- showeq/branches/cn187_devel/conf/zoneopcodes.xml 2021-12-07 20:43:51 UTC (rev 1225)
+++ showeq/branches/cn187_devel/conf/zoneopcodes.xml 2021-12-07 21:10:45 UTC (rev 1226)
@@ -3,127 +3,127 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="2e70" name="OP_PlayerProfile" updated="11/17/21">
+ <opcode id="176e" name="OP_PlayerProfile" updated="12/07/21">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="2597" name="OP_ZoneEntry" updated="11/17/21">
+ <opcode id="19fe" name="OP_ZoneEntry" updated="12/07/21">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="379c" name="OP_TimeOfDay" updated="11/17/21">
+ <opcode id="1f03" name="OP_TimeOfDay" updated="12/07/21">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="647a" name="OP_NewZone" updated="11/17/21">
+ <opcode id="7cf3" name="OP_NewZone" updated="12/07/21">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7714" name="OP_SpawnDoor" updated="11/17/21">
+ <opcode id="4699" name="OP_SpawnDoor" updated="12/07/21">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="604a" name="OP_GroundSpawn" updated="11/17/21">
+ <opcode id="1081" name="OP_GroundSpawn" updated="12/07/21">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="503e" name="OP_SendZonePoints" updated="11/17/21">
+ <opcode id="0893" name="OP_SendZonePoints" updated="12/07/21">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="2b2d" name="OP_AAExpUpdate" updated="11/17/21">
+ <opcode id="78d5" name="OP_AAExpUpdate" updated="12/07/21">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="23eb" name="OP_ExpUpdate" updated="11/17/21">
+ <opcode id="1408" name="OP_ExpUpdate" updated="12/07/21">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1ae6" name="OP_GuildMOTD" updated="11/17/21">
+ <opcode id="40a0" name="OP_GuildMOTD" updated="12/07/21">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="4b86" name="OP_ClientUpdate" updated="11/17/21">
+ <opcode id="52e6" name="OP_ClientUpdate" updated="12/07/21">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3c74" name="OP_NpcMoveUpdate" updated="11/17/21">
+ <opcode id="4262" name="OP_NpcMoveUpdate" updated="12/07/21">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="3dcc" name="OP_MobUpdate" updated="11/17/21">
+ <opcode id="1dd0" name="OP_MobUpdate" updated="12/07/21">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="7a64" name="OP_DeleteSpawn" updated="11/17/21">
+ <opcode id="42ca" name="OP_DeleteSpawn" updated="12/07/21">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="66b5" name="OP_RemoveSpawn" updated="11/17/21">
+ <opcode id="6f7b" name="OP_RemoveSpawn" updated="12/07/21">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="72fb" name="OP_Death" updated="11/17/21">
+ <opcode id="3e63" name="OP_Death" updated="12/07/21">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="698b" name="OP_WearChange" updated="11/17/21">
+ <opcode id="35a0" name="OP_WearChange" updated="12/07/21">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0f40" name="OP_SpawnAppearance" updated="11/17/21">
+ <opcode id="3494" name="OP_SpawnAppearance" updated="12/07/21">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
- <opcode id="48c0" name="OP_Stamina" updated="11/17/21">
+ <opcode id="2d04" name="OP_Stamina" updated="12/07/21">
<comment>Server updating on hunger/thirst</comment>
<payload dir="server" typename="staminaStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6e70" name="OP_HPUpdate" updated="11/17/21">
+ <opcode id="5c2d" name="OP_HPUpdate" updated="12/07/21">
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1562" name="OP_GuildMemberUpdate" updated="11/17/21">
+ <opcode id="1c72" name="OP_GuildMemberUpdate" updated="12/07/21">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="1b19" name="OP_ClickObject" updated="11/17/21">
+ <opcode id="2007" name="OP_ClickObject" updated="12/07/21">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="387b" name="OP_Action" updated="11/17/21">
+ <opcode id="2d73" name="OP_Action" updated="12/07/21">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6207" name="OP_Action2" updated="11/17/21">
+ <opcode id="446a" name="OP_Action2" updated="12/07/21">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="5916" name="OP_Consider" updated="11/17/21">
+ <opcode id="736b" name="OP_Consider" updated="12/07/21">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6dc7" name="OP_TargetMouse" updated="11/17/21">
+ <opcode id="4552" name="OP_TargetMouse" updated="12/07/21">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5bea" name="OP_SpawnRename" updated="11/17/21">
+ <opcode id="72e9" name="OP_SpawnRename" updated="12/07/21">
<comment>Spawns getting renamed after initial NewSpawn</comment>
<payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3a70" name="OP_Illusion" updated="11/17/21">
+ <opcode id="6c8a" name="OP_Illusion" updated="12/07/21">
<comment>Spawn being illusioned (changing forms)</comment>
<payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5f8c" name="OP_Shroud" updated="11/17/21">
+ <opcode id="6106" name="OP_Shroud" updated="12/07/21">
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="746c" name="OP_ZoneChange" updated="11/17/21">
+ <opcode id="7d9b" name="OP_ZoneChange" updated="12/07/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="6fd7" name="OP_Buff" updated="11/17/21">
+ <opcode id="34b9" name="OP_Buff" updated="12/07/21">
<comment>old BuffDropCode</comment>
<payload dir="both" typename="buffStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0933" name="OP_BeginCast" updated="11/17/21">
+ <opcode id="53c6" name="OP_BeginCast" updated="12/07/21">
<comment>BeginCastCode</comment>
<payload dir="both" typename="beginCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5e71" name="OP_CastSpell" updated="11/17/21">
+ <opcode id="47b1" name="OP_CastSpell" updated="12/07/21">
<comment>StartCastCode</comment>
<payload dir="both" typename="startCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6a5a" name="OP_SwapSpell" updated="11/17/21">
+ <opcode id="0186" name="OP_SwapSpell" updated="12/07/21">
<comment>TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3a26" name="OP_MemorizeSpell" updated="11/17/21">
+ <opcode id="3ec5" name="OP_MemorizeSpell" updated="12/07/21">
<comment>MemSpellCode</comment>
<payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4b23" name="OP_InspectAnswer" updated="11/17/21">
+ <opcode id="2c56" name="OP_InspectAnswer" updated="12/07/21">
<comment>InspectDataCode</comment>
<payload dir="both" typename="inspectDataStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4b78" name="OP_Emote" updated="11/17/21">
+ <opcode id="79d6" name="OP_Emote" updated="12/07/21">
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="7299" name="OP_SimpleMessage" updated="11/17/21">
+ <opcode id="384d" name="OP_SimpleMessage" updated="12/07/21">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3623" name="OP_FormattedMessage" updated="11/17/21">
+ <opcode id="7d58" name="OP_FormattedMessage" updated="12/07/21">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="224b" name="OP_CommonMessage" updated="11/17/21">
+ <opcode id="5c7f" name="OP_CommonMessage" updated="12/07/21">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="1715" name="OP_SpecialMesg" updated="11/17/21">
+ <opcode id="78e0" name="OP_SpecialMesg" updated="12/07/21">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="085f" name="OP_RandomReq" updated="11/17/21">
+ <opcode id="09e2" name="OP_RandomReq" updated="12/07/21">
<comment>RandomReqCode</comment>
<payload dir="client" typename="randomReqStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3c00" name="OP_RandomReply" updated="11/17/21">
+ <opcode id="6b20" name="OP_RandomReply" updated="12/07/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="1b65" name="OP_ManaChange" updated="11/17/21">
+ <opcode id="442c" name="OP_ManaChange" updated="12/07/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="33a5" name="OP_BazaarSearchRequest" updated="11/17/21">
+ <opcode id="4529" name="OP_BazaarSearchRequest" updated="12/07/21">
<comment>Bazaar search request </comment>
<payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/>
</opcode>
- <opcode id="5ee0" name="OP_BazaarSearchResponse" updated="11/17/21">
+ <opcode id="53f4" name="OP_BazaarSearchResponse" updated="12/07/21">
<comment>Bazaar search Response - Struct incorrect </comment>
<payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="77df" name="OP_MoneyOnCorpse" updated="11/17/21">
+ <opcode id="0c3c" name="OP_MoneyOnCorpse" updated="12/07/21">
<comment>MoneyOnCorpseCode</comment>
<payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0645" name="OP_SkillUpdate" updated="11/17/21">
+ <opcode id="2e89" name="OP_SkillUpdate" updated="12/07/21">
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="297c" name="OP_LevelUpdate" updated="11/17/21">
+ <opcode id="5400" name="OP_LevelUpdate" updated="12/07/21">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6e46" name="OP_DzSwitchInfo" updated="11/17/21">
+ <opcode id="4c2d" name="OP_DzSwitchInfo" updated="12/07/21">
<comment>Expedition compass etc</comment>
<payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/>
</opcode>
- <opcode id="26da" name="OP_DzInfo" updated="11/17/21">
+ <opcode id="23ef" name="OP_DzInfo" updated="12/07/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="6435" name="OP_SetRunMode" updated="11/17/21">
+ <opcode id="5da6" name="OP_SetRunMode" updated="12/07/21">
<comment>old cRunToggleCode</comment>
<payload dir="client" typename="cRunToggleStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6607" name="OP_Trader" updated="11/17/21">
+ <opcode id="6ab1" name="OP_Trader" updated="12/07/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="0a07" name="OP_GuildMemberList" updated="11/17/21">
+ <opcode id="5b82" name="OP_GuildMemberList" updated="12/07/21">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="7b36" name="OP_ManaUpdate" updated="11/17/21">
+ <opcode id="17e9" name="OP_ManaUpdate" updated="12/07/21">
<comment>Mana Update opcode - 10 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4625" name="OP_EndUpdate" updated="11/17/21">
+ <opcode id="2525" name="OP_EndUpdate" updated="12/07/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="75de" name="OP_ExpandedGuildInfo" updated="11/17/21">
+ <opcode id="6736" name="OP_ExpandedGuildInfo" updated="12/07/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="0ca1" name="OP_GuildsInZoneList" updated="11/17/21">
+ <opcode id="67b0" name="OP_GuildsInZoneList" updated="12/07/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="2d85" name="OP_NewGuildInZone" updated="11/17/21">
+ <opcode id="1a03" name="OP_NewGuildInZone" updated="12/07/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="7218" name="OP_Find" updated="11/17/21">
+ <opcode id="7796" name="OP_Find" updated="12/07/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-12-07 20:43:51 UTC (rev 1225)
+++ showeq/branches/cn187_devel/configure.in 2021-12-07 21:10:45 UTC (rev 1226)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.1.8)
+AC_INIT(showeq, 6.2.0)
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-12-07 20:43:51 UTC (rev 1225)
+++ showeq/branches/cn187_devel/src/everquest.h 2021-12-07 21:10:45 UTC (rev 1226)
@@ -1115,29 +1115,28 @@
struct
{
+ unsigned heading:12; // heading
+ signed z:19; // z coord (3rd loc value)
+ unsigned padding00:1;
+
+ signed x:19; // x coord (1st loc value)
+ signed animation:10; // current animation
+ unsigned padding01:3;
+
signed deltaZ:13; // change in z
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding00:7;
-
- signed deltaHeading:10; // change in heading
signed deltaY:13; // change in y
- unsigned padding01:9;
+ unsigned padding02:6;
- signed z:19; // z coord (3rd loc value)
signed deltaX:13; // change in x
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding03:7;
- signed x:19; // x coord (1st loc value)
- unsigned padding03:13;
-
signed y:19; // y coord (2nd loc value)
- unsigned heading:12; // heading
- unsigned padding04:1;
+ signed deltaHeading:10; // change in heading
+ unsigned padding04:3;
- signed animation:10; // current animation
- unsigned padding05:22;
-
};
- int32_t posData[6];
+ int32_t posData[5];
};
/*0000*/ union
@@ -2389,7 +2388,7 @@
/*
** Player Position Update
-** Length: 28 Octets
+** Length: 24 Octets
** OpCode: PlayerPosCode
*/
struct playerSpawnPosStruct
@@ -2397,32 +2396,31 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/
+ unsigned heading:12; // heading
+ signed z:19; // z coord (3rd loc value)
+ unsigned padding00:1;
+/*0008*/
+ signed x:19; // x coord (1st loc value)
+ signed animation:10; // current animation
+ unsigned padding01:3;
+/*0012*/
signed deltaZ:13; // change in z
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding00:7;
-/*0008*/
- signed deltaHeading:10; // change in heading
signed deltaY:13; // change in y
- unsigned padding01:9;
-/*0012*/
- signed z:19; // z coord (3rd loc value)
+ unsigned padding02:6;
+/*0016*/
signed deltaX:13; // change in x
-/*0016*/
- signed x:19; // x coord (1st loc value)
- unsigned padding03:13;
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding03:7;
/*0020*/
signed y:19; // y coord (2nd loc value)
- unsigned heading:12; // heading
- unsigned padding04:1;
+ signed deltaHeading:10; // change in heading
+ unsigned padding04:3;
/*0024*/
- signed animation:10; // current animation
- unsigned padding05:22;
-/*0028*/
};
/*
** Self Position Update
-** Length: 38 Octets
+** Length: 42 Octets
** OpCode: PlayerPosCode
*/
struct playerSelfPosStruct
@@ -2431,26 +2429,28 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
- unsigned heading:12; // heading
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding00:8;
+ float z; // z coord (3rd loc value)
/*0010*/
- float deltaY; // change in y
+ signed animation:10; // current animation
+ unsigned padding01:22;
/*0014*/
- signed deltaHeading:10; // change in heading
- signed animation:10; // current animation
- unsigned padding02:12;
+ float deltaZ; // change in z
/*0018*/
- float x; // x coord (1st loc value)
+ float y; // y coord (2nd loc value)
/*0022*/
- float deltaZ; // change in z
+ unsigned heading:12; // heading
+ signed deltaHeading:10; // change in heading
+ unsigned padding04:10;
/*0026*/
- float deltaX; // change in x
+ float x; // x coord (1st loc value)
/*0030*/
- float z; // z coord (3rd loc value)
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding06:20;
/*0034*/
- float y; // y coord (2nd loc value)
+ float deltaX; // change in x
/*0038*/
+ float deltaY; // change in y
+/*0042*/
};
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-07 20:43:52
|
Revision: 1225
http://sourceforge.net/p/seq/svn/1225
Author: cn187
Date: 2021-12-07 20:43:51 +0000 (Tue, 07 Dec 2021)
Log Message:
-----------
Tag for release 6.2.0
Added Paths:
-----------
showeq/tags/v6_2_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-07 20:36:03
|
Revision: 1224
http://sourceforge.net/p/seq/svn/1224
Author: cn187
Date: 2021-12-07 20:36:00 +0000 (Tue, 07 Dec 2021)
Log Message:
-----------
Release 6.2.0
- Update to version 6.2.0
- Support for EQ patch 12/07/21
- Opcode and struct changes
- Add support for building with Qt5 [EXPERIMENTAL]
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-12-07 13:45:19 UTC (rev 1223)
+++ showeq/trunk/ChangeLog 2021-12-07 20:36:00 UTC (rev 1224)
@@ -1,3 +1,10 @@
+cn187 (12/07/21)
+----------------
+- Update to version 6.2.0
+- Support for EQ patch 12/07/21
+- Opcode and struct changes
+- Add support for building with Qt5 [EXPERIMENTAL]
+
cn187 (11/17/21)
----------------
- Update to version 6.1.8
Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml 2021-12-07 13:45:19 UTC (rev 1223)
+++ showeq/trunk/conf/zoneopcodes.xml 2021-12-07 20:36:00 UTC (rev 1224)
@@ -3,127 +3,127 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="2e70" name="OP_PlayerProfile" updated="11/17/21">
+ <opcode id="176e" name="OP_PlayerProfile" updated="12/07/21">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="2597" name="OP_ZoneEntry" updated="11/17/21">
+ <opcode id="19fe" name="OP_ZoneEntry" updated="12/07/21">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="379c" name="OP_TimeOfDay" updated="11/17/21">
+ <opcode id="1f03" name="OP_TimeOfDay" updated="12/07/21">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="647a" name="OP_NewZone" updated="11/17/21">
+ <opcode id="7cf3" name="OP_NewZone" updated="12/07/21">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7714" name="OP_SpawnDoor" updated="11/17/21">
+ <opcode id="4699" name="OP_SpawnDoor" updated="12/07/21">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="604a" name="OP_GroundSpawn" updated="11/17/21">
+ <opcode id="1081" name="OP_GroundSpawn" updated="12/07/21">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="503e" name="OP_SendZonePoints" updated="11/17/21">
+ <opcode id="0893" name="OP_SendZonePoints" updated="12/07/21">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="2b2d" name="OP_AAExpUpdate" updated="11/17/21">
+ <opcode id="78d5" name="OP_AAExpUpdate" updated="12/07/21">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="23eb" name="OP_ExpUpdate" updated="11/17/21">
+ <opcode id="1408" name="OP_ExpUpdate" updated="12/07/21">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1ae6" name="OP_GuildMOTD" updated="11/17/21">
+ <opcode id="40a0" name="OP_GuildMOTD" updated="12/07/21">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="4b86" name="OP_ClientUpdate" updated="11/17/21">
+ <opcode id="52e6" name="OP_ClientUpdate" updated="12/07/21">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3c74" name="OP_NpcMoveUpdate" updated="11/17/21">
+ <opcode id="4262" name="OP_NpcMoveUpdate" updated="12/07/21">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="3dcc" name="OP_MobUpdate" updated="11/17/21">
+ <opcode id="1dd0" name="OP_MobUpdate" updated="12/07/21">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="7a64" name="OP_DeleteSpawn" updated="11/17/21">
+ <opcode id="42ca" name="OP_DeleteSpawn" updated="12/07/21">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="66b5" name="OP_RemoveSpawn" updated="11/17/21">
+ <opcode id="6f7b" name="OP_RemoveSpawn" updated="12/07/21">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="72fb" name="OP_Death" updated="11/17/21">
+ <opcode id="3e63" name="OP_Death" updated="12/07/21">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="698b" name="OP_WearChange" updated="11/17/21">
+ <opcode id="35a0" name="OP_WearChange" updated="12/07/21">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0f40" name="OP_SpawnAppearance" updated="11/17/21">
+ <opcode id="3494" name="OP_SpawnAppearance" updated="12/07/21">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
- <opcode id="48c0" name="OP_Stamina" updated="11/17/21">
+ <opcode id="2d04" name="OP_Stamina" updated="12/07/21">
<comment>Server updating on hunger/thirst</comment>
<payload dir="server" typename="staminaStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6e70" name="OP_HPUpdate" updated="11/17/21">
+ <opcode id="5c2d" name="OP_HPUpdate" updated="12/07/21">
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1562" name="OP_GuildMemberUpdate" updated="11/17/21">
+ <opcode id="1c72" name="OP_GuildMemberUpdate" updated="12/07/21">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="1b19" name="OP_ClickObject" updated="11/17/21">
+ <opcode id="2007" name="OP_ClickObject" updated="12/07/21">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="387b" name="OP_Action" updated="11/17/21">
+ <opcode id="2d73" name="OP_Action" updated="12/07/21">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6207" name="OP_Action2" updated="11/17/21">
+ <opcode id="446a" name="OP_Action2" updated="12/07/21">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="5916" name="OP_Consider" updated="11/17/21">
+ <opcode id="736b" name="OP_Consider" updated="12/07/21">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6dc7" name="OP_TargetMouse" updated="11/17/21">
+ <opcode id="4552" name="OP_TargetMouse" updated="12/07/21">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5bea" name="OP_SpawnRename" updated="11/17/21">
+ <opcode id="72e9" name="OP_SpawnRename" updated="12/07/21">
<comment>Spawns getting renamed after initial NewSpawn</comment>
<payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3a70" name="OP_Illusion" updated="11/17/21">
+ <opcode id="6c8a" name="OP_Illusion" updated="12/07/21">
<comment>Spawn being illusioned (changing forms)</comment>
<payload dir="both" typename="spawnIllusionStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5f8c" name="OP_Shroud" updated="11/17/21">
+ <opcode id="6106" name="OP_Shroud" updated="12/07/21">
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="746c" name="OP_ZoneChange" updated="11/17/21">
+ <opcode id="7d9b" name="OP_ZoneChange" updated="12/07/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="6fd7" name="OP_Buff" updated="11/17/21">
+ <opcode id="34b9" name="OP_Buff" updated="12/07/21">
<comment>old BuffDropCode</comment>
<payload dir="both" typename="buffStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0933" name="OP_BeginCast" updated="11/17/21">
+ <opcode id="53c6" name="OP_BeginCast" updated="12/07/21">
<comment>BeginCastCode</comment>
<payload dir="both" typename="beginCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5e71" name="OP_CastSpell" updated="11/17/21">
+ <opcode id="47b1" name="OP_CastSpell" updated="12/07/21">
<comment>StartCastCode</comment>
<payload dir="both" typename="startCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6a5a" name="OP_SwapSpell" updated="11/17/21">
+ <opcode id="0186" name="OP_SwapSpell" updated="12/07/21">
<comment>TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3a26" name="OP_MemorizeSpell" updated="11/17/21">
+ <opcode id="3ec5" name="OP_MemorizeSpell" updated="12/07/21">
<comment>MemSpellCode</comment>
<payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4b23" name="OP_InspectAnswer" updated="11/17/21">
+ <opcode id="2c56" name="OP_InspectAnswer" updated="12/07/21">
<comment>InspectDataCode</comment>
<payload dir="both" typename="inspectDataStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4b78" name="OP_Emote" updated="11/17/21">
+ <opcode id="79d6" name="OP_Emote" updated="12/07/21">
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="7299" name="OP_SimpleMessage" updated="11/17/21">
+ <opcode id="384d" name="OP_SimpleMessage" updated="12/07/21">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3623" name="OP_FormattedMessage" updated="11/17/21">
+ <opcode id="7d58" name="OP_FormattedMessage" updated="12/07/21">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="224b" name="OP_CommonMessage" updated="11/17/21">
+ <opcode id="5c7f" name="OP_CommonMessage" updated="12/07/21">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="1715" name="OP_SpecialMesg" updated="11/17/21">
+ <opcode id="78e0" name="OP_SpecialMesg" updated="12/07/21">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="085f" name="OP_RandomReq" updated="11/17/21">
+ <opcode id="09e2" name="OP_RandomReq" updated="12/07/21">
<comment>RandomReqCode</comment>
<payload dir="client" typename="randomReqStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3c00" name="OP_RandomReply" updated="11/17/21">
+ <opcode id="6b20" name="OP_RandomReply" updated="12/07/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="1b65" name="OP_ManaChange" updated="11/17/21">
+ <opcode id="442c" name="OP_ManaChange" updated="12/07/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="33a5" name="OP_BazaarSearchRequest" updated="11/17/21">
+ <opcode id="4529" name="OP_BazaarSearchRequest" updated="12/07/21">
<comment>Bazaar search request </comment>
<payload dir="client" typename="bazaarSearchQueryStruct" sizechecktype="none"/>
</opcode>
- <opcode id="5ee0" name="OP_BazaarSearchResponse" updated="11/17/21">
+ <opcode id="53f4" name="OP_BazaarSearchResponse" updated="12/07/21">
<comment>Bazaar search Response - Struct incorrect </comment>
<payload dir="server" typename="bazaarSearchResponseStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="77df" name="OP_MoneyOnCorpse" updated="11/17/21">
+ <opcode id="0c3c" name="OP_MoneyOnCorpse" updated="12/07/21">
<comment>MoneyOnCorpseCode</comment>
<payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0645" name="OP_SkillUpdate" updated="11/17/21">
+ <opcode id="2e89" name="OP_SkillUpdate" updated="12/07/21">
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="297c" name="OP_LevelUpdate" updated="11/17/21">
+ <opcode id="5400" name="OP_LevelUpdate" updated="12/07/21">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6e46" name="OP_DzSwitchInfo" updated="11/17/21">
+ <opcode id="4c2d" name="OP_DzSwitchInfo" updated="12/07/21">
<comment>Expedition compass etc</comment>
<payload dir="server" typename="dzSwitchInfo" sizechecktype="none"/>
</opcode>
- <opcode id="26da" name="OP_DzInfo" updated="11/17/21">
+ <opcode id="23ef" name="OP_DzInfo" updated="12/07/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="6435" name="OP_SetRunMode" updated="11/17/21">
+ <opcode id="5da6" name="OP_SetRunMode" updated="12/07/21">
<comment>old cRunToggleCode</comment>
<payload dir="client" typename="cRunToggleStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6607" name="OP_Trader" updated="11/17/21">
+ <opcode id="6ab1" name="OP_Trader" updated="12/07/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="0a07" name="OP_GuildMemberList" updated="11/17/21">
+ <opcode id="5b82" name="OP_GuildMemberList" updated="12/07/21">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="7b36" name="OP_ManaUpdate" updated="11/17/21">
+ <opcode id="17e9" name="OP_ManaUpdate" updated="12/07/21">
<comment>Mana Update opcode - 10 bytes</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4625" name="OP_EndUpdate" updated="11/17/21">
+ <opcode id="2525" name="OP_EndUpdate" updated="12/07/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="75de" name="OP_ExpandedGuildInfo" updated="11/17/21">
+ <opcode id="6736" name="OP_ExpandedGuildInfo" updated="12/07/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="0ca1" name="OP_GuildsInZoneList" updated="11/17/21">
+ <opcode id="67b0" name="OP_GuildsInZoneList" updated="12/07/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="2d85" name="OP_NewGuildInZone" updated="11/17/21">
+ <opcode id="1a03" name="OP_NewGuildInZone" updated="12/07/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="7218" name="OP_Find" updated="11/17/21">
+ <opcode id="7796" name="OP_Find" updated="12/07/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-12-07 13:45:19 UTC (rev 1223)
+++ showeq/trunk/configure.in 2021-12-07 20:36:00 UTC (rev 1224)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.1.8)
+AC_INIT(showeq, 6.2.0)
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-12-07 13:45:19 UTC (rev 1223)
+++ showeq/trunk/src/everquest.h 2021-12-07 20:36:00 UTC (rev 1224)
@@ -1113,29 +1113,28 @@
struct
{
+ unsigned heading:12; // heading
+ signed z:19; // z coord (3rd loc value)
+ unsigned padding00:1;
+
+ signed x:19; // x coord (1st loc value)
+ signed animation:10; // current animation
+ unsigned padding01:3;
+
signed deltaZ:13; // change in z
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding00:7;
-
- signed deltaHeading:10; // change in heading
signed deltaY:13; // change in y
- unsigned padding01:9;
+ unsigned padding02:6;
- signed z:19; // z coord (3rd loc value)
signed deltaX:13; // change in x
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding03:7;
- signed x:19; // x coord (1st loc value)
- unsigned padding03:13;
-
signed y:19; // y coord (2nd loc value)
- unsigned heading:12; // heading
- unsigned padding04:1;
+ signed deltaHeading:10; // change in heading
+ unsigned padding04:3;
- signed animation:10; // current animation
- unsigned padding05:22;
-
};
- int32_t posData[6];
+ int32_t posData[5];
};
/*0000*/ union
@@ -2387,7 +2386,7 @@
/*
** Player Position Update
-** Length: 28 Octets
+** Length: 24 Octets
** OpCode: PlayerPosCode
*/
struct playerSpawnPosStruct
@@ -2395,32 +2394,31 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/
+ unsigned heading:12; // heading
+ signed z:19; // z coord (3rd loc value)
+ unsigned padding00:1;
+/*0008*/
+ signed x:19; // x coord (1st loc value)
+ signed animation:10; // current animation
+ unsigned padding01:3;
+/*0012*/
signed deltaZ:13; // change in z
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding00:7;
-/*0008*/
- signed deltaHeading:10; // change in heading
signed deltaY:13; // change in y
- unsigned padding01:9;
-/*0012*/
- signed z:19; // z coord (3rd loc value)
+ unsigned padding02:6;
+/*0016*/
signed deltaX:13; // change in x
-/*0016*/
- signed x:19; // x coord (1st loc value)
- unsigned padding03:13;
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding03:7;
/*0020*/
signed y:19; // y coord (2nd loc value)
- unsigned heading:12; // heading
- unsigned padding04:1;
+ signed deltaHeading:10; // change in heading
+ unsigned padding04:3;
/*0024*/
- signed animation:10; // current animation
- unsigned padding05:22;
-/*0028*/
};
/*
** Self Position Update
-** Length: 38 Octets
+** Length: 42 Octets
** OpCode: PlayerPosCode
*/
struct playerSelfPosStruct
@@ -2429,26 +2427,28 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
- unsigned heading:12; // heading
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding00:8;
+ float z; // z coord (3rd loc value)
/*0010*/
- float deltaY; // change in y
+ signed animation:10; // current animation
+ unsigned padding01:22;
/*0014*/
- signed deltaHeading:10; // change in heading
- signed animation:10; // current animation
- unsigned padding02:12;
+ float deltaZ; // change in z
/*0018*/
- float x; // x coord (1st loc value)
+ float y; // y coord (2nd loc value)
/*0022*/
- float deltaZ; // change in z
+ unsigned heading:12; // heading
+ signed deltaHeading:10; // change in heading
+ unsigned padding04:10;
/*0026*/
- float deltaX; // change in x
+ float x; // x coord (1st loc value)
/*0030*/
- float z; // z coord (3rd loc value)
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding06:20;
/*0034*/
- float y; // y coord (2nd loc value)
+ float deltaX; // change in x
/*0038*/
+ float deltaY; // change in y
+/*0042*/
};
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-07 13:45:21
|
Revision: 1223
http://sourceforge.net/p/seq/svn/1223
Author: cn187
Date: 2021-12-07 13:45:19 +0000 (Tue, 07 Dec 2021)
Log Message:
-----------
Enable session tracking by default
Modified Paths:
--------------
showeq/branches/cn187_devel/conf/seqdef.xml
Modified: showeq/branches/cn187_devel/conf/seqdef.xml
===================================================================
--- showeq/branches/cn187_devel/conf/seqdef.xml 2021-12-07 13:41:51 UTC (rev 1222)
+++ showeq/branches/cn187_devel/conf/seqdef.xml 2021-12-07 13:45:19 UTC (rev 1223)
@@ -34,7 +34,7 @@
<comment>Give up waiting for seq arq after cache fills to this size. Don't set this too low, otherwise showeq will artificially skip packets, minimum is 32, modem users may want to set 512, dsl and cable users may choose 256 or less</comment>
</property>
<property name="SessionTracking" >
- <bool value="false" />
+ <bool value="true" />
<comment>enable/disable session tracking</comment>
</property>
<property name="WorldOPCodes" >
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-12-07 13:41:53
|
Revision: 1222
http://sourceforge.net/p/seq/svn/1222
Author: cn187
Date: 2021-12-07 13:41:51 +0000 (Tue, 07 Dec 2021)
Log Message:
-----------
Only check disconnected sessionId when session tracking is enabled
Modified Paths:
--------------
showeq/branches/cn187_devel/src/packetstream.cpp
Modified: showeq/branches/cn187_devel/src/packetstream.cpp
===================================================================
--- showeq/branches/cn187_devel/src/packetstream.cpp 2021-11-30 22:38:49 UTC (rev 1221)
+++ showeq/branches/cn187_devel/src/packetstream.cpp 2021-12-07 13:41:51 UTC (rev 1222)
@@ -1144,17 +1144,16 @@
break;
case OP_SessionDisconnect:
{
-
- // When session tracking isn't enabled, random UDP traffic on the LAN can
- // cause unexpected session disconnects if the packet payload happens
- // to start with the same bytes as the OP_SessionDisconnect netOp.
- //
- // So check the sessionId in the disconnect packet, and only process
- // it if it matches the current sessionId.
- SessionDisconnectStruct* disconnect = (SessionDisconnectStruct*) packet.payload();
- uint32_t disconnectedSessionId = eqntohuint32((uint8_t*)&(disconnect->sessionId));
- if (m_sessionId != disconnectedSessionId) {
- break;
+ if (m_session_tracking_enabled)
+ {
+ // Check the sessionId in the disconnect packet, and only process
+ // it if it matches the current sessionId.
+ SessionDisconnectStruct* disconnect = (SessionDisconnectStruct*) packet.payload();
+ uint32_t disconnectedSessionId = eqntohuint32((uint8_t*)&(disconnect->sessionId));
+ if (m_sessionId != disconnectedSessionId)
+ {
+ break;
+ }
}
#if defined(PACKET_PROCESS_DIAG) || defined(PACKET_SESSION_DIAG)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2021-11-30 22:38:50
|
Revision: 1221
http://sourceforge.net/p/seq/svn/1221
Author: cn187
Date: 2021-11-30 22:38:49 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
[Qt5] Improve qt5 autodetection on certain platforms
Modified Paths:
--------------
showeq/trunk/acinclude.m4
Modified: showeq/trunk/acinclude.m4
===================================================================
--- showeq/trunk/acinclude.m4 2021-11-30 22:37:01 UTC (rev 1220)
+++ showeq/trunk/acinclude.m4 2021-11-30 22:38:49 UTC (rev 1221)
@@ -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-11-30 22:37:03
|
Revision: 1220
http://sourceforge.net/p/seq/svn/1220
Author: cn187
Date: 2021-11-30 22:37:01 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
[Qt5] Update autotools files to allow building with Qt5
Modified Paths:
--------------
showeq/trunk/acinclude.m4
showeq/trunk/configure.in
showeq/trunk/src/Makefile.am
Modified: showeq/trunk/acinclude.m4
===================================================================
--- showeq/trunk/acinclude.m4 2021-11-30 22:34:49 UTC (rev 1219)
+++ showeq/trunk/acinclude.m4 2021-11-30 22:37:01 UTC (rev 1220)
@@ -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/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2021-11-30 22:34:49 UTC (rev 1219)
+++ showeq/trunk/configure.in 2021-11-30 22:37:01 UTC (rev 1220)
@@ -169,6 +169,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/trunk/src/Makefile.am
===================================================================
--- showeq/trunk/src/Makefile.am 2021-11-30 22:34:49 UTC (rev 1219)
+++ showeq/trunk/src/Makefile.am 2021-11-30 22:37:01 UTC (rev 1220)
@@ -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-11-30 22:34:50
|
Revision: 1219
http://sourceforge.net/p/seq/svn/1219
Author: cn187
Date: 2021-11-30 22:34:49 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
[Qt5] Use QHeader::setSectionResizeMode if Qt5+
Modified Paths:
--------------
showeq/trunk/src/seqlistview.cpp
Modified: showeq/trunk/src/seqlistview.cpp
===================================================================
--- showeq/trunk/src/seqlistview.cpp 2021-11-30 22:32:26 UTC (rev 1218)
+++ showeq/trunk/src/seqlistview.cpp 2021-11-30 22:34:49 UTC (rev 1219)
@@ -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-11-30 22:32:28
|
Revision: 1218
http://sourceforge.net/p/seq/svn/1218
Author: cn187
Date: 2021-11-30 22:32:26 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
[Qt5] Don't use Qt library version tags
Modified Paths:
--------------
showeq/trunk/configure.in
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2021-11-30 14:44:12 UTC (rev 1217)
+++ showeq/trunk/configure.in 2021-11-30 22:32:26 UTC (rev 1218)
@@ -465,7 +465,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-11-30 14:44:15
|
Revision: 1217
http://sourceforge.net/p/seq/svn/1217
Author: cn187
Date: 2021-11-30 14:44:12 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
[Qt5] More QVariant enum fixes
Modified Paths:
--------------
showeq/trunk/src/spawnlistcommon.cpp
showeq/trunk/src/spawnpointlist.cpp
showeq/trunk/src/xmlconv.cpp
Modified: showeq/trunk/src/spawnlistcommon.cpp
===================================================================
--- showeq/trunk/src/spawnlistcommon.cpp 2021-11-30 14:44:05 UTC (rev 1216)
+++ showeq/trunk/src/spawnlistcommon.cpp 2021-11-30 14:44:12 UTC (rev 1217)
@@ -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/trunk/src/spawnpointlist.cpp
===================================================================
--- showeq/trunk/src/spawnpointlist.cpp 2021-11-30 14:44:05 UTC (rev 1216)
+++ showeq/trunk/src/spawnpointlist.cpp 2021-11-30 14:44:12 UTC (rev 1217)
@@ -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/trunk/src/xmlconv.cpp
===================================================================
--- showeq/trunk/src/xmlconv.cpp 2021-11-30 14:44:05 UTC (rev 1216)
+++ showeq/trunk/src/xmlconv.cpp 2021-11-30 14:44:12 UTC (rev 1217)
@@ -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-11-30 14:44:08
|
Revision: 1216
http://sourceforge.net/p/seq/svn/1216
Author: cn187
Date: 2021-11-30 14:44:05 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
[Qt5] Use Qvariant::value instead of qVariantValue
Modified Paths:
--------------
showeq/trunk/src/xmlpreferences.cpp
Modified: showeq/trunk/src/xmlpreferences.cpp
===================================================================
--- showeq/trunk/src/xmlpreferences.cpp 2021-11-30 14:43:58 UTC (rev 1215)
+++ showeq/trunk/src/xmlpreferences.cpp 2021-11-30 14:44:05 UTC (rev 1216)
@@ -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-11-30 14:44:01
|
Revision: 1215
http://sourceforge.net/p/seq/svn/1215
Author: cn187
Date: 2021-11-30 14:43:58 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
[Qt5] REname QFileDialog::selectedFilter to QFileDialog::selectedNameFilter
Modified Paths:
--------------
showeq/trunk/src/map.cpp
Modified: showeq/trunk/src/map.cpp
===================================================================
--- showeq/trunk/src/map.cpp 2021-11-30 14:43:51 UTC (rev 1214)
+++ showeq/trunk/src/map.cpp 2021-11-30 14:43:58 UTC (rev 1215)
@@ -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-11-30 14:43:54
|
Revision: 1214
http://sourceforge.net/p/seq/svn/1214
Author: cn187
Date: 2021-11-30 14:43:51 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
[Qt5] Cast enum types for QVariant usage
Modified Paths:
--------------
showeq/trunk/src/map.cpp
Modified: showeq/trunk/src/map.cpp
===================================================================
--- showeq/trunk/src/map.cpp 2021-11-30 14:43:44 UTC (rev 1213)
+++ showeq/trunk/src/map.cpp 2021-11-30 14:43:51 UTC (rev 1214)
@@ -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-11-30 14:43:47
|
Revision: 1213
http://sourceforge.net/p/seq/svn/1213
Author: cn187
Date: 2021-11-30 14:43:44 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
[Qt5] Remove includes for now-private QStyles
Modified Paths:
--------------
showeq/trunk/src/interface.cpp
showeq/trunk/src/main.cpp
Modified: showeq/trunk/src/interface.cpp
===================================================================
--- showeq/trunk/src/interface.cpp 2021-11-30 14:43:21 UTC (rev 1212)
+++ showeq/trunk/src/interface.cpp 2021-11-30 14:43:44 UTC (rev 1213)
@@ -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/trunk/src/main.cpp
===================================================================
--- showeq/trunk/src/main.cpp 2021-11-30 14:43:21 UTC (rev 1212)
+++ showeq/trunk/src/main.cpp 2021-11-30 14:43:44 UTC (rev 1213)
@@ -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-11-30 14:43:23
|
Revision: 1212
http://sourceforge.net/p/seq/svn/1212
Author: cn187
Date: 2021-11-30 14:43:21 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
[Qt5] Replace TRUE/FALSE constants with true/false built-ins
Modified Paths:
--------------
showeq/trunk/src/editor.cpp
showeq/trunk/src/interface.cpp
showeq/trunk/src/map.cpp
showeq/trunk/src/spawnlist2.cpp
Modified: showeq/trunk/src/editor.cpp
===================================================================
--- showeq/trunk/src/editor.cpp 2021-11-30 14:43:14 UTC (rev 1211)
+++ showeq/trunk/src/editor.cpp 2021-11-30 14:43:21 UTC (rev 1212)
@@ -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/trunk/src/interface.cpp
===================================================================
--- showeq/trunk/src/interface.cpp 2021-11-30 14:43:14 UTC (rev 1211)
+++ showeq/trunk/src/interface.cpp 2021-11-30 14:43:21 UTC (rev 1212)
@@ -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/trunk/src/map.cpp
===================================================================
--- showeq/trunk/src/map.cpp 2021-11-30 14:43:14 UTC (rev 1211)
+++ showeq/trunk/src/map.cpp 2021-11-30 14:43:21 UTC (rev 1212)
@@ -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/trunk/src/spawnlist2.cpp
===================================================================
--- showeq/trunk/src/spawnlist2.cpp 2021-11-30 14:43:14 UTC (rev 1211)
+++ showeq/trunk/src/spawnlist2.cpp 2021-11-30 14:43:21 UTC (rev 1212)
@@ -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-11-30 14:43:16
|
Revision: 1211
http://sourceforge.net/p/seq/svn/1211
Author: cn187
Date: 2021-11-30 14:43:14 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
[Qt5] Replace WFlags with WindowFlags
Modified Paths:
--------------
showeq/trunk/src/seqlistview.cpp
showeq/trunk/src/seqlistview.h
showeq/trunk/src/seqwindow.cpp
showeq/trunk/src/seqwindow.h
Modified: showeq/trunk/src/seqlistview.cpp
===================================================================
--- showeq/trunk/src/seqlistview.cpp 2021-11-30 14:43:06 UTC (rev 1210)
+++ showeq/trunk/src/seqlistview.cpp 2021-11-30 14:43:14 UTC (rev 1211)
@@ -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/trunk/src/seqlistview.h
===================================================================
--- showeq/trunk/src/seqlistview.h 2021-11-30 14:43:06 UTC (rev 1210)
+++ showeq/trunk/src/seqlistview.h 2021-11-30 14:43:14 UTC (rev 1211)
@@ -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/trunk/src/seqwindow.cpp
===================================================================
--- showeq/trunk/src/seqwindow.cpp 2021-11-30 14:43:06 UTC (rev 1210)
+++ showeq/trunk/src/seqwindow.cpp 2021-11-30 14:43:14 UTC (rev 1211)
@@ -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/trunk/src/seqwindow.h
===================================================================
--- showeq/trunk/src/seqwindow.h 2021-11-30 14:43:06 UTC (rev 1210)
+++ showeq/trunk/src/seqwindow.h 2021-11-30 14:43:14 UTC (rev 1211)
@@ -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.
|
