-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 882d7e7a4264f66955b8402a67e1482447dd3585..1e67a8db3c237eb11225cd1198826b3d3a4dfd0f 100644 (file)
--- 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 02e3f6ca01edaf9213384c97aa0d03cb955c3e8b..5634f9780e8b4ea11f89468edb55d0d02065062d 100644 (file)
--- 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)));