|
From: <xer...@us...> - 2026-07-16 19:53:53
|
Revision: 1666
http://sourceforge.net/p/seq/svn/1666
Author: xerxes00
Date: 2026-07-16 19:53:51 +0000 (Thu, 16 Jul 2026)
Log Message:
-----------
Merge 6.4.25 (trunk r1663) into the Legends branch.
Takes the version bump (now 6.4.25) and the everquest.h struct updates;
the position structs are reconciled to keep the Legends layouts where
they differ from live. conf/zoneopcodes.xml is intentionally left as the
Legends opcode map - trunk's live-id rotation is not merged.
Modified Paths:
--------------
showeq/branches/showeqlegends/ChangeLog
showeq/branches/showeqlegends/configure.in
showeq/branches/showeqlegends/src/everquest.h
Property Changed:
----------------
showeq/branches/showeqlegends/
Index: showeq/branches/showeqlegends
===================================================================
--- showeq/branches/showeqlegends 2026-07-16 19:05:22 UTC (rev 1665)
+++ showeq/branches/showeqlegends 2026-07-16 19:53:51 UTC (rev 1666)
Property changes on: showeq/branches/showeqlegends
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1 ##
+/showeq/trunk:1663
\ No newline at end of property
Modified: showeq/branches/showeqlegends/ChangeLog
===================================================================
--- showeq/branches/showeqlegends/ChangeLog 2026-07-16 19:05:22 UTC (rev 1665)
+++ showeq/branches/showeqlegends/ChangeLog 2026-07-16 19:53:51 UTC (rev 1666)
@@ -1,3 +1,9 @@
+cn187 (7/15/26)
+----------------
+- Update to version 6.4.25
+- Support for EQ Patch 7/15/26
+- Struct and opcode updates (Newby)
+
BlueAdept (5/21/26)
----------------
- Update to version 6.4.24
Modified: showeq/branches/showeqlegends/configure.in
===================================================================
--- showeq/branches/showeqlegends/configure.in 2026-07-16 19:05:22 UTC (rev 1665)
+++ showeq/branches/showeqlegends/configure.in 2026-07-16 19:53:51 UTC (rev 1666)
@@ -2,7 +2,7 @@
dnl $Id$ $Name$
AC_PREREQ(2.59)
-AC_INIT(showeq, 6.4.24)
+AC_INIT(showeq, 6.4.25)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
Modified: showeq/branches/showeqlegends/src/everquest.h
===================================================================
--- showeq/branches/showeqlegends/src/everquest.h 2026-07-16 19:05:22 UTC (rev 1665)
+++ showeq/branches/showeqlegends/src/everquest.h 2026-07-16 19:53:51 UTC (rev 1666)
@@ -597,7 +597,7 @@
/*0012*/ float z; // Zone in z coord in next zone
/*0016*/ float heading; // Zone in heading in next zone
/*0020*/ uint32_t unknown0020; // *** Placeholder
-/*0024*/
+/*0024*/ // EQL: struct ends here (trimmed to the wire size)
};
/*
@@ -2547,23 +2547,24 @@
/*0000*/ uint16_t spawnId;
/*0002*/ uint16_t spawnId2;
/*0004*/
+ unsigned heading:12; // heading
signed animation:10; // current animation
- unsigned pitch:12; // pitch (up/down heading)
unsigned padding00:10;
/*0008*/
signed deltaZ:13; // change in z
- signed deltaHeading:10; // change in heading
- unsigned padding01:9;
+ signed deltaX:13; // change in x
+ unsigned padding01:6;
/*0012*/
- signed z:19; // z coord (3rd loc value)
- unsigned heading:12; // heading
+ signed x:19; // x coord (1st loc value)
+ unsigned pitch:12; // pitch (up/down heading)
unsigned padding02:1;
/*0016*/
- signed deltaX:13; // change in x
signed y:19; // y coord (2nd loc value)
+ signed deltaHeading:10; // change in heading
+ unsigned padding03:3;
/*0020*/
+ signed z:19; // z coord (3rd loc value)
signed deltaY:13; // change in y
- signed x:19; // x coord (1st loc value)
/*0024*/
};
@@ -2572,24 +2573,39 @@
** Length: 42 Octets
** OpCode: PlayerPosCode
*/
+// EQL note: on EQ Legends this struct is NOT the self-position wire form.
+// The Legends c2s self-state (17-byte float records) is decoded raw in
+// Player::playerSelfState; the stock connects that consume this struct are
+// disconnected on Legends (see interface.cpp). Struct kept at the stock
+// live layout.
struct playerSelfPosStruct
{
-/*0000*/ float x; // x coord (Legends float at offset 0)
-/*0004*/ float y; // y coord
-/*0008*/ float z; // z coord
-/*0012*/ uint8_t posFlag; // 0x02 moving marker
-/*0013*/ uint8_t unknown0013;
-/*0014*/ uint8_t unknown0014;
-/*0015*/ uint8_t seq; // increments each update
-/*0016*/ uint16_t headingRaw; // heading region
- uint16_t spawnId;
- float deltaX;
- float deltaY;
- float deltaZ;
- unsigned heading:12;
- signed deltaHeading:10;
- unsigned pitch:12;
- signed animation:10;
+/*0000*/ uint16_t unknown0000; // ***Placeholder (update time counter?)
+/*0002*/ uint16_t spawnId; // Player's spawn id
+/*0004*/ uint16_t unknown0004; // ***Placeholder
+/*0006*/
+ float z; // z coord (3rd loc value)
+/*0010*/
+ float y; // y coord (2nd loc value)
+/*0014*/
+ unsigned heading:12; // heading
+ unsigned padding02:20;
+/*0018*/
+ float x; // x coord (1st loc value)
+/*0022*/
+ float deltaZ; // change in z
+/*0026*/
+ unsigned pitch:12; // pitch (up/down heading)
+ unsigned padding05:20;
+/*0030*/
+ float deltaX; // change in x
+/*0034*/
+ float deltaY; // change in y
+/*0038*/
+ signed animation:10; // current animation
+ signed deltaHeading:10; // change in heading
+ unsigned padding08:12;
+/*0042*/
};
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|