[Revision] Applying the recommended changes from pull request #110 (return current value if no argument given, moving the methods to their correct location)

1 files changed, 10 insertions, 12 deletions

diff --git a/source/game/StarWorldClient.cpp b/source/game/StarWorldClient.cpp
index afe71ac..0d3e039 100644
--- a/source/game/StarWorldClient.cpp
+++ b/source/game/StarWorldClient.cpp
@@ -142,6 +142,16 @@ bool WorldClient::respawnInWorld() const {
   return m_respawnInWorld;
 }
 
+bool WorldClient::setRespawnInWorld(bool value = NULL) {
+
+  if (value != NULL)
+    m_respawnInWorld = value;
+  else
+    m_respawnInWorld ^= true; // dont know if we still want to set the respawn if no argument is given here
+
+  return m_respawnInWorld;
+}
+
 void WorldClient::removeEntity(EntityId entityId, bool andDie) {
   auto entity = m_entityMap->entity(entityId);
   if (!entity)
@@ -2421,16 +2431,4 @@ void WorldClient::setupForceRegions() {
   }
 }
 
-bool WorldClient::toggleRespawnInWorld() {
-  // Setting oldValue to check if m_respawnInWorld triggered correctly later
-  const bool oldValue = respawnInWorld();
-
-  m_respawnInWorld ^= true;
-
-  if (respawnInWorld() != oldValue) {
-    return true;
-  }
-  return false;
-}
-
 }