From 2e04be70a0b66c95d241a68a9249e843743d7ad7 Mon Sep 17 00:00:00 2001
From: nehalmistry <>
Date: Thu, 28 Nov 2002 07:29:53 +0000
Subject: [PATCH] fixed problem where ThisPlayer would always be Player 0 (from
 Russell Smith)

---
 src/editor/editloop.cpp | 2 ++
 src/game/game.cpp       | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/editor/editloop.cpp b/src/editor/editloop.cpp
index 3aa3b6fa1..301e58292 100644
--- a/src/editor/editloop.cpp
+++ b/src/editor/editloop.cpp
@@ -1741,6 +1741,8 @@ local void CreateEditor(void)
 	user_gc(SCM_BOOL_F);		// Cleanup memory after load
     }
 
+    ThisPlayer = &Players[0];
+
     FlagRevealMap = 1;			// editor without fog and all visible
     TheMap.NoFogOfWar = 1;
     if (!*CurrentMapPath) {		// new map!
diff --git a/src/game/game.cpp b/src/game/game.cpp
index 877125438..5d38553d0 100644
--- a/src/game/game.cpp
+++ b/src/game/game.cpp
@@ -298,8 +298,6 @@ global void CreateGame(char* filename, WorldMap* map)
     if( NetworkFildes!=-1 ) {		// Prepare network play
 	DebugLevel0Fn("Client setup: Calling InitNetwork2\n");
 	InitNetwork2();
-    } else {
-	ThisPlayer = &Players[0];
     }
 
     if( GameIntro.Title ) {