qf/prozac-qfcc
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/prozac-qfcc synced 2025-01-31 13:50:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

- move '#undef ALIGNED_FIELDGENS' into the right file (options.qh, not .qc)

Browse source 
- make the old "stuck in field" tests work when ALIGNED_FIELDGENS is defined.
This commit is contained in:
Adam Olsen 2001-07-30 20:21:44 +00:00
parent 8b38676806
commit 8a48b88387
3 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
field.qc
View file

@ -142,6 +142,7 @@ void() Field_think =
if (self.demon_one.fieldgen_status == FIELDGEN_ISWORKING) if (self.demon_one.fieldgen_status == FIELDGEN_ISWORKING)
Field_MakeVisual(self); Field_MakeVisual(self);
#ifdef ALIGNED_FIELDGENS
// checks for anything stuck in field :) // checks for anything stuck in field :)
local entity te; local entity te;
local float frange; local float frange;
@ -160,26 +161,18 @@ void() Field_think =
if (te.velocity == '0 0 0') if (te.velocity == '0 0 0')
// if (!IsBuilding(te)) // no screwing with the buildings :) // if (!IsBuilding(te)) // no screwing with the buildings :)
if (te.classname != "force_field") if (te.classname != "force_field")
#ifdef ALIGNED_FIELDGENS
if (EntsTouching2(te,self)) if (EntsTouching2(te,self))
#else
# warning We do NOT have a test for being stuck in the field, so I am disabling it
if (0)
#endif
{ {
local entity foo; other = te;
foo = testentitypos (te); deathmsg = DMSG_STUCK_FORCEFIELD;
if (foo == self) self.dmg = FIELDGEN_DMGINSIDE; // this gonna hurt
{ Field_touch_SUB();
other = te;
deathmsg = DMSG_STUCK_FORCEFIELD;
self.dmg = FIELDGEN_DMGINSIDE; // this gonna hurt
Field_touch_SUB();
}
} }
te = te.chain; te = te.chain;
} }
#else
# warning We do NOT have a test for being stuck in the field, so I am disabling it
#endif
}; };
//============================================================================================= //=============================================================================================

1
options.qc
View file

@ -12,7 +12,6 @@ Defines for the compilable options within TF.
//#define BOTS // doesn't do anything yet //#define BOTS // doesn't do anything yet
//#define DEMO_STUFF //#define DEMO_STUFF
#define STATUSBAR #define STATUSBAR
#undef ALIGNED_FIELDGENS
#pragma PROGS_DAT "qwprogs.dat" #pragma PROGS_DAT "qwprogs.dat"

1
options.qh
View file

@ -12,6 +12,7 @@ Defines for the compilable options within TF.
//#define BOTS // doesn't do anything yet //#define BOTS // doesn't do anything yet
//#define DEMO_STUFF //#define DEMO_STUFF
#define STATUSBAR #define STATUSBAR
#undef ALIGNED_FIELDGENS
//#pragma PROGS_DAT "qwprogs.dat" //#pragma PROGS_DAT "qwprogs.dat"