[Seq-cvs-commit] showeq/src group.cpp,1.6.16.5,1.6.16.6 packetstream.cpp,1.1.6.12,1.1.6.13 races.h,1.9.8.9,1.9.8.10 spawnshell.cpp,1.42.6.11,1.42.6.12

[Chad M. <cmm...@us...>]

Update of /cvsroot/seq/showeq/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8920/src

Modified Files:
      Tag: pre_5_0_beta
	group.cpp packetstream.cpp races.h spawnshell.cpp 
Log Message:

Fixed a problem with the net layer screwing up replacing existing records
in the cache if they were seen again.

Delete group members when the group manager is deleted.

Upped version to 25.


Index: packetstream.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/packetstream.cpp,v
retrieving revision 1.1.6.12
retrieving revision 1.1.6.13
diff -u -d -r1.1.6.12 -r1.1.6.13
--- packetstream.cpp	12 Jul 2005 00:00:58 -0000	1.1.6.12
+++ packetstream.cpp	22 Jul 2005 18:53:05 -0000	1.1.6.13
@@ -223,7 +223,9 @@
         seqDebug("SEQ: Update arq (%04x) stream %d in cache", serverArqSeq, m_streamid);
 #endif
 
-        *it->second = packet;
+        // Free the old packet at this place and replace with the new one.
+        delete it->second;
+        it->second = new EQProtocolPacket(packet, true);
      }
 #if defined(PACKET_PROCESS_DIAG) && defined(APPLY_CRC_CHECK)
      else

Index: spawnshell.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/spawnshell.cpp,v
retrieving revision 1.42.6.11
retrieving revision 1.42.6.12
diff -u -d -r1.42.6.11 -r1.42.6.12
--- spawnshell.cpp	2 Jul 2005 17:22:53 -0000	1.42.6.11
+++ spawnshell.cpp	22 Jul 2005 18:53:06 -0000	1.42.6.12
@@ -427,7 +427,7 @@
 
   for (int i = 0; i < spawndatasize; i++)
   {
-#if 0 
+#if 0
   // Dump position updates for debugging spawn struct position changes
   for (int j=54; j<70; i++)
   {
@@ -495,7 +495,7 @@
 void SpawnShell::newSpawn(const spawnStruct& s)
 {
 #ifdef SPAWNSHELL_DIAG
-   seqDebug("SpawnShell::newSpawn(spawnStruct *(name='%s'), bSelected=%s)", s.name, bSelected?"true":"false");
+   seqDebug("SpawnShell::newSpawn(spawnStruct *(name='%s'))", s.name);
 #endif
    // if this is the SPAWN_SELF it's the player
    if (s.NPC == SPAWN_SELF)

Index: races.h
===================================================================
RCS file: /cvsroot/seq/showeq/src/races.h,v
retrieving revision 1.9.8.9
retrieving revision 1.9.8.10
diff -u -d -r1.9.8.9 -r1.9.8.10
--- races.h	5 Jul 2005 11:48:53 -0000	1.9.8.9
+++ races.h	22 Jul 2005 18:53:06 -0000	1.9.8.10
@@ -426,7 +426,7 @@
     "Gelidran",               // 417
     "Discordling",            // 418
     "Girplan",                // 419
-    NULL,                     // 420
+    "Battlemaster Rhorius",   // 420
     NULL,                     // 421
     NULL,                     // 422
     NULL,                     // 423

Index: group.cpp
===================================================================
RCS file: /cvsroot/seq/showeq/src/group.cpp,v
retrieving revision 1.6.16.5
retrieving revision 1.6.16.6
diff -u -d -r1.6.16.5 -r1.6.16.6
--- group.cpp	19 Jun 2005 11:55:36 -0000	1.6.16.5
+++ group.cpp	22 Jul 2005 18:53:05 -0000	1.6.16.6
@@ -33,6 +33,10 @@
 
 GroupMgr::~GroupMgr()
 {
+  for (int i=0; i<MAX_GROUP_MEMBERS; i++)
+  {
+    delete m_members[i];
+  }
 }
 
 void GroupMgr::player(const uint8_t* data)