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

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

Revision: 1483
          http://sourceforge.net/p/seq/svn/1483
Author:   cn187
Date:     2024-07-06 03:20:59 +0000 (Sat, 06 Jul 2024)
Log Message:
-----------
Fix for entity fix fix

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

Modified: showeq/branches/cn187_devel/src/spawnshell.cpp
===================================================================
--- showeq/branches/cn187_devel/src/spawnshell.cpp	2024-07-05 23:41:20 UTC (rev 1482)
+++ showeq/branches/cn187_devel/src/spawnshell.cpp	2024-07-06 03:20:59 UTC (rev 1483)
@@ -1696,17 +1696,18 @@
 void SpawnShell::playerChangedID(uint16_t oldPlayerID, uint16_t newPlayerID)
 {
   // remove the player from the list (if it had a 0 id)
-  m_players.take(0);
+  deleteItem(tPlayer, 0);
 
-  Item* old = m_players.take(oldPlayerID);
-  if (old != m_player)
-      delete old;
+  if (oldPlayerID == newPlayerID)
+      return;
 
-  //if the new ID already exists (sometimes as an unknown spawn) remove it
-  Item* existing = m_players.take(newPlayerID);
-  if (existing != m_player)
-      delete existing;
+  //remove the old player 
+  deleteItem(tPlayer, oldPlayerID);
 
+
+  //if the new ID already exists an unknown spawn
+  deleteItem(tSpawn, newPlayerID);
+
   // re-insert the player into the list
   m_players.insert(newPlayerID, m_player);
 

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