[quake3-commits] r2123 - in trunk/code: client game

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-08-01 10:40:53 -0400 (Mon, 01 Aug 2011)
New Revision: 2123

Modified:
   trunk/code/client/cl_main.c
   trunk/code/game/bg_pmove.c
Log:
[16:31:51] <ZTurtleMan> Thilo: two small fixes, one for r2112 and one for r2116. http://pastebin.com/raw.php?i=h19r211Z


Modified: trunk/code/client/cl_main.c
===================================================================
--- trunk/code/client/cl_main.c	2011-08-01 14:38:37 UTC (rev 2122)
+++ trunk/code/client/cl_main.c	2011-08-01 14:40:53 UTC (rev 2123)
@@ -47,7 +47,9 @@
 cvar_t	*cl_voip;
 #endif
 
+#ifdef USE_RENDERER_DLOPEN
 cvar_t	*cl_renderer;
+#endif
 
 cvar_t	*cl_nodelta;
 cvar_t	*cl_debugMove;

Modified: trunk/code/game/bg_pmove.c
===================================================================
--- trunk/code/game/bg_pmove.c	2011-08-01 14:38:37 UTC (rev 2122)
+++ trunk/code/game/bg_pmove.c	2011-08-01 14:40:53 UTC (rev 2123)
@@ -1862,7 +1862,7 @@
 	}
 
 	// set the firing flag for continuous beam weapons
-	if ( !(pm->ps->pm_flags & PMF_RESPAWNED) && pm->ps->pm_type != PM_INTERMISSION && (!pm->ps->pm_type == PM_NOCLIP)
+	if ( !(pm->ps->pm_flags & PMF_RESPAWNED) && pm->ps->pm_type != PM_INTERMISSION && pm->ps->pm_type != PM_NOCLIP
 		&& ( pm->cmd.buttons & BUTTON_ATTACK ) && pm->ps->ammo[ pm->ps->weapon ] ) {
 		pm->ps->eFlags |= EF_FIRING;
 	} else {