diff --git a/paroxysm/quake/Makefile b/paroxysm/quake/Makefile index fefb58a..da16bfa 100644 --- a/paroxysm/quake/Makefile +++ b/paroxysm/quake/Makefile @@ -1,5 +1,5 @@ all: progs.dat progs.dat: progs.src *.qc - qfcc --traditional -Werror -g + qfcc -Werror -g clean: rm -f core *.dat *.sym progdefs.h diff --git a/paroxysm/quake/defs.qc b/paroxysm/quake/defs.qc index b64bca3..549eb59 100644 --- a/paroxysm/quake/defs.qc +++ b/paroxysm/quake/defs.qc @@ -224,8 +224,10 @@ void end_sys_fields; // flag for structure dumping // constants // -float FALSE = 0; -float TRUE = 1; +enum { + FALSE, + TRUE +}; // edict.flags float FL_FLY = 1; @@ -596,7 +598,7 @@ void(entity e, vector o) setorigin = #2; void(entity e, string m) setmodel = #3; // set movetype and solid first void(entity e, vector min, vector max) setsize = #4; // #5 was removed -void() break = #6; +void() Break = #6; float() random = #7; // returns 0 - 1 void(entity e, float chan, string samp, float vol, float atten) sound = #8; vector(vector v) normalize = #9; diff --git a/paroxysm/quake/items.qc b/paroxysm/quake/items.qc index 12155c8..731fcc9 100644 --- a/paroxysm/quake/items.qc +++ b/paroxysm/quake/items.qc @@ -315,7 +315,7 @@ void() weapon_touch = { local float hadammo, best, new = 0, old; local entity stemp; - local float leave; + //local float leave; if (!(other.flags & FL_CLIENT)) return; @@ -405,8 +405,8 @@ void() weapon_touch = self = stemp; - if (leave) - return; +// if (leave) +// return; // remove it in single player, or setup for respawning in deathmatch self.model = string_null; diff --git a/paroxysm/quake/kascam.qc b/paroxysm/quake/kascam.qc index 2a603e8..69147c3 100644 --- a/paroxysm/quake/kascam.qc +++ b/paroxysm/quake/kascam.qc @@ -134,7 +134,7 @@ float(float a) CamReAngle = // point visibility test -float(vector vec) CamVisible = +integer(vector vec) CamVisible = { traceline(self.origin,vec,TRUE,self); return ((trace_fraction == 1) && !((trace_inopen && trace_inwater))); @@ -143,7 +143,7 @@ float(vector vec) CamVisible = // entity visibility test // suited for players and player size bots; may vary for various classnames -float(entity ent) CamVisibleEnt = +integer(entity ent) CamVisibleEnt = { local vector vec; @@ -214,7 +214,8 @@ float(float d, float a) CamHurry = vector(float s, float v, float a) CamSmooth = { - local float dt,t1,t2,v2,as,sv2,b; + local float dt,t1,t2,v2,as,sv2; + local integer b; local vector vec; s = CamReAngle(s); @@ -749,7 +750,7 @@ void() CamImpulses = } // Messages ON/OFF } else if (self.impulse == 210) { - self.aflag = !self.aflag; + self.aflag = (float)!self.aflag; //FIXME qfcc issue // Report position } else if (self.impulse == 211) { bprint("Current camera position: "); diff --git a/paroxysm/quake/subs.qc b/paroxysm/quake/subs.qc index 512e9fc..2265d93 100644 --- a/paroxysm/quake/subs.qc +++ b/paroxysm/quake/subs.qc @@ -183,7 +183,7 @@ void() SUB_CalcAngleMoveDone = void() DelayThink = { - local float rem = self.killtarget != self.targetname; + local integer rem = self.killtarget != self.targetname; activator = self.enemy; SUB_UseTargets (); if (rem) diff --git a/paroxysm/quake/triggers.qc b/paroxysm/quake/triggers.qc index 007137d..89fff56 100644 --- a/paroxysm/quake/triggers.qc +++ b/paroxysm/quake/triggers.qc @@ -520,7 +520,7 @@ void() trigger_onlyregistered_touch = self.attack_finished = time + 2; if (cvar("registered")) { - local float rem = self.targetname != self.killtarget; + local integer rem = self.targetname != self.killtarget; self.message = ""; SUB_UseTargets (); if (rem)