From: black <black@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 11 Jan 2005 14:33:39 +0000 (+0000)
Subject: -The NEXUIZ_PLAYERMODEL is not game specific anymore.
X-Git-Tag: xonotic-v0.1.0preview~5239
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=f23d844be5ecdbafac60ded581883e562be1825b

-The NEXUIZ_PLAYERMODEL is not game specific anymore.
-A small cosmetic change to the Nex weapon list code.


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

diff --git a/host_cmd.c b/host_cmd.c
index 882d7e7a..1e67a8db 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -1928,14 +1928,12 @@ void Host_InitCommands (void)
 		Cvar_RegisterVariable (&cl_pmodel);
 		Cmd_AddCommand ("pmodel", Host_PModel_f);
 	}
-	// FIXME: Do this only for GAME_NEXUIZ?
-	else if (gamemode == GAME_NEXUIZ) 
-	{
-		Cvar_RegisterVariable (&cl_playermodel);
-		Cmd_AddCommand ("playermodel", Host_Playermodel_f);
-		Cvar_RegisterVariable (&cl_playerskin);
-		Cmd_AddCommand ("playerskin", Host_Playerskin_f);
-	}
+
+	// BLACK: This isnt game specific anymore (it was GAME_NEXUIZ at first)
+	Cvar_RegisterVariable (&cl_playermodel);
+	Cmd_AddCommand ("playermodel", Host_Playermodel_f);
+	Cvar_RegisterVariable (&cl_playerskin);
+	Cmd_AddCommand ("playerskin", Host_Playerskin_f);
 
 	Cmd_AddCommand ("prespawn", Host_PreSpawn_f);
 	Cmd_AddCommand ("spawn", Host_Spawn_f);
diff --git a/sbar.c b/sbar.c
index 02e3f6ca..5634f978 100644
--- a/sbar.c
+++ b/sbar.c
@@ -958,11 +958,8 @@ void Sbar_Draw (void)
 				fade = (1.0 - 0.5 * time);
 				fade *= fade;
 				for (i = 0; i < 8;i++)
-				{
-					if (!(cl.stats[STAT_ITEMS] & (1 << i)))
-						continue;
-					Sbar_DrawWeapon(i + 1, fade, ((1<<i) == cl.stats[STAT_ACTIVEWEAPON]));
-				}
+					if (cl.stats[STAT_ITEMS] & (1 << i))
+						Sbar_DrawWeapon(i + 1, fade, ((1<<i) == cl.stats[STAT_ACTIVEWEAPON]));
 			
 				if((cl.stats[STAT_ITEMS] & (1<<12)))
 					Sbar_DrawWeapon(0, fade, (cl.stats[STAT_ACTIVEWEAPON] == (1<<12)));