From 1bc5378f78f8c6b89b17e85de9972deb7eaaa0da Mon Sep 17 00:00:00 2001
From: zicodxx <zicodxx@yahoo.de>
Date: Mon, 4 Jul 2011 11:23:50 +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 515ba998e..dc3448714 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-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 5b51faa2f..a90cabc47 100644
--- a/main/game.c
+++ b/main/game.c
@@ -925,6 +925,8 @@ void game_disable_cheats()
 
 int game_handler(window *wind, d_event *event, void *data);
 
+extern int netplayerinfo_on;
+
 window *game_setup(void)
 {
 	window *game_wind;
@@ -940,6 +942,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 31d03d8d2..675d75f4f 100644
--- a/main/gamerend.c
+++ b/main/gamerend.c
@@ -380,7 +380,7 @@ void game_render_frame_mono(int flip)
 	game_draw_hud_stuff();
 	
 #ifdef NETWORK
-	if (netplayerinfo_on)
+	if (netplayerinfo_on && Game_mode & GM_MULTI)
 		show_netplayerinfo();
 #endif
 }