[16:31:51] <ZTurtleMan> Thilo: two small fixes, one for r2112 and one for r2116. http://pastebin.com/raw.php?i=h19r211Z

This commit is contained in:
Thilo Schulz 2011-08-01 14:40:53 +00:00
parent 800a3c8d7b
commit c21dee0b37
2 changed files with 3 additions and 1 deletions

View file

@ -47,7 +47,9 @@ cvar_t *cl_voipShowMeter;
cvar_t *cl_voip;
#endif
#ifdef USE_RENDERER_DLOPEN
cvar_t *cl_renderer;
#endif
cvar_t *cl_nodelta;
cvar_t *cl_debugMove;

View file

@ -1862,7 +1862,7 @@ void PmoveSingle (pmove_t *pmove) {
}
// 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 {