From 3493b80dd033d9be83ce5cfdf83d1658bd6c1557 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 20 Sep 2003 04:21:13 +0000 Subject: [PATCH] fixes for the latest qfcc changes --- ctf/qwsrc/Makefile | 2 +- ctf/qwsrc/triggers.qc | 2 +- nqw/Makefile | 2 +- nqw/triggers.qc | 2 +- paroxysm/quake/Makefile | 2 +- paroxysm/quake/triggers.qc | 2 +- paroxysm/quakeworld/Makefile | 2 +- paroxysm/quakeworld/triggers.qc | 2 +- quake/Makefile | 2 +- quake/triggers.qc | 2 +- quakeworld/Makefile | 2 +- quakeworld/triggers.qc | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ctf/qwsrc/Makefile b/ctf/qwsrc/Makefile index 69d6e02..ff1357c 100644 --- a/ctf/qwsrc/Makefile +++ b/ctf/qwsrc/Makefile @@ -1,5 +1,5 @@ all: qwprogs.dat qwprogs.dat: progs.src *.qc - qfcc -Werror -Wall -g + qfcc -Werror -Wall -g --advanced clean: rm -f core *.dat *.sym progdefs.h diff --git a/ctf/qwsrc/triggers.qc b/ctf/qwsrc/triggers.qc index 12de669..c29f6ce 100644 --- a/ctf/qwsrc/triggers.qc +++ b/ctf/qwsrc/triggers.qc @@ -602,7 +602,7 @@ trigger_push = void () trigger_monsterjump_touch = { - if (other.flags & (FL_MONSTER | FL_FLY | FL_SWIM) != FL_MONSTER) + if ((other.flags & (FL_MONSTER | FL_FLY | FL_SWIM)) != FL_MONSTER) return; // set XY even if not on ground, so the jump will clear lips diff --git a/nqw/Makefile b/nqw/Makefile index f90beb9..8a6bc7a 100644 --- a/nqw/Makefile +++ b/nqw/Makefile @@ -1,5 +1,5 @@ all: spprogs.dat spprogs.dat: progs.src *.qc - qfcc -Werror -g + qfcc -Werror -g --advanced clean: rm -f core *.dat *.sym progdefs.h diff --git a/nqw/triggers.qc b/nqw/triggers.qc index b5d6921..0aee892 100644 --- a/nqw/triggers.qc +++ b/nqw/triggers.qc @@ -626,7 +626,7 @@ void() trigger_push = void() trigger_monsterjump_touch = { - if ( other.flags & (FL_MONSTER | FL_FLY | FL_SWIM) != FL_MONSTER ) + if ((other.flags & (FL_MONSTER | FL_FLY | FL_SWIM)) != FL_MONSTER ) return; // set XY even if not on ground, so the jump will clear lips diff --git a/paroxysm/quake/Makefile b/paroxysm/quake/Makefile index da16bfa..b809699 100644 --- a/paroxysm/quake/Makefile +++ b/paroxysm/quake/Makefile @@ -1,5 +1,5 @@ all: progs.dat progs.dat: progs.src *.qc - qfcc -Werror -g + qfcc -Werror -g --advanced clean: rm -f core *.dat *.sym progdefs.h diff --git a/paroxysm/quake/triggers.qc b/paroxysm/quake/triggers.qc index 89fff56..ec57ac1 100644 --- a/paroxysm/quake/triggers.qc +++ b/paroxysm/quake/triggers.qc @@ -675,7 +675,7 @@ void() trigger_bouncepad = void() trigger_monsterjump_touch = { - if ( other.flags & (FL_MONSTER | FL_FLY | FL_SWIM) != FL_MONSTER ) + if ((other.flags & (FL_MONSTER | FL_FLY | FL_SWIM)) != FL_MONSTER ) return; // set XY even if not on ground, so the jump will clear lips diff --git a/paroxysm/quakeworld/Makefile b/paroxysm/quakeworld/Makefile index 05dde9b..acbee5d 100644 --- a/paroxysm/quakeworld/Makefile +++ b/paroxysm/quakeworld/Makefile @@ -1,5 +1,5 @@ all: qwprogs.dat qwprogs.dat: progs.src *.qc - qfcc -Werror -g + qfcc -Werror -g --advanced clean: rm -f core *.dat *.sym progdefs.h diff --git a/paroxysm/quakeworld/triggers.qc b/paroxysm/quakeworld/triggers.qc index 07f52a0..e455f6a 100644 --- a/paroxysm/quakeworld/triggers.qc +++ b/paroxysm/quakeworld/triggers.qc @@ -565,7 +565,7 @@ void() trigger_bouncepad = //============================================================================ void() trigger_monsterjump_touch = { - if ( other.flags & (FL_MONSTER | FL_FLY | FL_SWIM) != FL_MONSTER ) + if ((other.flags & (FL_MONSTER | FL_FLY | FL_SWIM)) != FL_MONSTER ) return; // set XY even if not on ground, so the jump will clear lips other.velocity_x = self.movedir_x * self.speed; diff --git a/quake/Makefile b/quake/Makefile index da16bfa..b809699 100644 --- a/quake/Makefile +++ b/quake/Makefile @@ -1,5 +1,5 @@ all: progs.dat progs.dat: progs.src *.qc - qfcc -Werror -g + qfcc -Werror -g --advanced clean: rm -f core *.dat *.sym progdefs.h diff --git a/quake/triggers.qc b/quake/triggers.qc index ea0c16a..9d64a15 100644 --- a/quake/triggers.qc +++ b/quake/triggers.qc @@ -608,7 +608,7 @@ void() trigger_push = void() trigger_monsterjump_touch = { - if ( other.flags & (FL_MONSTER | FL_FLY | FL_SWIM) != FL_MONSTER ) + if ((other.flags & (FL_MONSTER | FL_FLY | FL_SWIM)) != FL_MONSTER ) return; // set XY even if not on ground, so the jump will clear lips diff --git a/quakeworld/Makefile b/quakeworld/Makefile index 69d6e02..ff1357c 100644 --- a/quakeworld/Makefile +++ b/quakeworld/Makefile @@ -1,5 +1,5 @@ all: qwprogs.dat qwprogs.dat: progs.src *.qc - qfcc -Werror -Wall -g + qfcc -Werror -Wall -g --advanced clean: rm -f core *.dat *.sym progdefs.h diff --git a/quakeworld/triggers.qc b/quakeworld/triggers.qc index 4bf62b4..a5d3fbf 100644 --- a/quakeworld/triggers.qc +++ b/quakeworld/triggers.qc @@ -580,7 +580,7 @@ trigger_push = void () trigger_monsterjump_touch = { - if (other.flags & (FL_MONSTER | FL_FLY | FL_SWIM) != FL_MONSTER) + if ((other.flags & (FL_MONSTER | FL_FLY | FL_SWIM)) != FL_MONSTER) return; // set XY even if not on ground, so the jump will clear lips