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: <the...@us...> - 2020-01-17 14:41:22
|
Revision: 1007
http://sourceforge.net/p/seq/svn/1007
Author: theblueadept
Date: 2020-01-17 14:41:20 +0000 (Fri, 17 Jan 2020)
Log Message:
-----------
Tag for release 5.13.10.91
Added Paths:
-----------
showeq/tags/v5_13_10_91/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2020-01-17 14:40:46
|
Revision: 1006
http://sourceforge.net/p/seq/svn/1006
Author: theblueadept
Date: 2020-01-17 14:40:45 +0000 (Fri, 17 Jan 2020)
Log Message:
-----------
Historical checkin for 01/20/20
Updated Opcodes (Newby and cn187)
Updated Structs (Newby)
Version to 5.13.10.91
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 2020-01-16 23:47:46 UTC (rev 1005)
+++ showeq/trunk/ChangeLog 2020-01-17 14:40:45 UTC (rev 1006)
@@ -1,3 +1,10 @@
+BlueAdept (01/20/20)
+-------------------
+- Updated version to 5.13.10.91
+- Support EQ patch 01/15/20
+- Updated Opcodes (Newby and cn187)
+- Updated Structs (Newby)
+
BlueAdept (12/22/19)
-------------------
- Updated version to 5.13.10.90
Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml 2020-01-16 23:47:46 UTC (rev 1005)
+++ showeq/trunk/conf/zoneopcodes.xml 2020-01-17 14:40:45 UTC (rev 1006)
@@ -3,78 +3,78 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="614d" name="OP_PlayerProfile" updated="12/20/19">
+ <opcode id="55ef" name="OP_PlayerProfile" updated="01/15/20">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="52bf" name="OP_ZoneEntry" updated="12/20/19">
+ <opcode id="20bf" name="OP_ZoneEntry" updated="01/15/20">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="12b8" name="OP_TimeOfDay" updated="12/20/19">
+ <opcode id="4553" name="OP_TimeOfDay" updated="01/15/20">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2456" name="OP_NewZone" updated="12/20/19">
+ <opcode id="5057" name="OP_NewZone" updated="01/15/20">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="131c" name="OP_SpawnDoor" updated="12/20/19">
+ <opcode id="0418" name="OP_SpawnDoor" updated="01/15/20">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="163d" name="OP_GroundSpawn" updated="12/20/19">
+ <opcode id="7a1a" name="OP_GroundSpawn" updated="01/15/20">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="509a" name="OP_SendZonePoints" updated="12/20/19">
+ <opcode id="44fe" name="OP_SendZonePoints" updated="01/15/20">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="084a" name="OP_AAExpUpdate" updated="12/20/19">
+ <opcode id="0c3a" name="OP_AAExpUpdate" updated="01/15/20">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="330d" name="OP_ExpUpdate" updated="12/20/19">
+ <opcode id="030d" name="OP_ExpUpdate" updated="01/15/20">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2a4a" name="OP_GuildMOTD" updated="12/20/19">
+ <opcode id="7fcd" name="OP_GuildMOTD" updated="01/15/20">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="32d0" name="OP_ClientUpdate" updated="12/20/19">
+ <opcode id="2bc2" name="OP_ClientUpdate" updated="01/15/20">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="30ac" name="OP_NpcMoveUpdate" updated="12/20/19">
+ <opcode id="3ac9" name="OP_NpcMoveUpdate" updated="01/15/20">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="631c" name="OP_MobUpdate" updated="12/20/19">
+ <opcode id="570e" name="OP_MobUpdate" updated="01/15/20">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="0069" name="OP_DeleteSpawn" updated="12/20/19">
+ <opcode id="55e3" name="OP_DeleteSpawn" updated="01/15/20">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7c46" name="OP_RemoveSpawn" updated="12/20/19">
+ <opcode id="2d88" name="OP_RemoveSpawn" updated="01/15/20">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="3af4" name="OP_Death" updated="12/20/19">
+ <opcode id="74a0" name="OP_Death" updated="01/15/20">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="611c" name="OP_WearChange" updated="12/20/19">
+ <opcode id="73d0" name="OP_WearChange" updated="01/15/20">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1566" name="OP_SpawnAppearance" updated="12/20/19">
+ <opcode id="32e2" name="OP_SpawnAppearance" updated="01/15/20">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
@@ -82,36 +82,36 @@
<comment>Server updating on hunger/thirst</comment>
<payload dir="server" typename="staminaStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2bde" name="OP_HPUpdate" updated="12/20/19">
+ <opcode id="46c8" name="OP_HPUpdate" updated="01/15/20">
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6c62" name="OP_GuildMemberUpdate" updated="12/20/19">
+ <opcode id="2d27" name="OP_GuildMemberUpdate" updated="01/15/20">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="2861" name="OP_ClickObject" updated="12/20/19">
+ <opcode id="36fe" name="OP_ClickObject" updated="01/15/20">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0fb9" name="OP_Action" updated="12/20/19">
+ <opcode id="6571" name="OP_Action" updated="01/15/20">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="52aa" name="OP_Action2" updated="12/20/19">
+ <opcode id="712e" name="OP_Action2" updated="01/15/20">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="62d0" name="OP_Consider" updated="12/20/19">
+ <opcode id="3770" name="OP_Consider" updated="01/15/20">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0476" name="OP_TargetMouse" updated="12/20/19">
+ <opcode id="6632" name="OP_TargetMouse" updated="01/15/20">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3048" name="OP_SpawnRename" updated="06/19/19">
+ <opcode id="750e" name="OP_SpawnRename" updated="01/15/20">
<comment>Spawns getting renamed after initial NewSpawn</comment>
<payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
</opcode>
@@ -123,7 +123,7 @@
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="05b5" name="OP_ZoneChange" updated="12/20/19">
+ <opcode id="661f" name="OP_ZoneChange" updated="01/15/20">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -175,11 +175,11 @@
<comment>StartCastCode</comment>
<payload dir="both" typename="startCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="23a2" name="OP_SwapSpell" updated="12/20/19">
+ <opcode id="17b6" name="OP_SwapSpell" updated="01/15/20">
<comment>TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0334" name="OP_MemorizeSpell" updated="12/20/19">
+ <opcode id="7b00" name="OP_MemorizeSpell" updated="01/15/20">
<comment>MemSpellCode</comment>
<payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
</opcode>
@@ -191,19 +191,19 @@
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="4164" name="OP_SimpleMessage" updated="12/20/19">
+ <opcode id="1230" name="OP_SimpleMessage" updated="01/15/20">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2a0a" name="OP_FormattedMessage" updated="12/20/19">
+ <opcode id="6d43" name="OP_FormattedMessage" updated="01/15/20">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="751b" name="OP_CommonMessage" updated="12/20/19">
+ <opcode id="62ec" name="OP_CommonMessage" updated="01/15/20">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="716a" name="OP_SpecialMesg" updated="12/20/19">
+ <opcode id="600e" name="OP_SpecialMesg" updated="01/15/20">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
@@ -223,7 +223,7 @@
<comment>Server replying with deny information after /deny</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="21d0" name="OP_ManaChange" updated="12/20/19">
+ <opcode id="73b2" name="OP_ManaChange" updated="01/15/20">
<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"/>
@@ -240,11 +240,11 @@
<comment>MoneyOnCorpseCode</comment>
<payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="200f" name="OP_SkillUpdate" updated="06/19/19">
+ <opcode id="1d22" name="OP_SkillUpdate" updated="01/15/20">
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3a6d" name="OP_LevelUpdate" updated="12/20/19">
+ <opcode id="765f" name="OP_LevelUpdate" updated="01/15/20">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
@@ -307,15 +307,15 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="04a5" name="OP_GuildMemberList" updated="12/20/19">
+ <opcode id="277d" name="OP_GuildMemberList" updated="01/15/20">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4c12" name="OP_ManaUpdate" updated="04/17/13">
+ <opcode id="1dec" name="OP_ManaUpdate" updated="01/15/20">
<comment>Mana Update opcode - 10 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="250e" name="OP_EndUpdate" updated="04/17/13">
+ <opcode id="48a7" name="OP_EndUpdate" updated="01/15/20">
<comment>Endurance Update opcode - 10 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="30d5" name="OP_ExpandedGuildInfo" updated="12/20/19">
+ <opcode id="06ba" name="OP_ExpandedGuildInfo" updated="01/15/20">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
@@ -587,7 +587,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="45e2" name="OP_Find" updated="12/20/19">
+ <opcode id="3121" name="OP_Find" updated="01/15/20">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2020-01-16 23:47:46 UTC (rev 1005)
+++ showeq/trunk/configure.in 2020-01-17 14:40:45 UTC (rev 1006)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 5.13.10.90)
+AC_INIT(showeq, 5.13.10.91)
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 2020-01-16 23:47:46 UTC (rev 1005)
+++ showeq/trunk/src/everquest.h 2020-01-17 14:40:45 UTC (rev 1006)
@@ -1097,22 +1097,23 @@
{
unsigned pitch:12;
- signed x:19; // x coord (1st loc value)
- unsigned padding00:1;
+ signed deltaZ:13; // change in z
+ unsigned padding00:7;
- signed deltaZ:13; // change in z
unsigned heading:12; // heading
- unsigned padding01:7;
+ signed x:19; // x coord (1st loc value)
+ unsigned padding01:1;
+ signed deltaX:13; // change in x
signed deltaY:13; // change in y
- signed animation:10; // velocity
- unsigned padding02:9;
+ unsigned padding02:6;
- signed deltaX:13; // change in x
- signed z:19; // z coord (3rd loc value)
-
signed deltaHeading:10; // change in heading
signed y:19; // y coord (2nd loc value)
+ unsigned padding03:3;
+
+ signed z:19; // z coord (3rd loc value)
+ signed animation:10; // velocity
unsigned padding04:3;
};
@@ -2377,22 +2378,23 @@
/*0002*/ uint16_t spawnId2;
/*0004*/
unsigned pitch:12;
- signed x:19; // x coord (1st loc value)
- unsigned padding00:1;
+ signed deltaZ:13; // change in z
+ unsigned padding00:7;
/*0008*/
- signed deltaZ:13; // change in z
unsigned heading:12; // heading
- unsigned padding01:7;
+ signed x:19; // x coord (1st loc value)
+ unsigned padding01:1;
/*0012*/
+ signed deltaX:13; // change in x
signed deltaY:13; // change in y
- signed animation:10; // velocity
- unsigned padding02:9;
+ unsigned padding02:6;
/*0016*/
- signed deltaX:13; // change in x
- signed z:19; // z coord (3rd loc value)
-/*0020*/
signed deltaHeading:10; // change in heading
signed y:19; // y coord (2nd loc value)
+ unsigned padding03:3;
+/*0020*/
+ signed z:19; // z coord (3rd loc value)
+ signed animation:10; // velocity
unsigned padding04:3;
/*0024*/
};
@@ -2399,7 +2401,7 @@
/*
** Self Position Update
-** Length: 44 Octets
+** Length: 42 Octets
** OpCode: PlayerPosCode
*/
@@ -2410,29 +2412,27 @@
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
unsigned pitch:12; // pitch (up/down heading)
- unsigned padding00:20;
+ unsigned heading:12; // Heading
+ unsigned padding00:8;
/*0010*/
+ float z; // z coord (3rd loc value)
+/*0014*/
float deltaZ; // Change in z
-/*0014*/
- unsigned heading:12; // Heading
- unsigned padding02:20;
/*0018*/
- float z; // z coord (3rd loc value)
+ float x; // x coord (1st loc value)
/*0022*/
signed deltaHeading:10; // change in heading
unsigned padding04:22;
/*0026*/
- float y; // y coord (2nd loc value)
+ float deltaY; // Change in y
/*0030*/
- float x; // x coord (1st loc value)
+ float deltaX; // Change in x
/*0034*/
signed animation:10; // velocity
unsigned padding07:22;
/*0038*/
- float deltaY; // Change in y
+ float y; // y coord (2nd loc value)
/*0042*/
- float deltaX; // Change in x
-/*0044*/
};
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2020-01-16 23:47:47
|
Revision: 1005
http://sourceforge.net/p/seq/svn/1005
Author: cn187
Date: 2020-01-16 23:47:46 +0000 (Thu, 16 Jan 2020)
Log Message:
-----------
Update opcodes/structs for 2020-01-15 patch
- Updated Opcodes (Newby, cn187)
- Updated Structs (Newby)
Version to 6.0.0.0-pre10
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml
showeq/branches/pre_6_0_beta/configure.in
showeq/branches/pre_6_0_beta/src/everquest.h
Modified: showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml
===================================================================
--- showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml 2020-01-11 18:10:43 UTC (rev 1004)
+++ showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml 2020-01-16 23:47:46 UTC (rev 1005)
@@ -3,78 +3,78 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="614d" name="OP_PlayerProfile" updated="12/20/19">
+ <opcode id="55ef" name="OP_PlayerProfile" updated="01/15/20">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="52bf" name="OP_ZoneEntry" updated="12/20/19">
+ <opcode id="20bf" name="OP_ZoneEntry" updated="01/15/20">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="12b8" name="OP_TimeOfDay" updated="12/20/19">
+ <opcode id="4553" name="OP_TimeOfDay" updated="01/15/20">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2456" name="OP_NewZone" updated="12/20/19">
+ <opcode id="5057" name="OP_NewZone" updated="01/15/20">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="131c" name="OP_SpawnDoor" updated="12/20/19">
+ <opcode id="0418" name="OP_SpawnDoor" updated="01/15/20">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="163d" name="OP_GroundSpawn" updated="12/20/19">
+ <opcode id="7a1a" name="OP_GroundSpawn" updated="01/15/20">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="509a" name="OP_SendZonePoints" updated="12/20/19">
+ <opcode id="44fe" name="OP_SendZonePoints" updated="01/15/20">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="084a" name="OP_AAExpUpdate" updated="12/20/19">
+ <opcode id="0c3a" name="OP_AAExpUpdate" updated="01/15/20">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="330d" name="OP_ExpUpdate" updated="12/20/19">
+ <opcode id="030d" name="OP_ExpUpdate" updated="01/15/20">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2a4a" name="OP_GuildMOTD" updated="12/20/19">
+ <opcode id="7fcd" name="OP_GuildMOTD" updated="01/15/20">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="32d0" name="OP_ClientUpdate" updated="12/20/19">
+ <opcode id="2bc2" name="OP_ClientUpdate" updated="01/15/20">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="30ac" name="OP_NpcMoveUpdate" updated="12/20/19">
+ <opcode id="3ac9" name="OP_NpcMoveUpdate" updated="01/15/20">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="631c" name="OP_MobUpdate" updated="12/20/19">
+ <opcode id="570e" name="OP_MobUpdate" updated="01/15/20">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="0069" name="OP_DeleteSpawn" updated="12/20/19">
+ <opcode id="55e3" name="OP_DeleteSpawn" updated="01/15/20">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7c46" name="OP_RemoveSpawn" updated="12/20/19">
+ <opcode id="2d88" name="OP_RemoveSpawn" updated="01/15/20">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="3af4" name="OP_Death" updated="12/20/19">
+ <opcode id="74a0" name="OP_Death" updated="01/15/20">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="611c" name="OP_WearChange" updated="12/20/19">
+ <opcode id="73d0" name="OP_WearChange" updated="01/15/20">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1566" name="OP_SpawnAppearance" updated="12/20/19">
+ <opcode id="32e2" name="OP_SpawnAppearance" updated="01/15/20">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
@@ -82,36 +82,36 @@
<comment>Server updating on hunger/thirst</comment>
<payload dir="server" typename="staminaStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2bde" name="OP_HPUpdate" updated="12/20/19">
+ <opcode id="46c8" name="OP_HPUpdate" updated="01/15/20">
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6c62" name="OP_GuildMemberUpdate" updated="12/20/19">
+ <opcode id="2d27" name="OP_GuildMemberUpdate" updated="01/15/20">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="2861" name="OP_ClickObject" updated="12/20/19">
+ <opcode id="36fe" name="OP_ClickObject" updated="01/15/20">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0fb9" name="OP_Action" updated="12/20/19">
+ <opcode id="6571" name="OP_Action" updated="01/15/20">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="52aa" name="OP_Action2" updated="12/20/19">
+ <opcode id="712e" name="OP_Action2" updated="01/15/20">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="62d0" name="OP_Consider" updated="12/20/19">
+ <opcode id="3770" name="OP_Consider" updated="01/15/20">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0476" name="OP_TargetMouse" updated="12/20/19">
+ <opcode id="6632" name="OP_TargetMouse" updated="01/15/20">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3048" name="OP_SpawnRename" updated="06/19/19">
+ <opcode id="750e" name="OP_SpawnRename" updated="01/15/20">
<comment>Spawns getting renamed after initial NewSpawn</comment>
<payload dir="server" typename="spawnRenameStruct" sizechecktype="match"/>
</opcode>
@@ -123,7 +123,7 @@
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="05b5" name="OP_ZoneChange" updated="12/20/19">
+ <opcode id="661f" name="OP_ZoneChange" updated="01/15/20">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -175,11 +175,11 @@
<comment>StartCastCode</comment>
<payload dir="both" typename="startCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="23a2" name="OP_SwapSpell" updated="12/20/19">
+ <opcode id="17b6" name="OP_SwapSpell" updated="01/15/20">
<comment>TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0334" name="OP_MemorizeSpell" updated="12/20/19">
+ <opcode id="7b00" name="OP_MemorizeSpell" updated="01/15/20">
<comment>MemSpellCode</comment>
<payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
</opcode>
@@ -191,19 +191,19 @@
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="4164" name="OP_SimpleMessage" updated="12/20/19">
+ <opcode id="1230" name="OP_SimpleMessage" updated="01/15/20">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2a0a" name="OP_FormattedMessage" updated="12/20/19">
+ <opcode id="6d43" name="OP_FormattedMessage" updated="01/15/20">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="751b" name="OP_CommonMessage" updated="12/20/19">
+ <opcode id="62ec" name="OP_CommonMessage" updated="01/15/20">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="716a" name="OP_SpecialMesg" updated="12/20/19">
+ <opcode id="600e" name="OP_SpecialMesg" updated="01/15/20">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
@@ -223,7 +223,7 @@
<comment>Server replying with deny information after /deny</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="21d0" name="OP_ManaChange" updated="12/20/19">
+ <opcode id="73b2" name="OP_ManaChange" updated="01/15/20">
<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"/>
@@ -240,11 +240,11 @@
<comment>MoneyOnCorpseCode</comment>
<payload dir="server" typename="moneyOnCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="200f" name="OP_SkillUpdate" updated="06/19/19">
+ <opcode id="1d22" name="OP_SkillUpdate" updated="01/15/20">
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3a6d" name="OP_LevelUpdate" updated="12/20/19">
+ <opcode id="765f" name="OP_LevelUpdate" updated="01/15/20">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
@@ -307,15 +307,15 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="04a5" name="OP_GuildMemberList" updated="12/20/19">
+ <opcode id="277d" name="OP_GuildMemberList" updated="01/15/20">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4c12" name="OP_ManaUpdate" updated="04/17/13">
+ <opcode id="1dec" name="OP_ManaUpdate" updated="01/15/20">
<comment>Mana Update opcode - 10 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="250e" name="OP_EndUpdate" updated="04/17/13">
+ <opcode id="48a7" name="OP_EndUpdate" updated="01/15/20">
<comment>Endurance Update opcode - 10 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="30d5" name="OP_ExpandedGuildInfo" updated="12/20/19">
+ <opcode id="06ba" name="OP_ExpandedGuildInfo" updated="01/15/20">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
@@ -587,7 +587,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="45e2" name="OP_Find" updated="12/20/19">
+ <opcode id="3121" name="OP_Find" updated="01/15/20">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
Modified: showeq/branches/pre_6_0_beta/configure.in
===================================================================
--- showeq/branches/pre_6_0_beta/configure.in 2020-01-11 18:10:43 UTC (rev 1004)
+++ showeq/branches/pre_6_0_beta/configure.in 2020-01-16 23:47:46 UTC (rev 1005)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.0.0.0-pre9)
+AC_INIT(showeq, 6.0.0.0-pre10)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
Modified: showeq/branches/pre_6_0_beta/src/everquest.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/everquest.h 2020-01-11 18:10:43 UTC (rev 1004)
+++ showeq/branches/pre_6_0_beta/src/everquest.h 2020-01-16 23:47:46 UTC (rev 1005)
@@ -1112,22 +1112,23 @@
{
unsigned pitch:12;
- signed x:19; // x coord (1st loc value)
- unsigned padding00:1;
+ signed deltaZ:13; // change in z
+ unsigned padding00:7;
- signed deltaZ:13; // change in z
unsigned heading:12; // heading
- unsigned padding01:7;
+ signed x:19; // x coord (1st loc value)
+ unsigned padding01:1;
+ signed deltaX:13; // change in x
signed deltaY:13; // change in y
- signed animation:10; // velocity
- unsigned padding02:9;
+ unsigned padding02:6;
- signed deltaX:13; // change in x
- signed z:19; // z coord (3rd loc value)
-
signed deltaHeading:10; // change in heading
signed y:19; // y coord (2nd loc value)
+ unsigned padding03:3;
+
+ signed z:19; // z coord (3rd loc value)
+ signed animation:10; // velocity
unsigned padding04:3;
};
@@ -2392,22 +2393,23 @@
/*0002*/ uint16_t spawnId2;
/*0004*/
unsigned pitch:12;
- signed x:19; // x coord (1st loc value)
- unsigned padding00:1;
+ signed deltaZ:13; // change in z
+ unsigned padding00:7;
/*0008*/
- signed deltaZ:13; // change in z
unsigned heading:12; // heading
- unsigned padding01:7;
+ signed x:19; // x coord (1st loc value)
+ unsigned padding01:1;
/*0012*/
+ signed deltaX:13; // change in x
signed deltaY:13; // change in y
- signed animation:10; // velocity
- unsigned padding02:9;
+ unsigned padding02:6;
/*0016*/
- signed deltaX:13; // change in x
- signed z:19; // z coord (3rd loc value)
-/*0020*/
signed deltaHeading:10; // change in heading
signed y:19; // y coord (2nd loc value)
+ unsigned padding03:3;
+/*0020*/
+ signed z:19; // z coord (3rd loc value)
+ signed animation:10; // velocity
unsigned padding04:3;
/*0024*/
};
@@ -2414,7 +2416,7 @@
/*
** Self Position Update
-** Length: 44 Octets
+** Length: 42 Octets
** OpCode: PlayerPosCode
*/
@@ -2425,29 +2427,27 @@
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
unsigned pitch:12; // pitch (up/down heading)
- unsigned padding00:20;
+ unsigned heading:12; // Heading
+ unsigned padding00:8;
/*0010*/
+ float z; // z coord (3rd loc value)
+/*0014*/
float deltaZ; // Change in z
-/*0014*/
- unsigned heading:12; // Heading
- unsigned padding02:20;
/*0018*/
- float z; // z coord (3rd loc value)
+ float x; // x coord (1st loc value)
/*0022*/
signed deltaHeading:10; // change in heading
unsigned padding04:22;
/*0026*/
- float y; // y coord (2nd loc value)
+ float deltaY; // Change in y
/*0030*/
- float x; // x coord (1st loc value)
+ float deltaX; // Change in x
/*0034*/
signed animation:10; // velocity
unsigned padding07:22;
/*0038*/
- float deltaY; // Change in y
+ float y; // y coord (2nd loc value)
/*0042*/
- float deltaX; // Change in x
-/*0044*/
};
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2020-01-11 18:10:45
|
Revision: 1004
http://sourceforge.net/p/seq/svn/1004
Author: cn187
Date: 2020-01-11 18:10:43 +0000 (Sat, 11 Jan 2020)
Log Message:
-----------
Add compiler flag to force cxx11 standard (fixes build on pre-gcc6)
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/configure.in
Modified: showeq/branches/pre_6_0_beta/configure.in
===================================================================
--- showeq/branches/pre_6_0_beta/configure.in 2020-01-11 05:27:07 UTC (rev 1003)
+++ showeq/branches/pre_6_0_beta/configure.in 2020-01-11 18:10:43 UTC (rev 1004)
@@ -460,7 +460,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}\\\" -DQT3_SUPPORT $CXXFLAGS"
+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}\\\" -DQT3_SUPPORT $CXXFLAGS -std=c++11"
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...> - 2020-01-11 05:27:09
|
Revision: 1003
http://sourceforge.net/p/seq/svn/1003
Author: cn187
Date: 2020-01-11 05:27:07 +0000 (Sat, 11 Jan 2020)
Log Message:
-----------
Fix find box always highlighting red as if error
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/filter.cpp
Modified: showeq/branches/pre_6_0_beta/src/filter.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/filter.cpp 2020-01-11 05:27:02 UTC (rev 1002)
+++ showeq/branches/pre_6_0_beta/src/filter.cpp 2020-01-11 05:27:07 UTC (rev 1003)
@@ -647,7 +647,7 @@
filter = it->second;
if (filter)
- filter->addFilter(filterPattern, minLevel, maxLevel);
+ return filter->addFilter(filterPattern, minLevel, maxLevel);
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2020-01-11 05:27:04
|
Revision: 1002
http://sourceforge.net/p/seq/svn/1002
Author: cn187
Date: 2020-01-11 05:27:02 +0000 (Sat, 11 Jan 2020)
Log Message:
-----------
Always update last find filter, even if new one is empty
This fixes the issue where nothing would highlight if you re-entered a
filter you had just used and cleared.
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/map.cpp
Modified: showeq/branches/pre_6_0_beta/src/map.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.cpp 2020-01-03 21:19:34 UTC (rev 1001)
+++ showeq/branches/pre_6_0_beta/src/map.cpp 2020-01-11 05:27:02 UTC (rev 1002)
@@ -4817,12 +4817,12 @@
needCommit = true;
}
+ m_lastFilter = str;
+
if(str.isEmpty())
regexpok(0);
else
{
- m_lastFilter = str;
-
bool valid = m_filterMgr->runtimeFilterAddFilter(m_runtimeFilterFlag, str);
needCommit = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2020-01-03 21:19:41
|
Revision: 1001
http://sourceforge.net/p/seq/svn/1001
Author: cn187
Date: 2020-01-03 21:19:34 +0000 (Fri, 03 Jan 2020)
Log Message:
-----------
Fix adding filters from spawnlist menus, fix filter dialog title bug
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/configure.in
showeq/branches/pre_6_0_beta/src/filtermgr.cpp
showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp
showeq/branches/pre_6_0_beta/src/spawnlistcommon.h
Modified: showeq/branches/pre_6_0_beta/configure.in
===================================================================
--- showeq/branches/pre_6_0_beta/configure.in 2019-12-22 14:07:36 UTC (rev 1000)
+++ showeq/branches/pre_6_0_beta/configure.in 2020-01-03 21:19:34 UTC (rev 1001)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.0.0.0-pre8)
+AC_INIT(showeq, 6.0.0.0-pre9)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
Modified: showeq/branches/pre_6_0_beta/src/filtermgr.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/filtermgr.cpp 2019-12-22 14:07:36 UTC (rev 1000)
+++ showeq/branches/pre_6_0_beta/src/filtermgr.cpp 2020-01-03 21:19:34 UTC (rev 1001)
@@ -125,7 +125,7 @@
QString FilterMgr::filterName(uint8_t filter) const
{
- return m_types->names(filter);
+ return m_types->name(filter);
}
void FilterMgr::loadFilters(void)
Modified: showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp 2019-12-22 14:07:36 UTC (rev 1000)
+++ showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp 2020-01-03 21:19:34 UTC (rev 1001)
@@ -534,49 +534,51 @@
connect (spawnListColMenu, SIGNAL(triggered(QAction*)),
this, SLOT(toggle_spawnListCol(QAction*)));
- int x;
- QMenu* filterMenu = new QMenu;
- m_id_filterMenu = insertItem("Add &Filter", filterMenu);
- setItemEnabled(m_id_filterMenu, false);
- x = filterMenu->insertItem("&Hunt...");
- filterMenu->setItemParameter(x, HUNT_FILTER);
- x = filterMenu->insertItem("&Caution...");
- filterMenu->setItemParameter(x, CAUTION_FILTER);
- x = filterMenu->insertItem("&Danger...");
- filterMenu->setItemParameter(x, DANGER_FILTER);
- x = filterMenu->insertItem("&Locate...");
- filterMenu->setItemParameter(x, LOCATE_FILTER);
- x = filterMenu->insertItem("&Alert...");
- filterMenu->setItemParameter(x, ALERT_FILTER);
- x = filterMenu->insertItem("&Filtered...");
- filterMenu->setItemParameter(x, FILTERED_FILTER);
- x = filterMenu->insertItem("&Tracer...");
- filterMenu->setItemParameter(x, TRACER_FILTER);
- connect (filterMenu, SIGNAL(activated(int)),
- this, SLOT(add_filter(int)));
+ QAction* tmpAction;
+ m_filterMenu = new QMenu("Add &Filter");
+ addMenu(m_filterMenu);
+ m_filterMenu->setEnabled(false);
+ tmpAction = m_filterMenu->addAction("&Hunt...");
+ tmpAction->setData(HUNT_FILTER);
+ tmpAction = m_filterMenu->addAction("&Caution...");
+ tmpAction->setData(CAUTION_FILTER);
+ tmpAction = m_filterMenu->addAction("&Danger...");
+ tmpAction->setData(DANGER_FILTER);
+ tmpAction = m_filterMenu->addAction("&Locate...");
+ tmpAction->setData(LOCATE_FILTER);
+ tmpAction = m_filterMenu->addAction("&Alert...");
+ tmpAction->setData(ALERT_FILTER);
+ tmpAction = m_filterMenu->addAction("&Filtered...");
+ tmpAction->setData(FILTERED_FILTER);
+ tmpAction = m_filterMenu->addAction("&Tracer...");
+ tmpAction->setData(TRACER_FILTER);
+ connect (m_filterMenu, SIGNAL(triggered(QAction*)),
+ this, SLOT(add_filter(QAction*)));
- QMenu* zoneFilterMenu = new QMenu;
- m_id_zoneFilterMenu = insertItem("Add &Zone Filter", zoneFilterMenu);
- setItemEnabled(m_id_zoneFilterMenu, false);
- x = zoneFilterMenu->insertItem("&Hunt...");
- zoneFilterMenu->setItemParameter(x, HUNT_FILTER);
- x = zoneFilterMenu->insertItem("&Caution...");
- zoneFilterMenu->setItemParameter(x, CAUTION_FILTER);
- x = zoneFilterMenu->insertItem("&Danger...");
- zoneFilterMenu->setItemParameter(x, DANGER_FILTER);
- x = zoneFilterMenu->insertItem("&Locate...");
- zoneFilterMenu->setItemParameter(x, LOCATE_FILTER);
- x = zoneFilterMenu->insertItem("&Alert...");
- zoneFilterMenu->setItemParameter(x, ALERT_FILTER);
- x = zoneFilterMenu->insertItem("&Filtered...");
- zoneFilterMenu->setItemParameter(x, FILTERED_FILTER);
- x = zoneFilterMenu->insertItem("&Tracer...");
- zoneFilterMenu->setItemParameter(x, TRACER_FILTER);
- connect (zoneFilterMenu, SIGNAL(activated(int)),
- this, SLOT(add_zoneFilter(int)));
+ m_zoneFilterMenu = new QMenu("Add &Zone Filter");
+ addMenu(m_zoneFilterMenu);
+ m_zoneFilterMenu->setEnabled(false);
+ tmpAction = m_zoneFilterMenu->addAction("&Hunt...");
+ tmpAction->setData(HUNT_FILTER);
+ tmpAction = m_zoneFilterMenu->addAction("&Caution...");
+ tmpAction->setData(CAUTION_FILTER);
+ tmpAction = m_zoneFilterMenu->addAction("&Danger...");
+ tmpAction->setData(DANGER_FILTER);
+ tmpAction = m_zoneFilterMenu->addAction("&Locate...");
+ tmpAction->setData(LOCATE_FILTER);
+ tmpAction = m_zoneFilterMenu->addAction("&Alert...");
+ tmpAction->setData(ALERT_FILTER);
+ tmpAction = m_zoneFilterMenu->addAction("&Filtered...");
+ tmpAction->setData(FILTERED_FILTER);
+ tmpAction = m_zoneFilterMenu->addAction("&Tracer...");
+ tmpAction->setData(TRACER_FILTER);
+ connect (m_zoneFilterMenu, SIGNAL(triggered(QAction*)),
+ this, SLOT(add_zoneFilter(QAction*)));
+
insertSeparator(-1);
+ int x;
x = insertItem("&Add Category...", this, SLOT(add_category(int)));
m_id_edit_category =
insertItem("&Edit Category...", this, SLOT(edit_category(int)));
@@ -633,22 +635,18 @@
m_currentItem = item;
// enable/disable item depending on if there is one
- setItemEnabled(m_id_filterMenu, (item != NULL));
- setItemEnabled(m_id_zoneFilterMenu, (item != NULL));
+ m_filterMenu->setEnabled(item != NULL);
+ m_zoneFilterMenu->setEnabled(item != NULL);
if (item != NULL)
{
- changeItem(m_id_filterMenu,
- "Add '" + item->name() + "' &Filter");
- changeItem(m_id_zoneFilterMenu,
- "Add '" + item->name() + "' &Zone Filter");
+ m_filterMenu->setTitle("Add '" + item->name() + "' &Filter");
+ m_zoneFilterMenu->setTitle("Add '" + item->name() + "' &Zone Filter");
}
else
{
- changeItem(m_id_filterMenu,
- "Add &Filter");
- changeItem(m_id_zoneFilterMenu,
- "Add &Zone Filter");
+ m_filterMenu->setTitle("Add &Filter");
+ m_zoneFilterMenu->setTitle("Add &Zone Filter");
}
}
@@ -658,12 +656,12 @@
m_spawnlist->setColumnVisible(colnum, col->isChecked());
}
-void SpawnListMenu::add_filter(int id)
+void SpawnListMenu::add_filter(QAction* selection)
{
if (m_currentItem == NULL)
return;
- int filter = itemParameter(id);
+ int filter = selection->data().value<int>();
QString filterName = m_filterMgr->filterName(filter);
QString filterString = m_currentItem->filterString();
@@ -681,12 +679,12 @@
m_filterMgr->addFilter(filter, filterString);
}
-void SpawnListMenu::add_zoneFilter(int id)
+void SpawnListMenu::add_zoneFilter(QAction* selection)
{
if (m_currentItem == NULL)
return;
- int filter = itemParameter(id);
+ int filter = selection->data().value<int>();
QString filterName = m_filterMgr->filterName(filter);
QString filterString = m_currentItem->filterString();
Modified: showeq/branches/pre_6_0_beta/src/spawnlistcommon.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlistcommon.h 2019-12-22 14:07:36 UTC (rev 1000)
+++ showeq/branches/pre_6_0_beta/src/spawnlistcommon.h 2020-01-03 21:19:34 UTC (rev 1001)
@@ -127,8 +127,8 @@
protected slots:
void init_Menu(void);
void toggle_spawnListCol( QAction* col );
- void add_filter(int id);
- void add_zoneFilter(int id);
+ void add_filter(QAction* selection);
+ void add_zoneFilter(QAction* selection);
void add_category(int id);
void edit_category(int id);
void delete_category(int id);
@@ -143,8 +143,8 @@
CategoryMgr* m_categoryMgr;
const Category* m_currentCategory;
const Item* m_currentItem;
- int m_id_filterMenu;
- int m_id_zoneFilterMenu;
+ QMenu* m_filterMenu;
+ QMenu* m_zoneFilterMenu;
QAction* m_action_spawnList_Cols[tSpawnColMaxCols];
int m_id_edit_category;
int m_id_delete_category;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2019-12-22 14:07:37
|
Revision: 1000
http://sourceforge.net/p/seq/svn/1000
Author: theblueadept
Date: 2019-12-22 14:07:36 +0000 (Sun, 22 Dec 2019)
Log Message:
-----------
Tag for release 5.13.10.90
Added Paths:
-----------
showeq/tags/v5_13_10_90/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2019-12-22 14:06:48
|
Revision: 999
http://sourceforge.net/p/seq/svn/999
Author: theblueadept
Date: 2019-12-22 14:06:45 +0000 (Sun, 22 Dec 2019)
Log Message:
-----------
Historical checkin for 12/22/19
- Updated Opcodes (Newby and cn187)
- Updated Structs (Newby)
version to 5.13.10.90
Modified Paths:
--------------
showeq/trunk/ChangeLog
showeq/trunk/conf/zoneopcodes.xml
showeq/trunk/configure.in
showeq/trunk/src/everquest.h
showeq/trunk/src/spawnshell.cpp
showeq/trunk/src/zones.h
Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog 2019-12-21 01:54:31 UTC (rev 998)
+++ showeq/trunk/ChangeLog 2019-12-22 14:06:45 UTC (rev 999)
@@ -1,3 +1,10 @@
+BlueAdept (12/22/19)
+-------------------
+- Updated version to 5.13.10.90
+- Support EQ patch 12/20/19
+- Updated Opcodes (Newby and cn187)
+- Updated Structs (Newby)
+
BlueAdept (11/22/19)
-------------------
- Updated version to 5.13.10.89
Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml 2019-12-21 01:54:31 UTC (rev 998)
+++ showeq/trunk/conf/zoneopcodes.xml 2019-12-22 14:06:45 UTC (rev 999)
@@ -3,78 +3,78 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="524b" name="OP_PlayerProfile" updated="11/20/19">
+ <opcode id="614d" name="OP_PlayerProfile" updated="12/20/19">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="107c" name="OP_ZoneEntry" updated="11/20/19">
+ <opcode id="52bf" name="OP_ZoneEntry" updated="12/20/19">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="1db9" name="OP_TimeOfDay" updated="11/20/19">
+ <opcode id="12b8" name="OP_TimeOfDay" updated="12/20/19">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6fdf" name="OP_NewZone" updated="11/20/19">
+ <opcode id="2456" name="OP_NewZone" updated="12/20/19">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="07a5" name="OP_SpawnDoor" updated="11/20/19">
+ <opcode id="131c" name="OP_SpawnDoor" updated="12/20/19">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="7bd3" name="OP_GroundSpawn" updated="11/20/19">
+ <opcode id="163d" name="OP_GroundSpawn" updated="12/20/19">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="75df" name="OP_SendZonePoints" updated="11/20/19">
+ <opcode id="509a" name="OP_SendZonePoints" updated="12/20/19">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="073e" name="OP_AAExpUpdate" updated="11/20/19">
+ <opcode id="084a" name="OP_AAExpUpdate" updated="12/20/19">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="761f" name="OP_ExpUpdate" updated="06/19/19">
+ <opcode id="330d" name="OP_ExpUpdate" updated="12/20/19">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="335a" name="OP_GuildMOTD" updated="11/20/19">
+ <opcode id="2a4a" name="OP_GuildMOTD" updated="12/20/19">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="24e1" name="OP_ClientUpdate" updated="11/20/19">
+ <opcode id="32d0" name="OP_ClientUpdate" updated="12/20/19">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="054a" name="OP_NpcMoveUpdate" updated="11/20/19">
+ <opcode id="30ac" name="OP_NpcMoveUpdate" updated="12/20/19">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="0c4d" name="OP_MobUpdate" updated="11/20/19">
+ <opcode id="631c" name="OP_MobUpdate" updated="12/20/19">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="1ad1" name="OP_DeleteSpawn" updated="11/20/19">
+ <opcode id="0069" name="OP_DeleteSpawn" updated="12/20/19">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="76aa" name="OP_RemoveSpawn" updated="11/20/19">
+ <opcode id="7c46" name="OP_RemoveSpawn" updated="12/20/19">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="059a" name="OP_Death" updated="11/20/19">
+ <opcode id="3af4" name="OP_Death" updated="12/20/19">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1285" name="OP_WearChange" updated="11/20/19">
+ <opcode id="611c" name="OP_WearChange" updated="12/20/19">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="176e" name="OP_SpawnAppearance" updated="11/20/19">
+ <opcode id="1566" name="OP_SpawnAppearance" updated="12/20/19">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
@@ -82,32 +82,32 @@
<comment>Server updating on hunger/thirst</comment>
<payload dir="server" typename="staminaStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6d76" name="OP_HPUpdate" updated="06/19/19">
+ <opcode id="2bde" name="OP_HPUpdate" updated="12/20/19">
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="76c7" name="OP_GuildMemberUpdate" updated="11/20/19">
+ <opcode id="6c62" name="OP_GuildMemberUpdate" updated="12/20/19">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="747d" name="OP_ClickObject" updated="11/20/19">
+ <opcode id="2861" name="OP_ClickObject" updated="12/20/19">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="29e5" name="OP_Action" updated="11/20/19">
+ <opcode id="0fb9" name="OP_Action" updated="12/20/19">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2301" name="OP_Action2" updated="11/20/19">
+ <opcode id="52aa" name="OP_Action2" updated="12/20/19">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="2123" name="OP_Consider" updated="11/20/19">
+ <opcode id="62d0" name="OP_Consider" updated="12/20/19">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2d6a" name="OP_TargetMouse" updated="11/20/19">
+ <opcode id="0476" name="OP_TargetMouse" updated="12/20/19">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
@@ -123,7 +123,7 @@
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="3767" name="OP_ZoneChange" updated="11/20/19">
+ <opcode id="05b5" name="OP_ZoneChange" updated="12/20/19">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -175,11 +175,11 @@
<comment>StartCastCode</comment>
<payload dir="both" typename="startCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6426" name="OP_SwapSpell" updated="06/19/19">
+ <opcode id="23a2" name="OP_SwapSpell" updated="12/20/19">
<comment>TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1b58" name="OP_MemorizeSpell" updated="06/19/19">
+ <opcode id="0334" name="OP_MemorizeSpell" updated="12/20/19">
<comment>MemSpellCode</comment>
<payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
</opcode>
@@ -191,19 +191,19 @@
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="09e2" name="OP_SimpleMessage" updated="11/20/19">
+ <opcode id="4164" name="OP_SimpleMessage" updated="12/20/19">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="65c1" name="OP_FormattedMessage" updated="11/20/19">
+ <opcode id="2a0a" name="OP_FormattedMessage" updated="12/20/19">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="5575" name="OP_CommonMessage" updated="11/20/19">
+ <opcode id="751b" name="OP_CommonMessage" updated="12/20/19">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="683c" name="OP_SpecialMesg" updated="11/20/19">
+ <opcode id="716a" name="OP_SpecialMesg" updated="12/20/19">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
@@ -223,7 +223,7 @@
<comment>Server replying with deny information after /deny</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2389" name="OP_ManaChange" updated="06/19/19">
+ <opcode id="21d0" name="OP_ManaChange" updated="12/20/19">
<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"/>
@@ -244,7 +244,7 @@
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7019" name="OP_LevelUpdate" updated="06/19/19">
+ <opcode id="3a6d" name="OP_LevelUpdate" updated="12/20/19">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
@@ -307,7 +307,7 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="4e47" name="OP_GuildMemberList" updated="11/20/19">
+ <opcode id="04a5" name="OP_GuildMemberList" updated="12/20/19">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="0e49" name="OP_ExpandedGuildInfo" updated="11/20/19">
+ <opcode id="30d5" name="OP_ExpandedGuildInfo" updated="12/20/19">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
@@ -587,7 +587,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="0998" name="OP_Find" updated="11/20/19">
+ <opcode id="45e2" name="OP_Find" updated="12/20/19">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2019-12-21 01:54:31 UTC (rev 998)
+++ showeq/trunk/configure.in 2019-12-22 14:06:45 UTC (rev 999)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 5.13.10.89)
+AC_INIT(showeq, 5.13.10.90)
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 2019-12-21 01:54:31 UTC (rev 998)
+++ showeq/trunk/src/everquest.h 2019-12-22 14:06:45 UTC (rev 999)
@@ -1096,31 +1096,27 @@
struct
{
- signed deltaHeading:10; // change in heading
+ unsigned pitch:12;
+ signed x:19; // x coord (1st loc value)
+ unsigned padding00:1;
+
+ signed deltaZ:13; // change in z
+ unsigned heading:12; // heading
+ unsigned padding01:7;
+
signed deltaY:13; // change in y
- unsigned padding00:9;
+ signed animation:10; // velocity
+ unsigned padding02:9;
signed deltaX:13; // change in x
- signed animation:10; // velocity
- unsigned padding01:9;
-
- unsigned heading:12; // heading
- signed deltaZ:13; // change in z
- unsigned padding02:7;
-
signed z:19; // z coord (3rd loc value)
- unsigned padding03:13;
- signed x:19; // x coord (1st loc value)
- unsigned pitch:12;
- unsigned padding04:1;
-
+ signed deltaHeading:10; // change in heading
signed y:19; // y coord (2nd loc value)
- unsigned padding05:13;
+ unsigned padding04:3;
-
};
- int32_t posData[6];
+ int32_t posData[5];
};
/*0000*/ union
{
@@ -2371,7 +2367,7 @@
/*
** Player Position Update
-** Length: 28 Octets
+** Length: 24 Octets
** OpCode: PlayerPosCode
*/
@@ -2380,33 +2376,30 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/
- signed deltaHeading:10; // change in heading
+ unsigned pitch:12;
+ signed x:19; // x coord (1st loc value)
+ unsigned padding00:1;
+/*0008*/
+ signed deltaZ:13; // change in z
+ unsigned heading:12; // heading
+ unsigned padding01:7;
+/*0012*/
signed deltaY:13; // change in y
- unsigned padding00:9;
-/*0008*/
- signed deltaX:13; // change in x
signed animation:10; // velocity
- unsigned padding01:9;
-/*0012*/
- unsigned heading:12; // heading
- signed deltaZ:13; // change in z
- unsigned padding02:7;
+ unsigned padding02:9;
/*0016*/
+ signed deltaX:13; // change in x
signed z:19; // z coord (3rd loc value)
- unsigned padding03:13;
/*0020*/
- signed x:19; // x coord (1st loc value)
- unsigned pitch:12;
- unsigned padding04:1;
+ signed deltaHeading:10; // change in heading
+ signed y:19; // y coord (2nd loc value)
+ unsigned padding04:3;
/*0024*/
- signed y:19; // y coord (2nd loc value)
- unsigned padding05:13;
-/*0028*/
};
/*
** Self Position Update
-** Length: 42 Octets
+** Length: 44 Octets
** OpCode: PlayerPosCode
*/
@@ -2416,28 +2409,30 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
- float deltaY; // Change in y
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding00:20;
/*0010*/
- signed deltaHeading:10; // change in heading
- unsigned padding01:22;
+ float deltaZ; // Change in z
/*0014*/
- float x; // x coord (1st loc value)
+ unsigned heading:12; // Heading
+ unsigned padding02:20;
/*0018*/
- float y; // y coord (2nd loc value)
+ float z; // z coord (3rd loc value)
/*0022*/
- float z; // z coord (3rd loc value)
+ signed deltaHeading:10; // change in heading
+ unsigned padding04:22;
/*0026*/
- unsigned heading:12; // Heading
- signed animation:10; // velocity
- unsigned padding05:10;
+ float y; // y coord (2nd loc value)
/*0030*/
- float deltaZ; // Change in z
+ float x; // x coord (1st loc value)
/*0034*/
- unsigned pitch:12; // pitch (up/down heading)
- unsigned padding07:20;
+ signed animation:10; // velocity
+ unsigned padding07:22;
/*0038*/
+ float deltaY; // Change in y
+/*0042*/
float deltaX; // Change in x
-/*0042*/
+/*0044*/
};
/*
Modified: showeq/trunk/src/spawnshell.cpp
===================================================================
--- showeq/trunk/src/spawnshell.cpp 2019-12-21 01:54:31 UTC (rev 998)
+++ showeq/trunk/src/spawnshell.cpp 2019-12-22 14:06:45 UTC (rev 999)
@@ -721,7 +721,6 @@
spawn->posData[2] = netStream.readUInt32NC();
spawn->posData[3] = netStream.readUInt32NC();
spawn->posData[4] = netStream.readUInt32NC();
- spawn->posData[5] = netStream.readUInt32NC();
if(spawn->hasTitle)
{
Modified: showeq/trunk/src/zones.h
===================================================================
--- showeq/trunk/src/zones.h 2019-12-21 01:54:31 UTC (rev 998)
+++ showeq/trunk/src/zones.h 2019-12-22 14:06:45 UTC (rev 999)
@@ -829,13 +829,13 @@
{ "esianti", "Esianti: Palace of the Winds" }, // 821
{ "mearatas", "Mearatas: The Stone Demesne" }, // 822
{ "chamberoftears", "The Chamber of Tears" }, // 823
-{ "clz-winter", "Loading" }, // 824
-{ "clz-anniversary", "Loading" }, // 825
-{ "clz-spring", "Loading" }, // 826
-{ "clz-autumn", "Loading" }, // 827
-{ "clz-frostfell", "Loading" }, // 828
-{ NULL, NULL }, // 829
-{ NULL, NULL }, // 830
+{ "eastwastestwo", "The Eastern Wastes" }, // 824
+{ "frozenshadowtwo", "The Tower of Frozen Shadow" }, // 825
+{ "crystaltwoa", "The Ry`Gorr Mines" }, // 826
+{ "greatdividetwo", "The Great Divide" }, // 827
+{ "velketortwo", "Velketor's Labyrinth" }, // 828
+{ "kaeltwo", "Kael Drakkel" }, // 829
+{ "crystaltwob", "Crystal Caverns" }, // 830
{ NULL, NULL }, // 831
{ NULL, NULL }, // 832
{ NULL, NULL }, // 833
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2019-12-21 01:54:33
|
Revision: 998
http://sourceforge.net/p/seq/svn/998
Author: cn187
Date: 2019-12-21 01:54:31 +0000 (Sat, 21 Dec 2019)
Log Message:
-----------
Update opcodes/structs for 2019-12-20 patch
- Updated Opcodes (Newby)
- Updated Structs (Newby)
- Updated Opcodes (cn187)
Version to 6.0.0.0-pre8
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml
showeq/branches/pre_6_0_beta/configure.in
showeq/branches/pre_6_0_beta/src/everquest.h
Modified: showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml
===================================================================
--- showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml 2019-12-19 00:28:08 UTC (rev 997)
+++ showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml 2019-12-21 01:54:31 UTC (rev 998)
@@ -3,78 +3,78 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="2032" name="OP_PlayerProfile" updated="12/18/19">
+ <opcode id="614d" name="OP_PlayerProfile" updated="12/20/19">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="4064" name="OP_ZoneEntry" updated="12/18/19">
+ <opcode id="52bf" name="OP_ZoneEntry" updated="12/20/19">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="3fee" name="OP_TimeOfDay" updated="12/18/19">
+ <opcode id="12b8" name="OP_TimeOfDay" updated="12/20/19">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6dd1" name="OP_NewZone" updated="12/18/19">
+ <opcode id="2456" name="OP_NewZone" updated="12/20/19">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="143d" name="OP_SpawnDoor" updated="12/18/19">
+ <opcode id="131c" name="OP_SpawnDoor" updated="12/20/19">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="217d" name="OP_GroundSpawn" updated="12/18/19">
+ <opcode id="163d" name="OP_GroundSpawn" updated="12/20/19">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5b97" name="OP_SendZonePoints" updated="12/18/19">
+ <opcode id="509a" name="OP_SendZonePoints" updated="12/20/19">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="01a8" name="OP_AAExpUpdate" updated="12/18/19">
+ <opcode id="084a" name="OP_AAExpUpdate" updated="12/20/19">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="61d5" name="OP_ExpUpdate" updated="12/18/19">
+ <opcode id="330d" name="OP_ExpUpdate" updated="12/20/19">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="44ab" name="OP_GuildMOTD" updated="12/18/19">
+ <opcode id="2a4a" name="OP_GuildMOTD" updated="12/20/19">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="7814" name="OP_ClientUpdate" updated="12/18/19">
+ <opcode id="32d0" name="OP_ClientUpdate" updated="12/20/19">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1ddb" name="OP_NpcMoveUpdate" updated="12/18/19">
+ <opcode id="30ac" name="OP_NpcMoveUpdate" updated="12/20/19">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="610e" name="OP_MobUpdate" updated="12/18/19">
+ <opcode id="631c" name="OP_MobUpdate" updated="12/20/19">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="e885" name="OP_DeleteSpawn" updated="12/18/19">
+ <opcode id="0069" name="OP_DeleteSpawn" updated="12/20/19">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="66e0" name="OP_RemoveSpawn" updated="12/18/19">
+ <opcode id="7c46" name="OP_RemoveSpawn" updated="12/20/19">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="3333" name="OP_Death" updated="12/18/19">
+ <opcode id="3af4" name="OP_Death" updated="12/20/19">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7eb4" name="OP_WearChange" updated="12/18/19">
+ <opcode id="611c" name="OP_WearChange" updated="12/20/19">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0523" name="OP_SpawnAppearance" updated="12/18/19">
+ <opcode id="1566" name="OP_SpawnAppearance" updated="12/20/19">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
@@ -82,32 +82,32 @@
<comment>Server updating on hunger/thirst</comment>
<payload dir="server" typename="staminaStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6d76" name="OP_HPUpdate" updated="06/19/19">
+ <opcode id="2bde" name="OP_HPUpdate" updated="12/20/19">
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="4bf3" name="OP_GuildMemberUpdate" updated="12/18/19">
+ <opcode id="6c62" name="OP_GuildMemberUpdate" updated="12/20/19">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="4ef3" name="OP_ClickObject" updated="12/18/19">
+ <opcode id="2861" name="OP_ClickObject" updated="12/20/19">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="48fc" name="OP_Action" updated="12/18/19">
+ <opcode id="0fb9" name="OP_Action" updated="12/20/19">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1a3f" name="OP_Action2" updated="12/18/19">
+ <opcode id="52aa" name="OP_Action2" updated="12/20/19">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="3b18" name="OP_Consider" updated="12/18/19">
+ <opcode id="62d0" name="OP_Consider" updated="12/20/19">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="388e" name="OP_TargetMouse" updated="12/18/19">
+ <opcode id="0476" name="OP_TargetMouse" updated="12/20/19">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
@@ -123,7 +123,7 @@
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="06a5" name="OP_ZoneChange" updated="12/18/19">
+ <opcode id="05b5" name="OP_ZoneChange" updated="12/20/19">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -175,11 +175,11 @@
<comment>StartCastCode</comment>
<payload dir="both" typename="startCastStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6426" name="OP_SwapSpell" updated="06/19/19">
+ <opcode id="23a2" name="OP_SwapSpell" updated="12/20/19">
<comment>TradeSpellBookSlotsCode</comment>
<payload dir="both" typename="tradeSpellBookSlotsStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1b58" name="OP_MemorizeSpell" updated="06/19/19">
+ <opcode id="0334" name="OP_MemorizeSpell" updated="12/20/19">
<comment>MemSpellCode</comment>
<payload dir="both" typename="memSpellStruct" sizechecktype="match"/>
</opcode>
@@ -191,19 +191,19 @@
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="3031" name="OP_SimpleMessage" updated="12/18/19">
+ <opcode id="4164" name="OP_SimpleMessage" updated="12/20/19">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2dc8" name="OP_FormattedMessage" updated="12/18/19">
+ <opcode id="2a0a" name="OP_FormattedMessage" updated="12/20/19">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="6a14" name="OP_CommonMessage" updated="12/18/19">
+ <opcode id="751b" name="OP_CommonMessage" updated="12/20/19">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="6716" name="OP_SpecialMesg" updated="12/18/19">
+ <opcode id="716a" name="OP_SpecialMesg" updated="12/20/19">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
@@ -223,7 +223,7 @@
<comment>Server replying with deny information after /deny</comment>
<payload dir="server" typename="consentResponseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2389" name="OP_ManaChange" updated="06/19/19">
+ <opcode id="21d0" name="OP_ManaChange" updated="12/20/19">
<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"/>
@@ -244,7 +244,7 @@
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="3de8" name="OP_LevelUpdate" updated="12/18/19">
+ <opcode id="3a6d" name="OP_LevelUpdate" updated="12/20/19">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
@@ -307,7 +307,7 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="2ae7" name="OP_GuildMemberList" updated="12/18/19">
+ <opcode id="04a5" name="OP_GuildMemberList" updated="12/20/19">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="67ad" name="OP_ExpandedGuildInfo" updated="12/18/19">
+ <opcode id="30d5" name="OP_ExpandedGuildInfo" updated="12/20/19">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
@@ -587,7 +587,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="2717" name="OP_Find" updated="12/18/19">
+ <opcode id="45e2" name="OP_Find" updated="12/20/19">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
Modified: showeq/branches/pre_6_0_beta/configure.in
===================================================================
--- showeq/branches/pre_6_0_beta/configure.in 2019-12-19 00:28:08 UTC (rev 997)
+++ showeq/branches/pre_6_0_beta/configure.in 2019-12-21 01:54:31 UTC (rev 998)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.0.0.0-pre7)
+AC_INIT(showeq, 6.0.0.0-pre8)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
Modified: showeq/branches/pre_6_0_beta/src/everquest.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/everquest.h 2019-12-19 00:28:08 UTC (rev 997)
+++ showeq/branches/pre_6_0_beta/src/everquest.h 2019-12-21 01:54:31 UTC (rev 998)
@@ -1111,25 +1111,25 @@
struct
{
+ unsigned pitch:12;
signed x:19; // x coord (1st loc value)
+ unsigned padding00:1;
+
signed deltaZ:13; // change in z
+ unsigned heading:12; // heading
+ unsigned padding01:7;
+ signed deltaY:13; // change in y
signed animation:10; // velocity
+ unsigned padding02:9;
+
signed deltaX:13; // change in x
- unsigned padding01:9;
-
- unsigned heading:12; // heading
signed z:19; // z coord (3rd loc value)
- unsigned padding02:1;
signed deltaHeading:10; // change in heading
signed y:19; // y coord (2nd loc value)
- unsigned padding03:3;
+ unsigned padding04:3;
- unsigned pitch:12;
- signed deltaY:13; // change in y
- unsigned padding04:7;
-
};
int32_t posData[5];
};
@@ -2391,30 +2391,30 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/
+ unsigned pitch:12;
signed x:19; // x coord (1st loc value)
+ unsigned padding00:1;
+/*0008*/
signed deltaZ:13; // change in z
-/*0008*/
+ unsigned heading:12; // heading
+ unsigned padding01:7;
+/*0012*/
+ signed deltaY:13; // change in y
signed animation:10; // velocity
+ unsigned padding02:9;
+/*0016*/
signed deltaX:13; // change in x
- unsigned padding01:9;
-/*0012*/
- unsigned heading:12; // heading
signed z:19; // z coord (3rd loc value)
- unsigned padding02:1;
-/*0016*/
+/*0020*/
signed deltaHeading:10; // change in heading
signed y:19; // y coord (2nd loc value)
- unsigned padding03:3;
-/*0020*/
- unsigned pitch:12;
- signed deltaY:13; // change in y
- unsigned padding04:7;
+ unsigned padding04:3;
/*0024*/
};
/*
** Self Position Update
-** Length: 42 Octets
+** Length: 44 Octets
** OpCode: PlayerPosCode
*/
@@ -2424,28 +2424,30 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding00:20;
+/*0010*/
float deltaZ; // Change in z
-/*0010*/
+/*0014*/
unsigned heading:12; // Heading
- unsigned padding01:20;
-/*0014*/
- float y; // y coord (2nd loc value)
+ unsigned padding02:20;
/*0018*/
- float x; // x coord (1st loc value)
+ float z; // z coord (3rd loc value)
/*0022*/
- float z; // z coord (3rd loc value)
+ signed deltaHeading:10; // change in heading
+ unsigned padding04:22;
/*0026*/
- signed animation:10; // velocity
- unsigned padding05:22;
+ float y; // y coord (2nd loc value)
/*0030*/
- float deltaY; // Change in y
+ float x; // x coord (1st loc value)
/*0034*/
- float deltaX; // Change in x
+ signed animation:10; // velocity
+ unsigned padding07:22;
/*0038*/
- unsigned pitch:12; // pitch (up/down heading)
- signed deltaHeading:10; // change in heading
- unsigned padding08:10;
+ float deltaY; // Change in y
/*0042*/
+ float deltaX; // Change in x
+/*0044*/
};
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2019-12-19 00:28:10
|
Revision: 997
http://sourceforge.net/p/seq/svn/997
Author: cn187
Date: 2019-12-19 00:28:08 +0000 (Thu, 19 Dec 2019)
Log Message:
-----------
Update opcodes/structs for 2019-12-18 patch
- Updated Opcodes (Newby)
- Updated Structs (Newby)
Version to 6.0.0.0-pre7
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml
showeq/branches/pre_6_0_beta/configure.in
showeq/branches/pre_6_0_beta/src/everquest.h
showeq/branches/pre_6_0_beta/src/spawnshell.cpp
showeq/branches/pre_6_0_beta/src/zones.h
Modified: showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml
===================================================================
--- showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml 2019-11-22 17:40:13 UTC (rev 996)
+++ showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml 2019-12-19 00:28:08 UTC (rev 997)
@@ -3,78 +3,78 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="524b" name="OP_PlayerProfile" updated="11/20/19">
+ <opcode id="2032" name="OP_PlayerProfile" updated="12/18/19">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="107c" name="OP_ZoneEntry" updated="11/20/19">
+ <opcode id="4064" name="OP_ZoneEntry" updated="12/18/19">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="1db9" name="OP_TimeOfDay" updated="11/20/19">
+ <opcode id="3fee" name="OP_TimeOfDay" updated="12/18/19">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6fdf" name="OP_NewZone" updated="11/20/19">
+ <opcode id="6dd1" name="OP_NewZone" updated="12/18/19">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="07a5" name="OP_SpawnDoor" updated="11/20/19">
+ <opcode id="143d" name="OP_SpawnDoor" updated="12/18/19">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="7bd3" name="OP_GroundSpawn" updated="11/20/19">
+ <opcode id="217d" name="OP_GroundSpawn" updated="12/18/19">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="75df" name="OP_SendZonePoints" updated="11/20/19">
+ <opcode id="5b97" name="OP_SendZonePoints" updated="12/18/19">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="073e" name="OP_AAExpUpdate" updated="11/20/19">
+ <opcode id="01a8" name="OP_AAExpUpdate" updated="12/18/19">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="52ec" name="OP_ExpUpdate" updated="11/20/19">
+ <opcode id="61d5" name="OP_ExpUpdate" updated="12/18/19">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="335a" name="OP_GuildMOTD" updated="11/20/19">
+ <opcode id="44ab" name="OP_GuildMOTD" updated="12/18/19">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="24e1" name="OP_ClientUpdate" updated="11/20/19">
+ <opcode id="7814" name="OP_ClientUpdate" updated="12/18/19">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="054a" name="OP_NpcMoveUpdate" updated="11/20/19">
+ <opcode id="1ddb" name="OP_NpcMoveUpdate" updated="12/18/19">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="0c4d" name="OP_MobUpdate" updated="11/20/19">
+ <opcode id="610e" name="OP_MobUpdate" updated="12/18/19">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="1ad1" name="OP_DeleteSpawn" updated="11/20/19">
+ <opcode id="e885" name="OP_DeleteSpawn" updated="12/18/19">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="76aa" name="OP_RemoveSpawn" updated="11/20/19">
+ <opcode id="66e0" name="OP_RemoveSpawn" updated="12/18/19">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="059a" name="OP_Death" updated="11/20/19">
+ <opcode id="3333" name="OP_Death" updated="12/18/19">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1285" name="OP_WearChange" updated="11/20/19">
+ <opcode id="7eb4" name="OP_WearChange" updated="12/18/19">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="176e" name="OP_SpawnAppearance" updated="11/20/19">
+ <opcode id="0523" name="OP_SpawnAppearance" updated="12/18/19">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
@@ -86,28 +86,28 @@
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="76c7" name="OP_GuildMemberUpdate" updated="11/02/19">
+ <opcode id="4bf3" name="OP_GuildMemberUpdate" updated="12/18/19">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="747d" name="OP_ClickObject" updated="11/20/19">
+ <opcode id="4ef3" name="OP_ClickObject" updated="12/18/19">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="29e5" name="OP_Action" updated="11/20/19">
+ <opcode id="48fc" name="OP_Action" updated="12/18/19">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2301" name="OP_Action2" updated="11/20/19">
+ <opcode id="1a3f" name="OP_Action2" updated="12/18/19">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="2123" name="OP_Consider" updated="11/20/19">
+ <opcode id="3b18" name="OP_Consider" updated="12/18/19">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2d6a" name="OP_TargetMouse" updated="10/16/19">
+ <opcode id="388e" name="OP_TargetMouse" updated="12/18/19">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
@@ -123,7 +123,7 @@
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="3767" name="OP_ZoneChange" updated="11/20/19">
+ <opcode id="06a5" name="OP_ZoneChange" updated="12/18/19">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -191,19 +191,19 @@
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="09e2" name="OP_SimpleMessage" updated="11/20/19">
+ <opcode id="3031" name="OP_SimpleMessage" updated="12/18/19">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="65c1" name="OP_FormattedMessage" updated="11/20/19">
+ <opcode id="2dc8" name="OP_FormattedMessage" updated="12/18/19">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="5575" name="OP_CommonMessage" updated="11/20/19">
+ <opcode id="6a14" name="OP_CommonMessage" updated="12/18/19">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="683c" name="OP_SpecialMesg" updated="11/20/19">
+ <opcode id="6716" name="OP_SpecialMesg" updated="12/18/19">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
@@ -244,7 +244,7 @@
<comment>Skill up code</comment>
<payload dir="server" typename="skillIncStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7019" name="OP_LevelUpdate" updated="06/19/19">
+ <opcode id="3de8" name="OP_LevelUpdate" updated="12/18/19">
<comment>LevelUpUpdateCode</comment>
<payload dir="server" typename="levelUpUpdateStruct" sizechecktype="match"/>
</opcode>
@@ -307,7 +307,7 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="4e47" name="OP_GuildMemberList" updated="11/20/19">
+ <opcode id="2ae7" name="OP_GuildMemberList" updated="12/18/19">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="0e49" name="OP_ExpandedGuildInfo" updated="11/20/19">
+ <opcode id="67ad" name="OP_ExpandedGuildInfo" updated="12/18/19">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
@@ -587,7 +587,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="0998" name="OP_Find" updated="11/20/19">
+ <opcode id="2717" name="OP_Find" updated="12/18/19">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
Modified: showeq/branches/pre_6_0_beta/configure.in
===================================================================
--- showeq/branches/pre_6_0_beta/configure.in 2019-11-22 17:40:13 UTC (rev 996)
+++ showeq/branches/pre_6_0_beta/configure.in 2019-12-19 00:28:08 UTC (rev 997)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.0.0.0-pre6)
+AC_INIT(showeq, 6.0.0.0-pre7)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
Modified: showeq/branches/pre_6_0_beta/src/everquest.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/everquest.h 2019-11-22 17:40:13 UTC (rev 996)
+++ showeq/branches/pre_6_0_beta/src/everquest.h 2019-12-19 00:28:08 UTC (rev 997)
@@ -1111,31 +1111,27 @@
struct
{
- signed deltaHeading:10; // change in heading
- signed deltaY:13; // change in y
- unsigned padding00:9;
+ signed x:19; // x coord (1st loc value)
+ signed deltaZ:13; // change in z
+ signed animation:10; // velocity
signed deltaX:13; // change in x
- signed animation:10; // velocity
unsigned padding01:9;
unsigned heading:12; // heading
- signed deltaZ:13; // change in z
- unsigned padding02:7;
-
signed z:19; // z coord (3rd loc value)
- unsigned padding03:13;
+ unsigned padding02:1;
- signed x:19; // x coord (1st loc value)
- unsigned pitch:12;
- unsigned padding04:1;
-
+ signed deltaHeading:10; // change in heading
signed y:19; // y coord (2nd loc value)
- unsigned padding05:13;
+ unsigned padding03:3;
+ unsigned pitch:12;
+ signed deltaY:13; // change in y
+ unsigned padding04:7;
};
- int32_t posData[6];
+ int32_t posData[5];
};
/*0000*/ union
{
@@ -2386,7 +2382,7 @@
/*
** Player Position Update
-** Length: 28 Octets
+** Length: 24 Octets
** OpCode: PlayerPosCode
*/
@@ -2395,28 +2391,25 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/
- signed deltaHeading:10; // change in heading
- signed deltaY:13; // change in y
- unsigned padding00:9;
+ signed x:19; // x coord (1st loc value)
+ signed deltaZ:13; // change in z
/*0008*/
+ signed animation:10; // velocity
signed deltaX:13; // change in x
- signed animation:10; // velocity
unsigned padding01:9;
/*0012*/
unsigned heading:12; // heading
- signed deltaZ:13; // change in z
- unsigned padding02:7;
+ signed z:19; // z coord (3rd loc value)
+ unsigned padding02:1;
/*0016*/
- signed z:19; // z coord (3rd loc value)
- unsigned padding03:13;
+ signed deltaHeading:10; // change in heading
+ signed y:19; // y coord (2nd loc value)
+ unsigned padding03:3;
/*0020*/
- signed x:19; // x coord (1st loc value)
unsigned pitch:12;
- unsigned padding04:1;
+ signed deltaY:13; // change in y
+ unsigned padding04:7;
/*0024*/
- signed y:19; // y coord (2nd loc value)
- unsigned padding05:13;
-/*0028*/
};
/*
@@ -2431,27 +2424,27 @@
/*0002*/ uint16_t spawnId; // Player's spawn id
/*0004*/ uint16_t unknown0004; // ***Placeholder
/*0006*/
- float deltaY; // Change in y
+ float deltaZ; // Change in z
/*0010*/
- signed deltaHeading:10; // change in heading
- unsigned padding01:22;
+ unsigned heading:12; // Heading
+ unsigned padding01:20;
/*0014*/
+ float y; // y coord (2nd loc value)
+/*0018*/
float x; // x coord (1st loc value)
-/*0018*/
- float y; // y coord (2nd loc value)
/*0022*/
float z; // z coord (3rd loc value)
/*0026*/
- unsigned heading:12; // Heading
signed animation:10; // velocity
- unsigned padding05:10;
+ unsigned padding05:22;
/*0030*/
- float deltaZ; // Change in z
+ float deltaY; // Change in y
/*0034*/
+ float deltaX; // Change in x
+/*0038*/
unsigned pitch:12; // pitch (up/down heading)
- unsigned padding07:20;
-/*0038*/
- float deltaX; // Change in x
+ signed deltaHeading:10; // change in heading
+ unsigned padding08:10;
/*0042*/
};
Modified: showeq/branches/pre_6_0_beta/src/spawnshell.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnshell.cpp 2019-11-22 17:40:13 UTC (rev 996)
+++ showeq/branches/pre_6_0_beta/src/spawnshell.cpp 2019-12-19 00:28:08 UTC (rev 997)
@@ -736,7 +736,6 @@
spawn->posData[2] = netStream.readUInt32NC();
spawn->posData[3] = netStream.readUInt32NC();
spawn->posData[4] = netStream.readUInt32NC();
- spawn->posData[5] = netStream.readUInt32NC();
if(spawn->hasTitle)
{
Modified: showeq/branches/pre_6_0_beta/src/zones.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/zones.h 2019-11-22 17:40:13 UTC (rev 996)
+++ showeq/branches/pre_6_0_beta/src/zones.h 2019-12-19 00:28:08 UTC (rev 997)
@@ -844,13 +844,13 @@
{ "esianti", "Esianti: Palace of the Winds" }, // 821
{ "mearatas", "Mearatas: The Stone Demesne" }, // 822
{ "chamberoftears", "The Chamber of Tears" }, // 823
-{ "clz-winter", "Loading" }, // 824
-{ "clz-anniversary", "Loading" }, // 825
-{ "clz-spring", "Loading" }, // 826
-{ "clz-autumn", "Loading" }, // 827
-{ "clz-frostfell", "Loading" }, // 828
-{ NULL, NULL }, // 829
-{ NULL, NULL }, // 830
+{ "eastwastestwo", "The Eastern Wastes" }, // 824
+{ "frozenshadowtwo", "The Tower of Frozen Shadow" }, // 825
+{ "crystaltwoa", "The Ry`Gorr Mines" }, // 826
+{ "greatdividetwo", "The Great Divide" }, // 827
+{ "velketortwo", "Velketor's Labyrinth" }, // 828
+{ "kaeltwo", "Kael Drakkel" }, // 829
+{ "crystaltwob", "Crystal Caverns" }, // 830
{ NULL, NULL }, // 831
{ NULL, NULL }, // 832
{ NULL, NULL }, // 833
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2019-11-22 17:40:15
|
Revision: 996
http://sourceforge.net/p/seq/svn/996
Author: theblueadept
Date: 2019-11-22 17:40:13 +0000 (Fri, 22 Nov 2019)
Log Message:
-----------
Tag for release 5.13.10.89
Added Paths:
-----------
showeq/tags/v5_13_10_89/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2019-11-22 17:39:40
|
Revision: 995
http://sourceforge.net/p/seq/svn/995
Author: theblueadept
Date: 2019-11-22 17:39:38 +0000 (Fri, 22 Nov 2019)
Log Message:
-----------
Historical checkin for 11/22/19
- Updated Opcodes (Newby)
- Updated Structs (Newby)
Version to 5.13.10.89
Modified Paths:
--------------
showeq/trunk/ChangeLog
showeq/trunk/conf/zoneopcodes.xml
showeq/trunk/configure.in
showeq/trunk/src/everquest.h
showeq/trunk/src/spawnshell.cpp
Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog 2019-11-21 02:16:50 UTC (rev 994)
+++ showeq/trunk/ChangeLog 2019-11-22 17:39:38 UTC (rev 995)
@@ -1,3 +1,10 @@
+BlueAdept (11/22/19)
+-------------------
+- Updated version to 5.13.10.89
+- Support EQ patch 11/20/19
+- Updated Opcodes (Newby)
+- Updated Structs (Newby)
+
BlueAdept (10/20/19)
-------------------
- Updated version to 5.13.10.88
Modified: showeq/trunk/conf/zoneopcodes.xml
===================================================================
--- showeq/trunk/conf/zoneopcodes.xml 2019-11-21 02:16:50 UTC (rev 994)
+++ showeq/trunk/conf/zoneopcodes.xml 2019-11-22 17:39:38 UTC (rev 995)
@@ -3,37 +3,37 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="16b8" name="OP_PlayerProfile" updated="10/16/19">
+ <opcode id="524b" name="OP_PlayerProfile" updated="11/20/19">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="033c" name="OP_ZoneEntry" updated="10/16/19">
+ <opcode id="107c" name="OP_ZoneEntry" updated="11/20/19">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="40e0" name="OP_TimeOfDay" updated="10/16/19">
+ <opcode id="1db9" name="OP_TimeOfDay" updated="11/20/19">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6f75" name="OP_NewZone" updated="10/16/19">
+ <opcode id="6fdf" name="OP_NewZone" updated="11/20/19">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7806" name="OP_SpawnDoor" updated="10/16/19">
+ <opcode id="07a5" name="OP_SpawnDoor" updated="11/20/19">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="07d4" name="OP_GroundSpawn" updated="10/16/19">
+ <opcode id="7bd3" name="OP_GroundSpawn" updated="11/20/19">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5860" name="OP_SendZonePoints" updated="10/16/19">
+ <opcode id="75df" name="OP_SendZonePoints" updated="11/20/19">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="22b9" name="OP_AAExpUpdate" updated="10/16/19">
+ <opcode id="073e" name="OP_AAExpUpdate" updated="11/20/19">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
@@ -41,40 +41,40 @@
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5b06" name="OP_GuildMOTD" updated="10/16/19">
+ <opcode id="335a" name="OP_GuildMOTD" updated="11/20/19">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="09f3" name="OP_ClientUpdate" updated="10/16/19">
+ <opcode id="24e1" name="OP_ClientUpdate" updated="11/20/19">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7025" name="OP_NpcMoveUpdate" updated="10/16/19">
+ <opcode id="054a" name="OP_NpcMoveUpdate" updated="11/20/19">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="56b2" name="OP_MobUpdate" updated="10/16/19">
+ <opcode id="0c4d" name="OP_MobUpdate" updated="11/20/19">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="7188" name="OP_DeleteSpawn" updated="10/16/19">
+ <opcode id="1ad1" name="OP_DeleteSpawn" updated="11/20/19">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="43ba" name="OP_RemoveSpawn" updated="10/16/19">
+ <opcode id="76aa" name="OP_RemoveSpawn" updated="11/20/19">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="6474" name="OP_Death" updated="10/16/19">
+ <opcode id="059a" name="OP_Death" updated="11/20/19">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="61ba" name="OP_WearChange" updated="10/16/19">
+ <opcode id="1285" name="OP_WearChange" updated="11/20/19">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2004" name="OP_SpawnAppearance" updated="10/16/19">
+ <opcode id="176e" name="OP_SpawnAppearance" updated="11/20/19">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
@@ -86,28 +86,28 @@
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1dee" name="OP_GuildMemberUpdate" updated="10/16/19">
+ <opcode id="76c7" name="OP_GuildMemberUpdate" updated="11/20/19">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="473a" name="OP_ClickObject" updated="10/16/19">
+ <opcode id="747d" name="OP_ClickObject" updated="11/20/19">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="60c0" name="OP_Action" updated="10/16/19">
+ <opcode id="29e5" name="OP_Action" updated="11/20/19">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5669" name="OP_Action2" updated="10/16/19">
+ <opcode id="2301" name="OP_Action2" updated="11/20/19">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="337c" name="OP_Consider" updated="10/16/19">
+ <opcode id="2123" name="OP_Consider" updated="11/20/19">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2e3f" name="OP_TargetMouse" updated="10/16/19">
+ <opcode id="2d6a" name="OP_TargetMouse" updated="11/20/19">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
@@ -123,7 +123,7 @@
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="7519" name="OP_ZoneChange" updated="10/16/19">
+ <opcode id="3767" name="OP_ZoneChange" updated="11/20/19">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -191,19 +191,19 @@
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="3e64" name="OP_SimpleMessage" updated="10/16/19">
+ <opcode id="09e2" name="OP_SimpleMessage" updated="11/20/19">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0d24" name="OP_FormattedMessage" updated="10/16/19">
+ <opcode id="65c1" name="OP_FormattedMessage" updated="11/20/19">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="4d98" name="OP_CommonMessage" updated="10/16/19">
+ <opcode id="5575" name="OP_CommonMessage" updated="11/20/19">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="72f8" name="OP_SpecialMesg" updated="10/16/19">
+ <opcode id="683c" name="OP_SpecialMesg" updated="11/20/19">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
@@ -307,7 +307,7 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="4898" name="OP_GuildMemberList" updated="10/16/19">
+ <opcode id="4e47" name="OP_GuildMemberList" updated="11/20/19">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="1c45" name="OP_ExpandedGuildInfo" updated="10/16/19">
+ <opcode id="0e49" name="OP_ExpandedGuildInfo" updated="11/20/19">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
@@ -587,7 +587,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="6efd" name="OP_Find" updated="10/16/19">
+ <opcode id="0998" name="OP_Find" updated="11/20/19">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in 2019-11-21 02:16:50 UTC (rev 994)
+++ showeq/trunk/configure.in 2019-11-22 17:39:38 UTC (rev 995)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 5.13.10.88)
+AC_INIT(showeq, 5.13.10.89)
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 2019-11-21 02:16:50 UTC (rev 994)
+++ showeq/trunk/src/everquest.h 2019-11-22 17:39:38 UTC (rev 995)
@@ -1100,23 +1100,27 @@
signed deltaY:13; // change in y
unsigned padding00:9;
- signed x:19; // x coord (1st loc value)
+ signed deltaX:13; // change in x
signed animation:10; // velocity
- unsigned padding01:3;
+ unsigned padding01:9;
unsigned heading:12; // heading
+ signed deltaZ:13; // change in z
+ unsigned padding02:7;
+
signed z:19; // z coord (3rd loc value)
- unsigned padding02:1;
+ unsigned padding03:13;
- signed deltaZ:13; // change in z
+ signed x:19; // x coord (1st loc value)
+ unsigned pitch:12;
+ unsigned padding04:1;
+
signed y:19; // y coord (2nd loc value)
+ unsigned padding05:13;
- unsigned pitch:12;
- signed deltaX:13; // change in x
- unsigned padding04:7;
};
- int32_t posData[5];
+ int32_t posData[6];
};
/*0000*/ union
{
@@ -2367,7 +2371,7 @@
/*
** Player Position Update
-** Length: 24 Octets
+** Length: 28 Octets
** OpCode: PlayerPosCode
*/
@@ -2380,21 +2384,24 @@
signed deltaY:13; // change in y
unsigned padding00:9;
/*0008*/
- signed x:19; // x coord (1st loc value)
+ signed deltaX:13; // change in x
signed animation:10; // velocity
- unsigned padding01:3;
+ unsigned padding01:9;
/*0012*/
unsigned heading:12; // heading
+ signed deltaZ:13; // change in z
+ unsigned padding02:7;
+/*0016*/
signed z:19; // z coord (3rd loc value)
- unsigned padding02:1;
-/*0016*/
- signed deltaZ:13; // change in z
- signed y:19; // y coord (2nd loc value)
+ unsigned padding03:13;
/*0020*/
+ signed x:19; // x coord (1st loc value)
unsigned pitch:12;
- signed deltaX:13; // change in x
- unsigned padding04:7;
+ unsigned padding04:1;
/*0024*/
+ signed y:19; // y coord (2nd loc value)
+ unsigned padding05:13;
+/*0028*/
};
/*
@@ -2414,22 +2421,22 @@
signed deltaHeading:10; // change in heading
unsigned padding01:22;
/*0014*/
- float deltaZ; // Change in z
+ float x; // x coord (1st loc value)
/*0018*/
float y; // y coord (2nd loc value)
/*0022*/
float z; // z coord (3rd loc value)
/*0026*/
+ unsigned heading:12; // Heading
signed animation:10; // velocity
- unsigned heading:12; // Heading
unsigned padding05:10;
/*0030*/
- float deltaX; // Change in x
+ float deltaZ; // Change in z
/*0034*/
unsigned pitch:12; // pitch (up/down heading)
unsigned padding07:20;
/*0038*/
- float x; // x coord (1st loc value)
+ float deltaX; // Change in x
/*0042*/
};
Modified: showeq/trunk/src/spawnshell.cpp
===================================================================
--- showeq/trunk/src/spawnshell.cpp 2019-11-21 02:16:50 UTC (rev 994)
+++ showeq/trunk/src/spawnshell.cpp 2019-11-22 17:39:38 UTC (rev 995)
@@ -721,6 +721,7 @@
spawn->posData[2] = netStream.readUInt32NC();
spawn->posData[3] = netStream.readUInt32NC();
spawn->posData[4] = netStream.readUInt32NC();
+ spawn->posData[5] = netStream.readUInt32NC();
if(spawn->hasTitle)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2019-11-21 02:16:51
|
Revision: 994
http://sourceforge.net/p/seq/svn/994
Author: cn187
Date: 2019-11-21 02:16:50 +0000 (Thu, 21 Nov 2019)
Log Message:
-----------
Historical checkin for 9/19/19
- Updated Opcodes (Newby)
- Updated Structs (Newby)
Version to 6.0.0.0-pre6
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml
showeq/branches/pre_6_0_beta/configure.in
showeq/branches/pre_6_0_beta/src/everquest.h
showeq/branches/pre_6_0_beta/src/spawnshell.cpp
Modified: showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml
===================================================================
--- showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml 2019-11-02 21:33:01 UTC (rev 993)
+++ showeq/branches/pre_6_0_beta/conf/zoneopcodes.xml 2019-11-21 02:16:50 UTC (rev 994)
@@ -3,78 +3,78 @@
<seqopcodes>
<!-- Critical opcodes used directly by ShowEQ -->
- <opcode id="16b8" name="OP_PlayerProfile" updated="10/16/19">
+ <opcode id="524b" name="OP_PlayerProfile" updated="11/20/19">
<comment>CharProfileCode</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="033c" name="OP_ZoneEntry" updated="10/16/19">
+ <opcode id="107c" name="OP_ZoneEntry" updated="11/20/19">
<comment>ZoneEntryCode</comment>
<payload dir="client" typename="ClientZoneEntryStruct" sizechecktype="match"/>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="40e0" name="OP_TimeOfDay" updated="10/16/19">
+ <opcode id="1db9" name="OP_TimeOfDay" updated="11/20/19">
<comment>TimeOfDayCode</comment>
<payload dir="server" typename="timeOfDayStruct" sizechecktype="match"/>
</opcode>
- <opcode id="6f75" name="OP_NewZone" updated="10/16/19">
+ <opcode id="6fdf" name="OP_NewZone" updated="11/20/19">
<comment>NewZoneCode</comment>
<payload dir="server" typename="newZoneStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7806" name="OP_SpawnDoor" updated="10/16/19">
+ <opcode id="07a5" name="OP_SpawnDoor" updated="11/20/19">
<comment>DoorSpawnsCode</comment>
<payload dir="server" typename="doorStruct" sizechecktype="modulus"/>
</opcode>
- <opcode id="07d4" name="OP_GroundSpawn" updated="10/16/19">
+ <opcode id="7bd3" name="OP_GroundSpawn" updated="11/20/19">
<comment>MakeDropCode</comment>
<payload dir="server" typename="makeDropStruct" sizechecktype="none"/>
<payload dir="client" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="5860" name="OP_SendZonePoints" updated="10/16/19">
+ <opcode id="75df" name="OP_SendZonePoints" updated="11/20/19">
<comment>Coords in a zone that will port you to another zone</comment>
<payload dir="server" typename="zonePointsStruct" sizechecktype="none"/>
</opcode>
- <opcode id="22b9" name="OP_AAExpUpdate" updated="10/16/19">
+ <opcode id="073e" name="OP_AAExpUpdate" updated="11/20/19">
<comment>Receiving AA experience. Also when percent to AA changes.</comment>
<payload dir="server" typename="altExpUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="761f" name="OP_ExpUpdate" updated="06/19/19">
+ <opcode id="52ec" name="OP_ExpUpdate" updated="11/20/19">
<comment>ExpUpdateCode</comment>
<payload dir="server" typename="expUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5b06" name="OP_GuildMOTD" updated="10/16/19">
+ <opcode id="335a" name="OP_GuildMOTD" updated="11/20/19">
<comment>GuildMOTD</comment>
<payload dir="server" typename="guildMOTDStruct" sizechecktype="none"/>
</opcode>
- <opcode id="09f3" name="OP_ClientUpdate" updated="10/16/19">
+ <opcode id="24e1" name="OP_ClientUpdate" updated="11/20/19">
<comment>Position updates</comment>
<payload dir="server" typename="playerSpawnPosStruct" sizechecktype="match"/>
<payload dir="both" typename="playerSelfPosStruct" sizechecktype="match"/>
</opcode>
- <opcode id="7025" name="OP_NpcMoveUpdate" updated="10/16/19">
+ <opcode id="054a" name="OP_NpcMoveUpdate" updated="11/20/19">
<comment>Position updates</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
- <opcode id="56b2" name="OP_MobUpdate" updated="10/16/19">
+ <opcode id="0c4d" name="OP_MobUpdate" updated="11/20/19">
<comment>MobUpdateCode</comment>
<payload dir="both" typename="spawnPositionUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="7188" name="OP_DeleteSpawn" updated="10/16/19">
+ <opcode id="1ad1" name="OP_DeleteSpawn" updated="11/20/19">
<comment>DeleteSpawnCode</comment>
<payload dir="both" typename="deleteSpawnStruct" sizechecktype="match"/>
</opcode>
- <opcode id="43ba" name="OP_RemoveSpawn" updated="10/16/19">
+ <opcode id="76aa" name="OP_RemoveSpawn" updated="11/20/19">
<comment>Remove spawn from zone</comment>
<payload dir="both" typename="removeSpawnStruct" sizechecktype="none"/>
</opcode>
- <opcode id="6474" name="OP_Death" updated="10/16/19">
+ <opcode id="059a" name="OP_Death" updated="11/20/19">
<comment>old NewCorpseCode</comment>
<payload dir="server" typename="newCorpseStruct" sizechecktype="match"/>
</opcode>
- <opcode id="61ba" name="OP_WearChange" updated="10/16/19">
+ <opcode id="1285" name="OP_WearChange" updated="11/20/19">
<comment>SpawnUpdateCode</comment>
<payload dir="both" typename="SpawnUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2004" name="OP_SpawnAppearance" updated="10/16/19">
+ <opcode id="176e" name="OP_SpawnAppearance" updated="11/20/19">
<comment>SpawnAppearanceCode</comment>
<payload dir="both" typename="spawnAppearanceStruct" sizechecktype="match"/>
</opcode>
@@ -86,28 +86,28 @@
<comment>NpcHpUpdateCode Update HP % of a PC or NPC</comment>
<payload dir="both" typename="hpNpcUpdateStruct" sizechecktype="match"/>
</opcode>
- <opcode id="1dee" name="OP_GuildMemberUpdate" updated="10/16/19">
+ <opcode id="76c7" name="OP_GuildMemberUpdate" updated="11/02/19">
<comment>Info regarding guild members</comment>
<payload dir="server" typename="GuildMemberUpdate" sizechecktype="match"/>
</opcode>
- <opcode id="473a" name="OP_ClickObject" updated="10/16/19">
+ <opcode id="747d" name="OP_ClickObject" updated="11/20/19">
<comment>Items dropped on the ground</comment>
<payload dir="both" typename="remDropStruct" sizechecktype="match"/>
</opcode>
- <opcode id="60c0" name="OP_Action" updated="10/16/19">
+ <opcode id="29e5" name="OP_Action" updated="11/20/19">
<comment>Spells cast etc</comment>
<payload dir="both" typename="actionStruct" sizechecktype="match"/>
<payload dir="both" typename="actionAltStruct" sizechecktype="match"/>
</opcode>
- <opcode id="5669" name="OP_Action2" updated="10/16/19">
+ <opcode id="2301" name="OP_Action2" updated="11/20/19">
<comment>Combat actions i.e. bash, kick etc</comment>
<payload dir="both" typename="action2Struct" sizechecktype="match"/>
</opcode>
- <opcode id="337c" name="OP_Consider" updated="10/16/19">
+ <opcode id="2123" name="OP_Consider" updated="11/20/19">
<comment>ConsiderCode</comment>
<payload dir="both" typename="considerStruct" sizechecktype="match"/>
</opcode>
- <opcode id="2e3f" name="OP_TargetMouse" updated="10/16/19">
+ <opcode id="2d6a" name="OP_TargetMouse" updated="10/16/19">
<comment>Targeting a person - old ClientTargetCode</comment>
<payload dir="both" typename="clientTargetStruct" sizechecktype="match"/>
</opcode>
@@ -123,7 +123,7 @@
<comment>Server putting players into shroud form</comment>
<payload dir="server" typename="spawnShroudSelf" sizechecktype="none"/>
</opcode>
- <opcode id="7519" name="OP_ZoneChange" updated="10/16/19">
+ <opcode id="3767" name="OP_ZoneChange" updated="11/20/19">
<comment>old ZoneChangeCode</comment>
<payload dir="both" typename="zoneChangeStruct" sizechecktype="match"/>
</opcode>
@@ -191,19 +191,19 @@
<comment>EmoteTextCode</comment>
<payload dir="both" typename="emoteTextStruct" sizechecktype="none"/>
</opcode>
- <opcode id="3e64" name="OP_SimpleMessage" updated="10/16/19">
+ <opcode id="09e2" name="OP_SimpleMessage" updated="11/20/19">
<comment>SimpleMessageCode</comment>
<payload dir="server" typename="simpleMessageStruct" sizechecktype="match"/>
</opcode>
- <opcode id="0d24" name="OP_FormattedMessage" updated="10/16/19">
+ <opcode id="65c1" name="OP_FormattedMessage" updated="11/20/19">
<comment>FormattedMessageCode i.e. pet dismissed etc</comment>
<payload dir="server" typename="formattedMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="4d98" name="OP_CommonMessage" updated="10/16/19">
+ <opcode id="5575" name="OP_CommonMessage" updated="11/20/19">
<comment>ChannelMessageCode i.e. /tell /ooc /shout etc</comment>
<payload dir="both" typename="channelMessageStruct" sizechecktype="none"/>
</opcode>
- <opcode id="72f8" name="OP_SpecialMesg" updated="10/16/19">
+ <opcode id="683c" name="OP_SpecialMesg" updated="11/20/19">
<comment>Communicate textual info to client including hail responses etc</comment>
<payload dir="server" typename="specialMessageStruct" sizechecktype="none"/>
</opcode>
@@ -307,7 +307,7 @@
<comment>List of group members - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="4898" name="OP_GuildMemberList" updated="10/16/19">
+ <opcode id="4e47" name="OP_GuildMemberList" updated="11/20/19">
<comment>List of guild members - Variable length</comment>
<payload dir="server" typename="uint8_t" sizechecktype="none"/>
</opcode>
@@ -367,7 +367,7 @@
<comment>Fellowship information - 2576 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="1c45" name="OP_ExpandedGuildInfo" updated="10/16/19">
+ <opcode id="0e49" name="OP_ExpandedGuildInfo" updated="11/20/19">
<comment>Guild ranks and other misc guild data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
@@ -587,7 +587,7 @@
<comment>Free to play nags and other data - Variable length</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
- <opcode id="6efd" name="OP_Find" updated="10/16/19">
+ <opcode id="0998" name="OP_Find" updated="11/20/19">
<comment>Find window data - 112 bytes</comment>
<payload dir="server" typename="unknown" sizechecktype="none"/>
</opcode>
Modified: showeq/branches/pre_6_0_beta/configure.in
===================================================================
--- showeq/branches/pre_6_0_beta/configure.in 2019-11-02 21:33:01 UTC (rev 993)
+++ showeq/branches/pre_6_0_beta/configure.in 2019-11-21 02:16:50 UTC (rev 994)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.0.0.0-pre5)
+AC_INIT(showeq, 6.0.0.0-pre6)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
Modified: showeq/branches/pre_6_0_beta/src/everquest.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/everquest.h 2019-11-02 21:33:01 UTC (rev 993)
+++ showeq/branches/pre_6_0_beta/src/everquest.h 2019-11-21 02:16:50 UTC (rev 994)
@@ -1115,23 +1115,27 @@
signed deltaY:13; // change in y
unsigned padding00:9;
- signed x:19; // x coord (1st loc value)
+ signed deltaX:13; // change in x
signed animation:10; // velocity
- unsigned padding01:3;
+ unsigned padding01:9;
unsigned heading:12; // heading
+ signed deltaZ:13; // change in z
+ unsigned padding02:7;
+
signed z:19; // z coord (3rd loc value)
- unsigned padding02:1;
+ unsigned padding03:13;
- signed deltaZ:13; // change in z
+ signed x:19; // x coord (1st loc value)
+ unsigned pitch:12;
+ unsigned padding04:1;
+
signed y:19; // y coord (2nd loc value)
+ unsigned padding05:13;
- unsigned pitch:12;
- signed deltaX:13; // change in x
- unsigned padding04:7;
};
- int32_t posData[5];
+ int32_t posData[6];
};
/*0000*/ union
{
@@ -2382,7 +2386,7 @@
/*
** Player Position Update
-** Length: 24 Octets
+** Length: 28 Octets
** OpCode: PlayerPosCode
*/
@@ -2395,21 +2399,24 @@
signed deltaY:13; // change in y
unsigned padding00:9;
/*0008*/
- signed x:19; // x coord (1st loc value)
+ signed deltaX:13; // change in x
signed animation:10; // velocity
- unsigned padding01:3;
+ unsigned padding01:9;
/*0012*/
unsigned heading:12; // heading
+ signed deltaZ:13; // change in z
+ unsigned padding02:7;
+/*0016*/
signed z:19; // z coord (3rd loc value)
- unsigned padding02:1;
-/*0016*/
- signed deltaZ:13; // change in z
- signed y:19; // y coord (2nd loc value)
+ unsigned padding03:13;
/*0020*/
+ signed x:19; // x coord (1st loc value)
unsigned pitch:12;
- signed deltaX:13; // change in x
- unsigned padding04:7;
+ unsigned padding04:1;
/*0024*/
+ signed y:19; // y coord (2nd loc value)
+ unsigned padding05:13;
+/*0028*/
};
/*
@@ -2429,22 +2436,22 @@
signed deltaHeading:10; // change in heading
unsigned padding01:22;
/*0014*/
- float deltaZ; // Change in z
+ float x; // x coord (1st loc value)
/*0018*/
float y; // y coord (2nd loc value)
/*0022*/
float z; // z coord (3rd loc value)
/*0026*/
+ unsigned heading:12; // Heading
signed animation:10; // velocity
- unsigned heading:12; // Heading
unsigned padding05:10;
/*0030*/
- float deltaX; // Change in x
+ float deltaZ; // Change in z
/*0034*/
unsigned pitch:12; // pitch (up/down heading)
unsigned padding07:20;
/*0038*/
- float x; // x coord (1st loc value)
+ float deltaX; // Change in x
/*0042*/
};
Modified: showeq/branches/pre_6_0_beta/src/spawnshell.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnshell.cpp 2019-11-02 21:33:01 UTC (rev 993)
+++ showeq/branches/pre_6_0_beta/src/spawnshell.cpp 2019-11-21 02:16:50 UTC (rev 994)
@@ -736,6 +736,7 @@
spawn->posData[2] = netStream.readUInt32NC();
spawn->posData[3] = netStream.readUInt32NC();
spawn->posData[4] = netStream.readUInt32NC();
+ spawn->posData[5] = netStream.readUInt32NC();
if(spawn->hasTitle)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2019-11-02 21:33:03
|
Revision: 993
http://sourceforge.net/p/seq/svn/993
Author: cn187
Date: 2019-11-02 21:33:01 +0000 (Sat, 02 Nov 2019)
Log Message:
-----------
Update version to 6.0.0.0-pre5
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/configure.in
Modified: showeq/branches/pre_6_0_beta/configure.in
===================================================================
--- showeq/branches/pre_6_0_beta/configure.in 2019-11-02 20:58:10 UTC (rev 992)
+++ showeq/branches/pre_6_0_beta/configure.in 2019-11-02 21:33:01 UTC (rev 993)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.0.0.0-pre4)
+AC_INIT(showeq, 6.0.0.0-pre5)
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...> - 2019-11-02 20:58:12
|
Revision: 992
http://sourceforge.net/p/seq/svn/992
Author: cn187
Date: 2019-11-02 20:58:10 +0000 (Sat, 02 Nov 2019)
Log Message:
-----------
Fix map rendering issues introduced with QT4 changes
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/mapcore.cpp
Modified: showeq/branches/pre_6_0_beta/src/mapcore.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/mapcore.cpp 2019-11-02 17:32:12 UTC (rev 991)
+++ showeq/branches/pre_6_0_beta/src/mapcore.cpp 2019-11-02 20:58:10 UTC (rev 992)
@@ -1751,12 +1751,12 @@
p.drawLine(param.calcXOffsetI(cur2DX_1),
param.calcYOffsetI(cur2DY_1),
param.calcXOffsetI(cur2DX_2),
- param.calcYOffsetI(cur2DX_2));
+ param.calcYOffsetI(cur2DY_2));
// current becomes the last
lastInBounds = curInBounds;
- cur2DX_1 = param.calcXOffsetI(cur2DX_2);
- cur2DY_1 = param.calcYOffsetI(cur2DY_2);
+ cur2DX_1 = cur2DX_2;
+ cur2DY_1 = cur2DY_2;
}
}
@@ -1806,8 +1806,8 @@
// current becomes the last
lastInBounds = curInBounds;
- curX_1 = param.calcXOffsetI(curX_2);
- curY_1 = param.calcYOffsetI(curY_2);
+ curX_1 = curX_2;
+ curY_1 = curY_2;
}
}
}
@@ -1898,8 +1898,8 @@
// current becomes the last
lastInBounds = curInBounds;
- cur2DX_1 = param.calcXOffsetI(cur2DX_2);
- cur2DY_1 = param.calcYOffsetI(cur2DY_2);
+ cur2DX_1 = cur2DX_2;
+ cur2DY_1 = cur2DY_2;
}
}
@@ -1959,8 +1959,8 @@
// current becomes the last
lastInBounds = curInBounds;
- curX_1 = param.calcXOffsetI(curX_2);
- curY_1 = param.calcYOffsetI(curY_2);
+ curX_1 = curX_2;
+ curY_1 = curY_2;
}
}
}
@@ -2074,8 +2074,8 @@
// current becomes the last
lastInBounds = curInBounds;
- cur2DX_1 = param.calcXOffsetI(cur2DX_2);
- cur2DY_1 = param.calcYOffsetI(cur2DY_2);
+ cur2DX_1 = cur2DX_2;
+ cur2DY_1 = cur2DY_2;
}
}
@@ -2156,8 +2156,8 @@
// current becomes the last/old
lastInBounds = curInBounds;
oldColor = newColor;
- curX_1 = param.calcXOffsetI(curX_2);
- curY_1 = param.calcYOffsetI(curY_2);
+ curX_1 = curX_2;
+ curY_1 = curY_2;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2019-11-02 17:32:14
|
Revision: 991
http://sourceforge.net/p/seq/svn/991
Author: cn187
Date: 2019-11-02 17:32:12 +0000 (Sat, 02 Nov 2019)
Log Message:
-----------
Add include demanded by older gcc versions
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/filter.cpp
Modified: showeq/branches/pre_6_0_beta/src/filter.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/filter.cpp 2019-10-31 04:03:23 UTC (rev 990)
+++ showeq/branches/pre_6_0_beta/src/filter.cpp 2019-11-02 17:32:12 UTC (rev 991)
@@ -29,6 +29,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstdint>
+#include <climits>
#include <QFile>
#include <Q3TextStream>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2019-10-31 04:03:25
|
Revision: 990
http://sourceforge.net/p/seq/svn/990
Author: cn187
Date: 2019-10-31 04:03:23 +0000 (Thu, 31 Oct 2019)
Log Message:
-----------
Move user directory creation to earlier in startup to avoid prefs file location issues
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/interface.cpp
showeq/branches/pre_6_0_beta/src/main.cpp
Modified: showeq/branches/pre_6_0_beta/src/interface.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.cpp 2019-10-31 02:00:47 UTC (rev 989)
+++ showeq/branches/pre_6_0_beta/src/interface.cpp 2019-10-31 04:03:23 UTC (rev 990)
@@ -251,10 +251,6 @@
for( int i = 1; i < 5; i++)
macstr[i] = "00:00:00:00:00:00";
-
- // setup the user directory
- m_dataLocationMgr->setupUserDirectory();
-
section = "Interface";
// Create the Spells object
Modified: showeq/branches/pre_6_0_beta/src/main.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/main.cpp 2019-10-31 02:00:47 UTC (rev 989)
+++ showeq/branches/pre_6_0_beta/src/main.cpp 2019-10-31 04:03:23 UTC (rev 990)
@@ -211,6 +211,9 @@
// create the data location manager (with user data under ~/.showeq
DataLocationMgr dataLocMgr(".showeq");
+ // setup the user directory
+ dataLocMgr.setupUserDirectory();
+
/* Initialize the parameters with default values */
QFileInfo configFileDefInfo = dataLocMgr.findExistingFile(".", "seqdef.xml",
true, false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2019-10-31 02:00:49
|
Revision: 989
http://sourceforge.net/p/seq/svn/989
Author: cn187
Date: 2019-10-31 02:00:47 +0000 (Thu, 31 Oct 2019)
Log Message:
-----------
Update version to 6.0.0.0-pre4
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/configure.in
Modified: showeq/branches/pre_6_0_beta/configure.in
===================================================================
--- showeq/branches/pre_6_0_beta/configure.in 2019-10-31 01:59:53 UTC (rev 988)
+++ showeq/branches/pre_6_0_beta/configure.in 2019-10-31 02:00:47 UTC (rev 989)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.0.0.0-pre3)
+AC_INIT(showeq, 6.0.0.0-pre4)
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...> - 2019-10-31 01:59:55
|
Revision: 988
http://sourceforge.net/p/seq/svn/988
Author: cn187
Date: 2019-10-31 01:59:53 +0000 (Thu, 31 Oct 2019)
Log Message:
-----------
Fix window titles for font and color picker dialogs
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/category.cpp
showeq/branches/pre_6_0_beta/src/map.cpp
showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp
showeq/branches/pre_6_0_beta/src/spawnpointlist.cpp
Modified: showeq/branches/pre_6_0_beta/src/category.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/category.cpp 2019-10-31 01:59:50 UTC (rev 987)
+++ showeq/branches/pre_6_0_beta/src/category.cpp 2019-10-31 01:59:53 UTC (rev 988)
@@ -163,7 +163,7 @@
void CategoryDlg::select_color(void)
{
QColor newColor =
- QColorDialog::getColor(m_Color->backgroundColor(), this, "Category Color");
+ QColorDialog::getColor(m_Color->backgroundColor(), this, QString("Category Color"));
if (newColor.isValid())
m_Color->setPalette(QPalette(QColor(newColor)));
Modified: showeq/branches/pre_6_0_beta/src/map.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.cpp 2019-10-31 01:59:50 UTC (rev 987)
+++ showeq/branches/pre_6_0_beta/src/map.cpp 2019-10-31 01:59:53 UTC (rev 988)
@@ -1394,7 +1394,7 @@
QString name = QString("ShowEQ - ") + m_map->preferenceName()
+ " Grid Tick Color";
QColor newColor = QColorDialog::getColor(m_map->gridTickColor(),
- m_map, (const char*)name);
+ m_map, name);
if (newColor.isValid())
m_map->setGridTickColor(newColor);
@@ -1403,9 +1403,9 @@
void MapMenu::select_gridLineColor()
{
QString name = QString("ShowEQ - ") + m_map->preferenceName()
- + " Grid Tick Color";
+ + " Grid Line Color";
QColor newColor = QColorDialog::getColor(m_map->gridLineColor(),
- m_map, (const char*)name);
+ m_map, name);
if (newColor.isValid())
m_map->setGridLineColor(newColor);
@@ -1416,7 +1416,7 @@
QString name = QString("ShowEQ - ") + m_map->preferenceName()
+ " Background Color";
QColor newColor = QColorDialog::getColor(m_map->backgroundColor(),
- m_map, (const char*)name);
+ m_map, name);
if (newColor.isValid())
m_map->setBackgroundColor(newColor);
@@ -1428,7 +1428,7 @@
+ " Font";
bool ok = false;
QFont newFont;
- newFont = QFontDialog::getFont(&ok, m_map->font(), m_map, (const char*)name);
+ newFont = QFontDialog::getFont(&ok, m_map->font(), m_map, name);
if (ok)
m_map->setFont(newFont);
@@ -1439,7 +1439,7 @@
QString name = QString("ShowEQ - ") + m_map->preferenceName()
+ " Player FOV Color";
QColor newColor = QColorDialog::getColor(m_map->fovColor(),
- m_map, (const char*)name);
+ m_map, name);
if (newColor.isValid())
m_map->setFOVColor(newColor);
Modified: showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp 2019-10-31 01:59:50 UTC (rev 987)
+++ showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp 2019-10-31 01:59:53 UTC (rev 988)
@@ -746,7 +746,7 @@
bool ok = false;
// get a new font
newFont = QFontDialog::getFont(&ok, m_spawnlistWindow->font(),
- this, "ShowEQ Spawn List Font");
+ this, QString("ShowEQ Spawn List Font"));
// if the user entered a font and clicked ok, set the windows font
Modified: showeq/branches/pre_6_0_beta/src/spawnpointlist.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnpointlist.cpp 2019-10-31 01:59:50 UTC (rev 987)
+++ showeq/branches/pre_6_0_beta/src/spawnpointlist.cpp 2019-10-31 01:59:53 UTC (rev 988)
@@ -514,7 +514,7 @@
// get a new font
newFont = QFontDialog::getFont(&ok, window->font(),
- this, "ShowEQ Spawn Point List Font");
+ this, QString("ShowEQ Spawn Point List Font"));
// if the user entered a font and clicked ok, set the windows font
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2019-10-31 01:59:52
|
Revision: 987
http://sourceforge.net/p/seq/svn/987
Author: cn187
Date: 2019-10-31 01:59:50 +0000 (Thu, 31 Oct 2019)
Log Message:
-----------
Fix setting custom con colors, typo in con color menu, and con color dialog title
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/interface.cpp
showeq/branches/pre_6_0_beta/src/player.h
Modified: showeq/branches/pre_6_0_beta/src/interface.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.cpp 2019-10-31 01:59:47 UTC (rev 986)
+++ showeq/branches/pre_6_0_beta/src/interface.cpp 2019-10-31 01:59:50 UTC (rev 987)
@@ -1123,7 +1123,7 @@
tmpAction = conColorBaseMenu->addAction("Even Spawn...");
tmpAction->setData(tEvenSpawn);
- tmpAction = conColorBaseMenu->addAction("Yello Spawn Base...");
+ tmpAction = conColorBaseMenu->addAction("Yellow Spawn Base...");
tmpAction->setData(tYellowSpawn);
tmpAction = conColorBaseMenu->addAction("Red Spawn Base...");
@@ -4516,14 +4516,13 @@
void
EQInterface::select_opt_conColorBase(QAction* con)
{
- //ColorLevel level = (ColorLevel)menuBar()->itemParameter(id);
- ColorLevel level = con->data().value<ColorLevel>();
+ ColorLevel level = (ColorLevel) con->data().value<int>();
// get the current color
QColor color = m_player->conColorBase(level);
// get the new color
- QColor newColor = QColorDialog::getColor(color, this, "ShowEQ - Con Color");
+ QColor newColor = QColorDialog::getColor(color, this, QString("ShowEQ - Con Color"));
// only set if the user selected a valid color and clicked ok
if (newColor.isValid())
Modified: showeq/branches/pre_6_0_beta/src/player.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/player.h 2019-10-31 01:59:47 UTC (rev 986)
+++ showeq/branches/pre_6_0_beta/src/player.h 2019-10-31 01:59:50 UTC (rev 987)
@@ -52,8 +52,6 @@
tMaxColorLevels = 8
};
-Q_DECLARE_METATYPE(ColorLevel)
-
//----------------------------------------------------------------------
// Player
class Player : public QObject, public Spawn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2019-10-31 01:59:49
|
Revision: 986
http://sourceforge.net/p/seq/svn/986
Author: cn187
Date: 2019-10-31 01:59:47 +0000 (Thu, 31 Oct 2019)
Log Message:
-----------
Fix color update delay when changing map grid line color
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/mapcore.cpp
Modified: showeq/branches/pre_6_0_beta/src/mapcore.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/mapcore.cpp 2019-10-31 01:59:45 UTC (rev 985)
+++ showeq/branches/pre_6_0_beta/src/mapcore.cpp 2019-10-31 01:59:47 UTC (rev 986)
@@ -2259,6 +2259,7 @@
(m_lastParam.showGridLines() != param.showGridLines()) ||
(m_lastParam.showGridTicks() != param.showGridTicks()) ||
(m_lastParam.showBackgroundImage() != param.showBackgroundImage()) ||
+ (m_lastParam.gridLineColor() != param.gridLineColor()) ||
(m_lastParam.gridTickColor() != param.gridTickColor()) ||
(m_lastParam.backgroundColor() != param.backgroundColor()) ||
(m_lastParam.font() != param.font()))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2019-10-31 01:59:46
|
Revision: 985
http://sourceforge.net/p/seq/svn/985
Author: cn187
Date: 2019-10-31 01:59:45 +0000 (Thu, 31 Oct 2019)
Log Message:
-----------
Fix qt header and moc detection for some systems
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/acinclude.m4
Modified: showeq/branches/pre_6_0_beta/acinclude.m4
===================================================================
--- showeq/branches/pre_6_0_beta/acinclude.m4 2019-10-31 01:59:41 UTC (rev 984)
+++ showeq/branches/pre_6_0_beta/acinclude.m4 2019-10-31 01:59:45 UTC (rev 985)
@@ -99,7 +99,7 @@
if [[ -n "$ac_qt_includes" ]]; then
AC_MSG_CHECKING([for Qt4 MOC]);
- AC_FIND_FILE(moc, [ $ac_qt_bindir \
+ AC_FIND_FILE(moc-qt4, [ $ac_qt_bindir \
$QTDIR/bin \
$QTDIR/src/moc \
/usr/local/qt4/bin \
@@ -121,8 +121,43 @@
/usr/src/qt-*/bin ],
MOC)
+ ac_qt_moc_bin=moc-qt4
- MOC="$MOC/moc"
+dnl if we don't find it named "moc-qt4" then we should check for "moc"
+ if [[ -z "$MOC" ]]; then
+
+ AC_FIND_FILE(moc, [ $ac_qt_bindir \
+ $QTDIR/bin \
+ $QTDIR/src/moc \
+ /usr/local/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/*/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
+
+ fi
+
+ if [[ -n "$ac_qt_moc_bin" ]]; then
+ MOC="$MOC/$ac_qt_moc_bin"
+ else
+ MOC="$MOC/moc"
+ fi
ac_cv_path_moc="$MOC"
if [[ -n "$ac_cv_path_moc" ]]; then
@@ -698,8 +733,8 @@
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 $qt_incdir`; do
- ac_qt_includes="$ac_qt_includes -I$qt_incdir/$dir"
+ for dir in `ls -1 -d $qt_incdir/Qt*`; do
+ ac_qt_includes="$ac_qt_includes -I$dir"
done;
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2019-10-31 01:59:43
|
Revision: 984
http://sourceforge.net/p/seq/svn/984
Author: cn187
Date: 2019-10-31 01:59:41 +0000 (Thu, 31 Oct 2019)
Log Message:
-----------
Fix map top/bottom control sizing/spacing
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/map.cpp
Modified: showeq/branches/pre_6_0_beta/src/map.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.cpp 2019-10-31 01:59:39 UTC (rev 983)
+++ showeq/branches/pre_6_0_beta/src/map.cpp 2019-10-31 01:59:41 UTC (rev 984)
@@ -4570,6 +4570,7 @@
m_vertical->addWidget(m_topControlBox);
m_topControlBox->setSpacing(1);
m_topControlBox->setMargin(0);
+ m_topControlBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
tmpPrefString = "ShowTopControlBox";
if (!pSEQPrefs->getPrefBool(tmpPrefString, prefString, 1))
m_topControlBox->hide();
@@ -4590,6 +4591,7 @@
m_vertical->addWidget(m_bottomControlBox);
m_bottomControlBox->setSpacing(1);
m_bottomControlBox->setMargin(0);
+ m_bottomControlBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
tmpPrefString = "ShowBottomControlBox";
if (!pSEQPrefs->getPrefBool(tmpPrefString, prefString, 1))
m_bottomControlBox->hide();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2019-10-31 01:59:40
|
Revision: 983
http://sourceforge.net/p/seq/svn/983
Author: cn187
Date: 2019-10-31 01:59:39 +0000 (Thu, 31 Oct 2019)
Log Message:
-----------
Fix enabling/disabling of optimization
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/configure.in
Modified: showeq/branches/pre_6_0_beta/configure.in
===================================================================
--- showeq/branches/pre_6_0_beta/configure.in 2019-10-31 01:59:34 UTC (rev 982)
+++ showeq/branches/pre_6_0_beta/configure.in 2019-10-31 01:59:39 UTC (rev 983)
@@ -22,6 +22,15 @@
dnl DX_PS_FEATURE(OFF)
dnl DX_INIT_DOXYGEN(ShowEQ, doxygen.cfg, dox)
+
+dnl per autoconf manual (section 5.10.4), set default CXXFLAGS to empty so gcc
+dnl doesn't automatically add optimization flags, making it difficult to
+dnl disable optimization for debugging purposes.
+dnl NOTE: this doesn't stop the user from setting their own CXXFLAGS value
+dnl in their environment or on the command line.
+: ${CXXFLAGS=""}
+
+
dnl Use CCd/CXXd rather than CC/CXX otherwise it cache's the value
dnl and prevents the alternate search from working. Would be better
dnl if there was someway to invalidate the cache entry. ??
@@ -323,8 +332,8 @@
;;
no)
AC_MSG_RESULT(no)
- USE_OPT_C=
- USE_OPT_CXX=
+ USE_OPT_C="-O0"
+ USE_OPT_CXX="-O0"
ac_cv_showeq_optimization=no
;;
6)
@@ -354,9 +363,9 @@
esac
],
[ AC_MSG_RESULT(yes)
- USE_OPT_C="-02"
+ USE_OPT_C="-O2"
USE_OPT_CXX="-O2"
- ac_cv_sins_optimization=yes
+ ac_cv_showeq_optimization=yes
]
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
