[Seq-cvs-commit] SF.net SVN: seq:[1147] showeq/branches/cn187_devel/src/spawnshell.cpp

[<cn...@us...>]

Revision: 1147
          http://sourceforge.net/p/seq/svn/1147
Author:   cn187
Date:     2021-02-18 17:45:52 +0000 (Thu, 18 Feb 2021)
Log Message:
-----------
Show held/worn equipment

Fix the stream parsing to correctly align the ItemIDs so that the
held/worn equipment shows up in the Info field.

Note: the rest of the equipment field ordering may or may not be correct
as a whole, but that can be addressed in the future if needed.

Modified Paths:
--------------
    showeq/branches/cn187_devel/src/spawnshell.cpp

Modified: showeq/branches/cn187_devel/src/spawnshell.cpp
===================================================================
--- showeq/branches/cn187_devel/src/spawnshell.cpp	2021-02-18 17:45:45 UTC (rev 1146)
+++ showeq/branches/cn187_devel/src/spawnshell.cpp	2021-02-18 17:45:52 UTC (rev 1147)
@@ -777,20 +777,22 @@
       netStream.skipBytes(36);
       for(i = 0; i < 9; i++)
       {
+         spawn->equipment[i].itemId = netStream.readUInt32NC();
          spawn->equipment[i].equip3 = netStream.readUInt32NC();
-         spawn->equipment[i].itemId = netStream.readUInt32NC();
          spawn->equipment[i].equip2 = netStream.readUInt32NC();
          spawn->equipment[i].equip1 = netStream.readUInt32NC();
          spawn->equipment[i].equip0 = netStream.readUInt32NC();
       }
    } else {
-      netStream.skipBytes(28);
+      netStream.skipBytes(20);
       spawn->equipment[7].itemId = netStream.readUInt32NC();
+      spawn->equipment[7].equip3 = netStream.readUInt32NC();
       spawn->equipment[7].equip2 = netStream.readUInt32NC();
       spawn->equipment[7].equip1 = netStream.readUInt32NC();
       spawn->equipment[7].equip0 = netStream.readUInt32NC();
       // secondary
       spawn->equipment[8].itemId = netStream.readUInt32NC();
+      spawn->equipment[8].equip3 = netStream.readUInt32NC();
       spawn->equipment[8].equip2 = netStream.readUInt32NC();
       spawn->equipment[8].equip1 = netStream.readUInt32NC();
       spawn->equipment[8].equip0 = netStream.readUInt32NC();

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