From dc0400205b5300a90b48f5c63c01f0d97c9303a9 Mon Sep 17 00:00:00 2001
From: zicodxx <zicodxx@yahoo.de>
Date: Mon, 4 Jul 2011 11:23:53 +0200
Subject: [PATCH] Only call show_netplayerinfo() if GM_MULTI is set and reset
 netplayerinfo_on in game_setup()

---
 CHANGELOG.txt   | 4 ++++
 main/game.c     | 3 +++
 main/gamerend.c | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8c15a08d4..8bdbcd5ce 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20110704
+--------
+main/game.c, main/gamerend.c: Only call show_netplayerinfo() if GM_MULTI is set and reset netplayerinfo_on in game_setup()
+
 20110702
 --------
 main/ai.c: When initializing ai object correctly initialize Ai_local_info to prevent glitches like random submodel angles
diff --git a/main/game.c b/main/game.c
index f2b8abd5a..527b981c6 100644
--- a/main/game.c
+++ b/main/game.c
@@ -1069,6 +1069,8 @@ void game_disable_cheats()
 	memset(&cheats, 0, sizeof(cheats));
 }
 
+extern int netplayerinfo_on;
+
 //	game_setup()
 // ----------------------------------------------------------------------------
 
@@ -1089,6 +1091,7 @@ window *game_setup(void)
 	reset_palette_add();
 	init_cockpit();
 	init_gauges();
+	netplayerinfo_on = 0;
 
 #ifdef EDITOR
 	if (Segments[ConsoleObject->segnum].segnum == -1)      //segment no longer exists
diff --git a/main/gamerend.c b/main/gamerend.c
index b815c16ad..f9579e344 100644
--- a/main/gamerend.c
+++ b/main/gamerend.c
@@ -733,7 +733,7 @@ void game_render_frame_mono(int flip)
 	show_extra_views();		//missile view, buddy bot, etc.
 
 #ifdef NETWORK
-        if (netplayerinfo_on)
+        if (netplayerinfo_on && Game_mode & GM_MULTI)
 		show_netplayerinfo();
 #endif
 }