qf/game-source
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/game-source synced 2024-11-10 06:31:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

more bitop cleanups and fix a bug where players wouldn't be able to pick

Browse source 
things up after getting gibbed
This commit is contained in:
Bill Currie 2004-05-13 20:59:09 +00:00
parent 93aa9812f6
commit a97652dccf
6 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nqw/demon.qc
View file

@ -81,8 +81,7 @@ void() demon1_jump4 =[ $leap4, demon1_jump5 ]
makevectors (self.angles);
self.origin_z = self.origin_z + 1;
self.velocity = v_forward * 600 + '0 0 250';
if (self.flags & FL_ONGROUND)
self.flags = self.flags - FL_ONGROUND;
self.flags &= ~FL_ONGROUND;
};
void() demon1_jump5 =[ $leap5, demon1_jump6 ] {};
void() demon1_jump6 =[ $leap6, demon1_jump7 ] {};

3
nqw/dog.qc
View file

@ -155,8 +155,7 @@ void() dog_leap2 =[ $leap2, dog_leap3 ]
makevectors (self.angles);
self.origin_z = self.origin_z + 1;
self.velocity = v_forward * 300 + '0 0 200';
if (self.flags & FL_ONGROUND)
self.flags = self.flags - FL_ONGROUND;
self.flags &= ~FL_ONGROUND;
};
void() dog_leap3 =[ $leap3, dog_leap4 ] {};

11
nqw/monsters.qc
View file

@ -47,10 +47,7 @@ enemy as activator.
void() monster_death_use =
{
// fall to ground
if (self.flags & FL_FLY)
self.flags = self.flags - FL_FLY;
if (self.flags & FL_SWIM)
self.flags = self.flags - FL_SWIM;
self.flags &= ~(FL_FLY | FL_SWIM);
if (!self.target)
return;
@ -125,8 +122,7 @@ void() flymonster_start_go =
self.view_ofs = '0 0 25';
self.use = monster_use;
self.flags |= FL_FLY;
self.flags |= FL_MONSTER;
self.flags |= FL_FLY | FL_MONSTER;
if (!walkmove (0, 0)) {
dprint ("flymonster in wall at: ");
@ -178,8 +174,7 @@ void() swimmonster_start_go =
self.view_ofs = '0 0 10';
self.use = monster_use;
self.flags |= FL_SWIM;
self.flags |= FL_MONSTER;
self.flags |= FL_SWIM | FL_MONSTER;
if (self.target) {
self.goalentity = self.movetarget = find (world, targetname,

2
nqw/player.qc
View file

@ -493,7 +493,7 @@ void(string gibname, float dm) ThrowHead =
setsize (self, '-16 -16 0', '16 16 56');
self.velocity = VelocityForDamage (dm);
self.origin_z = self.origin_z - 24;
self.flags &= FL_ONGROUND;
self.flags &= ~FL_ONGROUND;
self.avelocity = (random () - 0.5) * '0 1200 0';
};

3
nqw/tarbaby.qc
View file

@ -145,8 +145,7 @@ void() tbaby_jump5 =[ $jump5, tbaby_jump6 ]
self.origin_z = self.origin_z + 1;
self.velocity = v_forward * 600 + '0 0 200';
self.velocity_z = self.velocity_z + random () * 150;
if (self.flags & FL_ONGROUND)
self.flags = self.flags - FL_ONGROUND;
self.flags &= ~FL_ONGROUND;
self.cnt = 0;
};
void() tbaby_jump6 =[ $jump6,tbaby_fly1 ] {};

5
nqw/triggers.qc
View file

@ -425,8 +425,7 @@ local vector org;
{
other.fixangle = 1; // turn this way immediately
other.teleport_time = time + 0.7;
if (other.flags & FL_ONGROUND)
other.flags = other.flags - FL_ONGROUND;
other.flags &= ~FL_ONGROUND;
other.velocity = v_forward * 300;
}
other.flags &= ~FL_ONGROUND;
@ -636,7 +635,7 @@ void() trigger_monsterjump_touch =
if ( !(other.flags & FL_ONGROUND) )
return;
other.flags = other.flags - FL_ONGROUND;
other.flags &= ~FL_ONGROUND;
other.velocity_z = self.height;
};