[Seq-cvs-commit] SF.net SVN: seq: [696] showeq/trunk

[<iea...@us...>]

Revision: 696
          http://seq.svn.sourceforge.net/seq/?rev=696&view=rev
Author:   ieatacid
Date:     2008-01-23 13:43:17 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
- Updated the position structs that are used for debugging in player.cpp and spawnshell.cpp

--this line, and those below, will be ignored--

M    configure.in
M    ChangeLog
M    src/spawnshell.cpp
M    src/player.cpp

Modified Paths:
--------------
    showeq/trunk/ChangeLog
    showeq/trunk/configure.in
    showeq/trunk/src/player.cpp
    showeq/trunk/src/spawnshell.cpp

Modified: showeq/trunk/ChangeLog
===================================================================
--- showeq/trunk/ChangeLog	2008-01-23 00:06:42 UTC (rev 695)
+++ showeq/trunk/ChangeLog	2008-01-23 21:43:17 UTC (rev 696)
@@ -1,5 +1,11 @@
 Version: $Id$ $Name$
 
+ieatacid (1/23/08)
+----------------
++ Updated version to 5.12.2
++ Updated the position structs that are used for debugging in
+	player.cpp and spawnshell.cpp
+
 ieatacid (1/21/08)
 ----------------
 + Updated version to 5.12.1.0

Modified: showeq/trunk/configure.in
===================================================================
--- showeq/trunk/configure.in	2008-01-23 00:06:42 UTC (rev 695)
+++ showeq/trunk/configure.in	2008-01-23 21:43:17 UTC (rev 696)
@@ -2,7 +2,7 @@
 dnl $Id$ $Name$
 
 AC_PREREQ(2.59)
-AC_INIT(showeq, 5.12.1.0)
+AC_INIT(showeq, 5.12.2.0)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CANONICAL_SYSTEM
 

Modified: showeq/trunk/src/player.cpp
===================================================================
--- showeq/trunk/src/player.cpp	2008-01-23 00:06:42 UTC (rev 695)
+++ showeq/trunk/src/player.cpp	2008-01-23 21:43:17 UTC (rev 696)
@@ -845,22 +845,23 @@
 #if 0
     // Debug positioning without having to recompile everything...
 #pragma pack(1)
-    struct pos
+struct pos
 {
 /*0000*/ uint16_t spawnId;        // Player's spawn id
 /*0002*/ uint8_t unknown0002[2];  // ***Placeholder (update time counter?)
 /*0004*/ uint8_t unknown0004[4];  // ***Placeholder
-/*0008*/ float deltaZ;            // Change in z
-/*0012*/ float x;                 // x coord (2nd loc value)
+/*0008*/ float x;                 // x coord (2nd loc value)
+/*0012*/ float y;                 // y coord (1st loc value)
 /*0016*/ signed deltaHeading:10;  // change in heading
-         signed animation:10;     // animation
-         unsigned padding0016:12; // ***Placeholder
-/*0020*/ float y;                 // y coord (1st loc value)
-/*0024*/ float deltaX;            // Change in x
-/*0028*/ unsigned heading:12;     // Directional heading
-         unsigned padding0028:20; // ***Placeholder
-/*0032*/ float deltaY;            // Change in y
-/*0036*/ float z;                 // z coord (3rd loc value)
+         unsigned animation:10;   // animation
+         unsigned padding0016:12; // ***Placeholder 
+/*0020*/ float deltaX;            // Change in x
+/*0024*/ float deltaY;            // Change in y
+/*0028*/ float z;                 // z coord (3rd loc value)
+/*0032*/ float deltaZ;            // Change in z
+/*0036*/ unsigned padding0036:10; // animation
+         unsigned heading:12;     // Directional heading
+         unsigned padding0037:10; // ***Placeholder 
 /*0040*/
 };
 #pragma pack(0)

Modified: showeq/trunk/src/spawnshell.cpp
===================================================================
--- showeq/trunk/src/spawnshell.cpp	2008-01-23 00:06:42 UTC (rev 695)
+++ showeq/trunk/src/spawnshell.cpp	2008-01-23 21:43:17 UTC (rev 696)
@@ -448,34 +448,33 @@
 #if 0
     // Debug positioning without having to recompile everything...
 #pragma pack(1)
-    struct pos
+struct pos
 {
 /*0002*/ signed   padding0000:12; // ***Placeholder
-         signed   x:19;           // x coord
-         signed   padding0002:1; // ***Placeholder
-/*0006*/ signed   deltaX:13;      // change in x
+         signed   deltaX:13;      // change in x
+         signed   padding0005:7;  // ***Placeholder
+/*0006*/ signed   deltaHeading:10;// change in heading
          signed   deltaY:13;      // change in y
-         signed   padding0006:6;  // ***Placeholder
-/*0010*/ signed   z:19;           // z coord
-         signed   deltaHeading:10;// change in heading
-         signed   padding0014:3;  // ***Placeholder
-/*0014*/ signed   y:19;           // y coord
+         signed   padding0006:9;  // ***Placeholder
+/*0010*/ signed   y:19;           // y coord
+         signed   animation:13;   // animation
+/*0014*/ unsigned heading:12;     // heading
+         signed   x:19;           // x coord
+         signed   padding0014:1;  // ***Placeholder
+/*0018*/ signed   z:19;           // z coord
          signed   deltaZ:13;      // change in z
-/*0018*/ signed   animation:10;   // animation
-         unsigned heading:12;     // heading
-         signed   padding0018:10;  // ***Placeholder
 /*0022*/
 };
 #pragma pack(0)
     struct pos *p = (struct pos *)(data + i*sizeof(spawnStruct) + 151);
-    printf("[%.2x](%f, %f, %f), dx %f dy %f dz %f head %f dhead %f anim %d (%x, %x, %x, %x, %x)\n",
+    printf("[%.2x](%f, %f, %f), dx %f dy %f dz %f head %f dhead %f anim %d (%x, %x, %x, %x)\n",
             zspawns[i].spawnId, 
             float(p->x)/8.0, float(p->y/8.0), float(p->z)/8.0, 
             float(p->deltaX)/4.0, float(p->deltaY)/4.0, 
             float(p->deltaZ)/4.0, 
             float(p->heading), float(p->deltaHeading),
             p->animation, p->padding0000, 
-            p->padding0002, p->padding0006, p->padding0014, p->padding0018);
+            p->padding0005, p->padding0006, p->padding0014);
 #endif
     newSpawn(zspawns[i]);
   }
@@ -632,30 +631,29 @@
 {
 /*0000*/ uint16_t spawnId;
 /*0002*/ signed   padding0000:12; // ***Placeholder
-         signed   x:19;           // x coord
-         signed   padding0002:1; // ***Placeholder
-/*0006*/ signed   deltaX:13;      // change in x
+         signed   deltaX:13;      // change in x
+         signed   padding0005:7;  // ***Placeholder
+/*0006*/ signed   deltaHeading:10;// change in heading
          signed   deltaY:13;      // change in y
-         signed   padding0006:6;  // ***Placeholder
-/*0010*/ signed   z:19;           // z coord
-         signed   deltaHeading:10;// change in heading
-         signed   padding0014:3;  // ***Placeholder
-/*0014*/ signed   y:19;           // y coord
+         signed   padding0006:9;  // ***Placeholder
+/*0010*/ signed   y:19;           // y coord
+         signed   animation:13;   // animation
+/*0014*/ unsigned heading:12;     // heading
+         signed   x:19;           // x coord
+         signed   padding0014:1;  // ***Placeholder
+/*0018*/ signed   z:19;           // z coord
          signed   deltaZ:13;      // change in z
-/*0018*/ signed   animation:10;   // animation
-         unsigned heading:12;     // heading
-         signed   padding0018:10;  // ***Placeholder
 /*0022*/
 };
 #pragma pack(0)
     struct pos *p = (struct pos *)data;
-    printf("[%.2x](%f, %f, %f), dx %f dy %f dz %f head %f dhead %f anim %d (%x, %x, %x, %x, %x)\n",
+    printf("[%.2x](%f, %f, %f), dx %f dy %f dz %f head %f dhead %f anim %d (%x, %x, %x, %x)\n",
             p->spawnId, float(p->x)/8.0, float(p->y/8.0), float(p->z)/8.0, 
             float(p->deltaX)/4.0, float(p->deltaY)/4.0, 
             float(p->deltaZ)/4.0, 
             float(p->heading), float(p->deltaHeading),
-            p->animation, p->padding0000, p->padding0002, 
-            p->padding0006, p->padding0014, p->padding0018);
+            p->animation, p->padding0000, p->padding0005, 
+            p->padding0006, p->padding0014);
 #endif
 
     updateSpawn(pupdate->spawnId, x, y, z, dx, dy, dz,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.