]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
after an argument with Black it was decided that GAME_NEXUIZ will be weird (in my...
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 18 Sep 2003 19:29:39 +0000 (19:29 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 18 Sep 2003 19:29:39 +0000 (19:29 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3468 d7cf8633-e32d-0410-b094-e92efae38249

cl_parse.c

index c208a7b9accc5867903cb03e25d2f03b4ed8b4a2..c5f78db044bb4411ed7e3f2b329286379a364d75 100644 (file)
@@ -807,9 +807,11 @@ void CL_ParseClientdata (int bits)
        cl.stats[STAT_CELLS] = MSG_ReadByte();
 
        i = MSG_ReadByte ();
-       if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE || gamemode == GAME_NEXUIZ)
+       if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE)
                i = (1<<i);
        // GAME_NEXUIZ hud needs weapon change time
+       // GAME_NEXUIZ uses a bit number as it's STAT_ACTIVEWEAPON, not a bitfield
+       // like other modes
        if (cl.stats[STAT_ACTIVEWEAPON] != i)
                cl.weapontime = cl.time;
        cl.stats[STAT_ACTIVEWEAPON] = i;