Made the game server execute the chr_respawn_accept script even

in case of disconnection.

I made the Character::disconnected() function handle that case,
permitting also to centralize GameState::remove() calls there.

I also made the GameState::enqueueWarp() function test whether
the Character pointer is about to be deleted, so that the warp
can be handled directly to avoid a crash.

Last but not least, I also made the Character::update() function
not update the Character specials and hp to avoid discrepancies
seen in the client.

Resolves: Mana-Mantis #309.

Reviewed-by: Ablu.

1 files changed, 1 insertions, 5 deletions

diff --git a/src/game-server/gamehandler.cpp b/src/game-server/gamehandler.cpp
index af6cff1c..cb6c820f 100644
--- a/src/game-server/gamehandler.cpp
+++ b/src/game-server/gamehandler.cpp
@@ -72,7 +72,6 @@ void GameHandler::computerDisconnected(NetComputer *comp)
     else if (Character *ch = computer.character)
     {
         accountHandler->sendCharacterData(ch);
-        GameState::remove(ch);
         ch->disconnected();
         delete ch;
     }
@@ -695,12 +694,9 @@ void GameHandler::handleDisconnect(GameClient &client, MessageIn &message)
                     client.character->getDatabaseID(),
                     magic_token);
     }
-    // TODO: implement a delayed remove
-    GameState::remove(client.character);
-
     accountHandler->sendCharacterData(client.character);
 
-    // Done with the character
+    // Done with the character, also handle possible respawn case
     client.character->disconnected();
     delete client.character;
     client.character = 0;