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

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

Revision: 1478
          http://sourceforge.net/p/seq/svn/1478
Author:   cn187
Date:     2024-06-28 00:12:09 +0000 (Fri, 28 Jun 2024)
Log Message:
-----------
Additional fixes for entities 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-06-28 00:12:00 UTC (rev 1477)
+++ showeq/branches/cn187_devel/src/spawnshell.cpp	2024-06-28 00:12:09 UTC (rev 1478)
@@ -1698,8 +1698,17 @@
   // remove the player from the list (if it had a 0 id)
   m_players.take(0);
 
+  Item* old = m_players.take(oldPlayerID);
+  if (old != m_player)
+      delete old;
+
+  //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;
+
   // re-insert the player into the list
-  m_players.insert(newPlayerID, m_players.take(oldPlayerID));
+  m_players.insert(newPlayerID, m_player);
 
   emit changeItem(m_player, tSpawnChangedALL);
 }

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