Index: darkplaces/host_cmd.c
diff -u darkplaces/host_cmd.c:1.93 darkplaces/host_cmd.c:1.94
--- darkplaces/host_cmd.c:1.93	Mon Dec 13 11:20:15 2004
+++ darkplaces/host_cmd.c	Tue Jan 11 09:33:39 2005
@@ -1928,14 +1928,12 @@
 		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);
Index: darkplaces/sbar.c
diff -u darkplaces/sbar.c:1.47 darkplaces/sbar.c:1.48
--- darkplaces/sbar.c:1.47	Wed Dec  1 00:39:03 2004
+++ darkplaces/sbar.c	Tue Jan 11 09:33:39 2005
@@ -958,11 +958,8 @@
 				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)));