From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 25 May 2006 03:43:58 +0000 (+0000)
Subject: fix crash when entering "color" command while playing a demo
X-Git-Tag: xonotic-v0.1.0preview~3992
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=13192ac6081831489c47e1b50642d9e2cc354376;p=xonotic%2Fdarkplaces.git

fix crash when entering "color" command while playing a demo
fixed values printed by bottomcolor/topcolor commands (so bottomcolor no longer reports the whole color like color does, instead just the pants color)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6375 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/host_cmd.c b/host_cmd.c
index 8ed2a856..2d34b90a 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -1126,7 +1126,7 @@ void Host_Color(int changetop, int changebottom)
 			CL_SetInfo("topcolor", va("%i", top), true, false, false, false);
 		if (changebottom >= 0)
 			CL_SetInfo("bottomcolor", va("%i", bottom), true, false, false, false);
-		if (cls.protocol != PROTOCOL_QUAKEWORLD)
+		if (cls.protocol != PROTOCOL_QUAKEWORLD && cls.netcon)
 		{
 			MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
 			MSG_WriteString(&cls.netcon->message, va("color %i %i", top, bottom));
@@ -1191,7 +1191,7 @@ void Host_TopColor_f(void)
 {
 	if (Cmd_Argc() == 1)
 	{
-		Con_Printf("\"topcolor\" is \"%i\"\n", cl_color.integer >> 4);
+		Con_Printf("\"topcolor\" is \"%i\"\n", (cl_color.integer >> 4) & 15);
 		Con_Print("topcolor <0-15>\n");
 		return;
 	}
@@ -1203,7 +1203,7 @@ void Host_BottomColor_f(void)
 {
 	if (Cmd_Argc() == 1)
 	{
-		Con_Printf("\"bottomcolor\" is \"%i\"\n", cl_color.integer);
+		Con_Printf("\"bottomcolor\" is \"%i\"\n", cl_color.integer & 15);
 		Con_Print("bottomcolor <0-15>\n");
 		return;
 	}