qf/prozac-qfcc
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/prozac-qfcc synced 2024-11-23 20:52:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix the field stuck test and rename CONTENT_* to CONTENTS_* to match the

Browse source 
server source.
This commit is contained in:
Bill Currie 2001-07-31 17:08:59 +00:00
parent d540e3fd94
commit 7498c71ee5
23 changed files with 90 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ai.qc
View file

@ -81,7 +81,7 @@ float(float v) anglemod =
void(entity test) AI_Check_Contents =
{
//CH demons (and other ai) can be hurt by liquids //- OfN completely changed!
if (pointcontents(test.origin) == CONTENT_EMPTY && IsMonsterNonArmy(self) && self.health < self.max_health)
if (pointcontents(test.origin) == CONTENTS_EMPTY && IsMonsterNonArmy(self) && self.health < self.max_health)
{ // Heal it
if (self.dmgtime < time)
{
@ -114,7 +114,7 @@ void(entity test) AI_Check_Contents =
//TF_T_Damage (self, world, world, 5, 0, TF_TD_ELECTRICITY);
}
}
if (pointcontents(test.origin) == CONTENT_LAVA)
if (pointcontents(test.origin) == CONTENTS_LAVA)
{ // do damage
if (self.dmgtime < time)
{
@ -158,7 +158,7 @@ void(entity test) AI_Check_Contents =
}
}
}
else if (pointcontents(test.origin) == CONTENT_SLIME)
else if (pointcontents(test.origin) == CONTENTS_SLIME)
{ // do damage
if (self.dmgtime < time)
{
@ -193,7 +193,7 @@ void(entity test) AI_Check_Contents =
/* WK Removed because water is ok for monsters, sheesh
Whatever you think, ceaf it is. */
//- OfN - what the fuck means "ceaf"? heh
else if (pointcontents(test.origin) == CONTENT_WATER && allow_watermonsters == FALSE)
else if (pointcontents(test.origin) == CONTENTS_WATER && allow_watermonsters == FALSE)
{
if (self.classname == "monster_demon1")
{ // do damage

18
client.qc
View file

@ -2320,9 +2320,9 @@ void() PlayerJump =
if (self.waterlevel >= 2)
{
if (self.watertype == CONTENT_WATER)
if (self.watertype == CONTENTS_WATER)
self.velocity_z = 100;
else if (self.watertype == CONTENT_SLIME)
else if (self.watertype == CONTENTS_SLIME)
self.velocity_z = 80;
else
self.velocity_z = 50;
@ -2435,7 +2435,7 @@ void() WaterMove =
return;
}
if (self.watertype == CONTENT_LAVA)
if (self.watertype == CONTENTS_LAVA)
{ // do damage
if (self.dmgtime < time)
{
@ -2448,7 +2448,7 @@ void() WaterMove =
TF_T_Damage (self, world, world, 10*self.waterlevel, 0, TF_TD_FIRE);
}
}
else if (self.watertype == CONTENT_SLIME)
else if (self.watertype == CONTENTS_SLIME)
{ // do damage
if (self.dmgtime < time && self.radsuit_finished < time)
{
@ -2462,11 +2462,11 @@ void() WaterMove =
{
// player enter water sound
if (!(self.cutf_items & CUTF_STEALTH))
if (self.watertype == CONTENT_LAVA)
if (self.watertype == CONTENTS_LAVA)
sound (self, CHAN_BODY, "player/inlava.wav", 1, ATTN_NORM);
else if (self.watertype == CONTENT_WATER)
else if (self.watertype == CONTENTS_WATER)
sound (self, CHAN_BODY, "player/inh2o.wav", 1, ATTN_NORM);
else if (self.watertype == CONTENT_SLIME)
else if (self.watertype == CONTENTS_SLIME)
sound (self, CHAN_BODY, "player/slimbrn2.wav", 1, ATTN_NORM);
self.flags = self.flags + FL_INWATER;
@ -2524,7 +2524,7 @@ void() PlayerPreThink =
if (self.is_feigning && self.waterlevel == 1)
{
self.watertype = CONTENT_WATER;
self.watertype = CONTENTS_WATER;
self.waterlevel = 3;
}
@ -2991,7 +2991,7 @@ void() PlayerPostThink =
// check to see if player landed and play landing sound
if (self.takedamage && (self.jump_flag < -300) && (self.flags & FL_ONGROUND) && (self.health > 0))
{
if (self.watertype == CONTENT_WATER)
if (self.watertype == CONTENTS_WATER)
{
if (!(self.cutf_items & CUTF_STEALTH))
sound (self, CHAN_BODY, "player/h2ojump.wav", 1, ATTN_NORM);

4
custom.qc
View file

@ -936,8 +936,8 @@ void(float cost, float type) BuyGren2 =
//Functions for our new grenades
void() fragspike_touch =
{
//if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) != CONTENT_EMPTY)
//if (pointcontents(self.origin) == CONTENTS_SKY)
if (pointcontents(self.origin) != CONTENTS_EMPTY)
{
dremove(self);
return;

2
defs.qc
View file

@ -564,7 +564,7 @@ void(vector where, float set) multicast = #82; // sends the temp message
// to a set of clients,
// possibly in PVS or PHS
entity (entity ent) testentitypos = #92;
integer (entity ent, vector point) hullpointcontents = #93;
integer (entity ent, vector mins, vector maxs, vector point) hullpointcontents = #93;
vector (integer hull, integer max) getboxbounds = #94;
integer () getboxhull = #95;
void (integer hull) freeboxhull = #96;

12
defs.qh
View file

@ -89,12 +89,12 @@
// point content values
#define CONTENT_EMPTY -1
#define CONTENT_SOLID -2
#define CONTENT_WATER -3
#define CONTENT_SLIME -4
#define CONTENT_LAVA -5
#define CONTENT_SKY -6
#define CONTENTS_EMPTY -1
#define CONTENTS_SOLID -2
#define CONTENTS_WATER -3
#define CONTENTS_SLIME -4
#define CONTENTS_LAVA -5
#define CONTENTS_SKY -6
#define STATE_TOP 0
#define STATE_BOTTOM 1

2
demoman.qc
View file

@ -344,7 +344,7 @@ void() TeamFortress_DetpackExplode =
// Check the pointcontents to prevent detpack outside the world
pos = pointcontents(self.origin);
if (pos != CONTENT_SOLID && pos != CONTENT_SKY)
if (pos != CONTENTS_SOLID && pos != CONTENTS_SKY)
{
deathmsg = DMSG_DETPACK;
T_RadiusDamage (self, self.owner, WEAP_DETPACK_SIZE, world);

2
demon.qc
View file

@ -563,7 +563,7 @@ void() demon_fire_touch =
{
local float fire_dmg;
fire_dmg = 60 + random()*40;
if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) == CONTENTS_SKY)
{
dremove(self);
return;

12
engineer.qc
View file

@ -75,7 +75,7 @@ void() LaserBolt_Touch =
if (other == self.enemy && self.enemy != world)
return; // don't explode on same person twice
if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) == CONTENTS_SKY)
{
dremove(self);
return;
@ -471,7 +471,7 @@ float(entity obj, entity builder) CheckArea =
// Check the origin
pos = pointcontents(obj.origin);
if (pos == CONTENT_SOLID || pos == CONTENT_SKY)
if (pos == CONTENTS_SOLID || pos == CONTENTS_SKY)
return FALSE;
// Check the surrounding area
@ -480,7 +480,7 @@ float(entity obj, entity builder) CheckArea =
src_z = obj.origin_z + obj.maxs_z + 16; // check upwards more
pos = pointcontents(src);
if (pos == CONTENT_SOLID || pos == CONTENT_SKY)
if (pos == CONTENTS_SOLID || pos == CONTENTS_SKY)
return FALSE;
end_x = obj.origin_x + obj.mins_x - 16;
@ -491,7 +491,7 @@ float(entity obj, entity builder) CheckArea =
return FALSE;
pos = pointcontents(end);
if (pos == CONTENT_SOLID || pos == CONTENT_SKY)
if (pos == CONTENTS_SOLID || pos == CONTENTS_SKY)
return FALSE;
// extend the size a little
@ -500,7 +500,7 @@ float(entity obj, entity builder) CheckArea =
src_z = obj.origin_z + obj.maxs_z + 16;
pos = pointcontents(src);
if (pos == CONTENT_SOLID || pos == CONTENT_SKY)
if (pos == CONTENTS_SOLID || pos == CONTENTS_SKY)
return FALSE;
end_x = obj.origin_x + obj.maxs_x + 16;
@ -513,7 +513,7 @@ float(entity obj, entity builder) CheckArea =
return FALSE;
pos = pointcontents(end);
if (pos == CONTENT_SOLID || pos == CONTENT_SKY)
if (pos == CONTENTS_SOLID || pos == CONTENTS_SKY)
return FALSE;
// Trace a line from the player to the object too

6
field.qc
View file

@ -142,7 +142,6 @@ void() Field_think =
if (self.demon_one.fieldgen_status == FIELDGEN_ISWORKING)
Field_MakeVisual(self);
#ifdef ALIGNED_FIELDGENS
// checks for anything stuck in field :)
local entity te;
local float frange;
@ -170,9 +169,6 @@ void() Field_think =
}
te = te.chain;
}
#else
# warning We do NOT have a test for being stuck in the field, so I am disabling it
#endif
};
//=============================================================================================
@ -194,6 +190,8 @@ float(entity e1, entity e2) EntsTouching2 =
if (e1.absmax_z < e2.absmin_z)
return FALSE;
if (hullpointcontents (e2, e1.mins, e1.maxs, e1.origin) != CONTENTS_SOLID)
return FALSE;
return TRUE;
};

2
hook.qc
View file

@ -288,7 +288,7 @@ void () Anchor_Grapple =
// return;
// Don't stick the the sky.
if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) == CONTENTS_SKY)
{
Reset_Grapple (self);
return;

2
jobs.qc
View file

@ -861,7 +861,7 @@ void() GuerillaTossTouch =
return;
}
if (pointcontents(self.origin) == CONTENT_SKY || pointcontents(self.origin) == CONTENT_SOLID) //CH if in wall or sky
if (pointcontents(self.origin) == CONTENTS_SKY || pointcontents(self.origin) == CONTENTS_SOLID) //CH if in wall or sky
{
self.health = 0; //CH needed for tesla
// OfN CAUSES ANY PROBLEM? Is this needed?

2
misc.qc
View file

@ -374,7 +374,7 @@ void() Laser_Touch =
if (other == self.owner)
return; // don't explode on owner
if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) == CONTENTS_SKY)
{
dremove(self);
return;

2
often.qc
View file

@ -527,7 +527,7 @@ void() FlareGrenadeTouch =
if (other == self.owner)
return; // don't bounce on owner
if (pointcontents(self.origin) == CONTENT_SKY || pointcontents(self.origin) == CONTENT_SOLID) // if in wall or sky
if (pointcontents(self.origin) == CONTENTS_SKY || pointcontents(self.origin) == CONTENTS_SOLID) // if in wall or sky
{
dremove(self);
return;

6
player.qc
View file

@ -849,7 +849,7 @@ local float rs;
}
// water pain sounds
if (self.watertype == CONTENT_WATER && self.waterlevel == 3)
if (self.watertype == CONTENTS_WATER && self.waterlevel == 3)
{
DeathBubbles(1);
if (random() > 0.5)
@ -860,7 +860,7 @@ local float rs;
}
// slime pain sounds
if (self.watertype == CONTENT_SLIME)
if (self.watertype == CONTENTS_SLIME)
{
// FIX ME put in some steam here
if (random() > 0.5)
@ -870,7 +870,7 @@ local float rs;
return;
}
if (self.watertype == CONTENT_LAVA)
if (self.watertype == CONTENTS_LAVA)
{
if (random() > 0.5)
sound (self, CHAN_VOICE, "player/lburn1.wav", 1, ATTN_NORM);

2
pyro.qc
View file

@ -801,7 +801,7 @@ void() T_IncendiaryTouch =
if (other == self.owner)
return; // don't explode on owner
if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) == CONTENTS_SKY)
{
remove(self);
return;

16
sbitems.qc
View file

@ -321,26 +321,26 @@ void() MotionSensorTossTouch =
{
if (other != world || other == self.real_owner)
return;
if (pointcontents(self.origin) == CONTENT_SKY || pointcontents(self.origin + '0 0 2') == CONTENT_SKY || pointcontents(self.origin) == CONTENT_SOLID)
if (pointcontents(self.origin) == CONTENTS_SKY || pointcontents(self.origin + '0 0 2') == CONTENTS_SKY || pointcontents(self.origin) == CONTENTS_SOLID)
{
MotionSensorDie();
return;
}
//CH sees where landed and adjusts to proper things
if (pointcontents(self.origin + '0 0 1') == CONTENT_SOLID)
if (pointcontents(self.origin + '0 0 1') == CONTENTS_SOLID)
self.origin = self.origin - '0 0 12';
if (pointcontents(self.origin - '0 0 1') == CONTENT_SOLID)
if (pointcontents(self.origin - '0 0 1') == CONTENTS_SOLID)
self.origin = self.origin + '0 0 4';
if (pointcontents(self.origin + '0 1 0') == CONTENT_SOLID)
if (pointcontents(self.origin + '0 1 0') == CONTENTS_SOLID)
self.origin = self.origin - '0 16 0';
if (pointcontents(self.origin - '0 1 0') == CONTENT_SOLID)
if (pointcontents(self.origin - '0 1 0') == CONTENTS_SOLID)
self.origin = self.origin + '0 16 0';
if (pointcontents(self.origin + '1 0 0') == CONTENT_SOLID)
if (pointcontents(self.origin + '1 0 0') == CONTENTS_SOLID)
self.origin = self.origin - '16 0 0';
if (pointcontents(self.origin + '1 0 0') == CONTENT_SOLID)
if (pointcontents(self.origin + '1 0 0') == CONTENTS_SOLID)
self.origin = self.origin + '16 0 0';
setorigin (self, self.origin);
if (pointcontents(self.origin) == CONTENT_SKY || pointcontents(self.origin + '0 0 2') == CONTENT_SKY || pointcontents(self.origin) == CONTENT_SOLID)
if (pointcontents(self.origin) == CONTENTS_SKY || pointcontents(self.origin + '0 0 2') == CONTENTS_SKY || pointcontents(self.origin) == CONTENTS_SOLID)
{
MotionSensorDie();
return;

16
security.qc
View file

@ -263,26 +263,26 @@ void() SecurityCameraTossTouch =
{
if (other != world || other == self.real_owner)
return;
if (pointcontents(self.origin) == CONTENT_SKY || pointcontents(self.origin + '0 0 2') == CONTENT_SKY || pointcontents(self.origin) == CONTENT_SOLID)
if (pointcontents(self.origin) == CONTENTS_SKY || pointcontents(self.origin + '0 0 2') == CONTENTS_SKY || pointcontents(self.origin) == CONTENTS_SOLID)
{
Security_Camera_Die();
return;
}
//CH sees where landed and adjusts to proper things
if (pointcontents(self.origin + '0 0 1') == CONTENT_SOLID)
if (pointcontents(self.origin + '0 0 1') == CONTENTS_SOLID)
self.origin = self.origin - '0 0 12';
if (pointcontents(self.origin - '0 0 1') == CONTENT_SOLID)
if (pointcontents(self.origin - '0 0 1') == CONTENTS_SOLID)
self.origin = self.origin + '0 0 4';
if (pointcontents(self.origin + '0 1 0') == CONTENT_SOLID)
if (pointcontents(self.origin + '0 1 0') == CONTENTS_SOLID)
self.origin = self.origin - '0 16 0';
if (pointcontents(self.origin - '0 1 0') == CONTENT_SOLID)
if (pointcontents(self.origin - '0 1 0') == CONTENTS_SOLID)
self.origin = self.origin + '0 16 0';
if (pointcontents(self.origin + '1 0 0') == CONTENT_SOLID)
if (pointcontents(self.origin + '1 0 0') == CONTENTS_SOLID)
self.origin = self.origin - '16 0 0';
if (pointcontents(self.origin + '1 0 0') == CONTENT_SOLID)
if (pointcontents(self.origin + '1 0 0') == CONTENTS_SOLID)
self.origin = self.origin + '16 0 0';
setorigin (self, self.origin);
if (pointcontents(self.origin) == CONTENT_SKY || pointcontents(self.origin + '0 0 2') == CONTENT_SKY || pointcontents(self.origin) == CONTENT_SOLID)
if (pointcontents(self.origin) == CONTENTS_SKY || pointcontents(self.origin + '0 0 2') == CONTENTS_SKY || pointcontents(self.origin) == CONTENTS_SOLID)
{
Security_Camera_Die();
return;

12
sentry.qc
View file

@ -710,18 +710,18 @@ float() Sentry_Fire =
float(vector vec) BadSpot =
{
/*
if (pointcontents(vec) == CONTENT_SOLID)
if (pointcontents(vec) == CONTENTS_SOLID)
sprint(self.real_owner,PRINT_HIGH,"SOLID Point\n");
else if (pointcontents(vec) == CONTENT_EMPTY)
else if (pointcontents(vec) == CONTENTS_EMPTY)
sprint(self.real_owner,PRINT_HIGH,"EMPTY Point\n");
else if (pointcontents(vec) == CONTENT_SKY)
else if (pointcontents(vec) == CONTENTS_SKY)
sprint(self.real_owner,PRINT_HIGH,"SKY Point\n");
else if (pointcontents(vec) == CONTENT_WATER)
else if (pointcontents(vec) == CONTENTS_WATER)
sprint(self.real_owner,PRINT_HIGH,"WATER Point\n");
else
sprint(self.real_owner,PRINT_HIGH,"BUG: Other Point\n");
*/
if (pointcontents(vec) == CONTENT_SKY)
if (pointcontents(vec) == CONTENTS_SKY)
return TRUE;
return FALSE;
};
@ -731,7 +731,7 @@ float(vector vec) BadSpot =
void() Sentry_Touch =
{
//WK Check for blockage
if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) == CONTENTS_SKY)
{
sprint(self.real_owner, PRINT_HIGH, "Your sentry gun flew away.\n");
Sentry_Die();

4
spy.qc
View file

@ -664,7 +664,7 @@ void() GasGrenadeExplode =
// Check the pointcontents to prevent detpack outside the world
pos = pointcontents(self.origin);
if (pos == CONTENT_EMPTY)
if (pos == CONTENTS_EMPTY)
{
te = spawn();
te.think = GasGrenadeMakeGas;
@ -920,7 +920,7 @@ void() T_TranqDartTouch =
if (other.solid == SOLID_TRIGGER)
return; // trigger field, do nothing
if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) == CONTENTS_SKY)
{
dremove(self);
return;

2
teleport.qc
View file

@ -172,7 +172,7 @@ void() Teleporter_heat_think =
loc_y = loc_y + ((rint(random() * 3 + 1) * 16) - 32);
pos = pointcontents(loc);
if (pos == CONTENT_SOLID || pos == CONTENT_SKY)
if (pos == CONTENTS_SOLID || pos == CONTENTS_SKY)
{
TF_T_Damage(self, world, world, self.health+1, 0, 0);
sprint (self.real_owner, PRINT_HIGH, "Not enough space for teleportation.\n");

20
tesla.qc
View file

@ -635,7 +635,7 @@ void() Tesla_Touch =
cheater = FALSE;
//WK Check for blockage
if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) == CONTENTS_SKY)
{
sprint(self.real_owner, PRINT_HIGH, "Your sentry gun flew away.\n");
Tesla_Die();
@ -676,15 +676,15 @@ void() Tesla_Touch =
if (self.tf_items & NIT_TURRET && self.movetype == MOVETYPE_FLY)
{
//WK Check to see if we are blocked
if (pointcontents(self.origin) == CONTENT_SKY ||
//pointcontents(self.origin - '0 0 10') == CONTENT_SKY ||
//pointcontents(self.origin + '0 0 5') == CONTENT_SKY ||
//pointcontents(self.origin + '0 0 10') == CONTENT_SKY ||
//pointcontents(self.origin + '0 0 15') == CONTENT_SKY ||
//pointcontents(self.origin + '0 0 20') == CONTENT_SKY ||
//pointcontents(self.origin + '0 0 30') == CONTENT_SKY ||
//pointcontents(self.origin + '0 0 40') == CONTENT_SKY ||
pointcontents(self.origin + '0 0 70') == CONTENT_SKY) //- OfN
if (pointcontents(self.origin) == CONTENTS_SKY ||
//pointcontents(self.origin - '0 0 10') == CONTENTS_SKY ||
//pointcontents(self.origin + '0 0 5') == CONTENTS_SKY ||
//pointcontents(self.origin + '0 0 10') == CONTENTS_SKY ||
//pointcontents(self.origin + '0 0 15') == CONTENTS_SKY ||
//pointcontents(self.origin + '0 0 20') == CONTENTS_SKY ||
//pointcontents(self.origin + '0 0 30') == CONTENTS_SKY ||
//pointcontents(self.origin + '0 0 40') == CONTENTS_SKY ||
pointcontents(self.origin + '0 0 70') == CONTENTS_SKY) //- OfN
{
sprint(self.real_owner, PRINT_HIGH, "Your tesla flew away.\n");
Tesla_Die();

22
tfortmap.qc
View file

@ -3127,11 +3127,11 @@ void() tfgoalitem_dropthink =
{
pos = pointcontents(self.origin); // find the location of the Item
if (pos == CONTENT_SLIME)
if (pos == CONTENTS_SLIME)
self.nextthink = time + (self.pausetime / 4);
else if (pos == CONTENT_LAVA)
else if (pos == CONTENTS_LAVA)
self.nextthink = time + 5;
else if (pos == CONTENT_SOLID || pos == CONTENT_SKY) // oh shit!
else if (pos == CONTENTS_SOLID || pos == CONTENTS_SKY) // oh shit!
self.nextthink = time + 2;
else
self.nextthink = time + self.pausetime;
@ -3158,11 +3158,11 @@ void() tfgoalitem_dropthink2 =
// {
pos = pointcontents(self.origin); // find the location of the Item
if (pos == CONTENT_SLIME)
if (pos == CONTENTS_SLIME)
self.nextthink = time + (self.pausetime / 4);
else if (pos == CONTENT_LAVA)
else if (pos == CONTENTS_LAVA)
self.nextthink = time + 5;
else if (pos == CONTENT_SOLID || pos == CONTENT_SKY) // oh shit!
else if (pos == CONTENTS_SOLID || pos == CONTENTS_SKY) // oh shit!
self.nextthink = time + 2;
else
self.nextthink = time + self.pausetime;
@ -3178,11 +3178,11 @@ void() tfgoalitem_dropthink2 =
// {
pos = pointcontents(self.origin); // find the location of the Item
if (pos == CONTENT_SLIME)
if (pos == CONTENTS_SLIME)
setorigin(self, self.oldorigin);
else if (pos == CONTENT_LAVA)
else if (pos == CONTENTS_LAVA)
setorigin(self, self.oldorigin);
else if (pos == CONTENT_SOLID || pos == CONTENT_SKY) // oh shit!
else if (pos == CONTENTS_SOLID || pos == CONTENTS_SKY) // oh shit!
setorigin(self, self.oldorigin);
else
setorigin(self, self.origin);
@ -3613,7 +3613,7 @@ void() CTF_FlagCheck =
{
pos = pointcontents(te.origin); // find the location of the Flag
if (pos == CONTENT_SOLID || pos == CONTENT_SKY)
if (pos == CONTENTS_SOLID || pos == CONTENTS_SKY)
{
RPrint("*****BUG*****\nFlag(s) outside world.\nPlease report this.\n");
te.nextthink = time + 0.2;
@ -3626,7 +3626,7 @@ void() CTF_FlagCheck =
{
pos = pointcontents(te.origin); // find the location of the Flag
if (pos == CONTENT_SOLID || pos == CONTENT_SKY)
if (pos == CONTENTS_SOLID || pos == CONTENTS_SKY)
{
RPrint("*****BUG*****\nFlag(s) outside world.\nPlease report this.\n");
te.nextthink = time + 0.2;

8
weapons.qc
View file

@ -1593,7 +1593,7 @@ void() T_MissileTouch =
local float damg;
local float bonus;
if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) == CONTENTS_SKY)
{
dremove(self);
return;
@ -2238,7 +2238,7 @@ void() superspike_touch =
if (other.solid == SOLID_TRIGGER)
return; // trigger field, do nothing
if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) == CONTENTS_SKY)
{
dremove(self);
return;
@ -2351,7 +2351,7 @@ void() spike_touch =
if (other.solid == SOLID_TRIGGER)
return; // trigger field, do nothing
if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) == CONTENTS_SKY)
{
dremove(self);
return;
@ -4972,7 +4972,7 @@ void() HIP_LaserTouch =
self.owner = world;
self.cnt = self.cnt + 1;
if (pointcontents(self.origin) == CONTENT_SKY)
if (pointcontents(self.origin) == CONTENTS_SKY)
{
remove(self);
return;