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

clean up some flag manipulation

Browse source
This commit is contained in:
Bill Currie 2007-04-28 00:39:42 +00:00
parent 7f6ed1c476
commit 47c500011e
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
quake/bringback.qc
View file

@ -31,11 +31,11 @@
break; break;
case "monster_fish": case "monster_fish":
setsize (self, '-16 -16 -24', '16 16 24'); setsize (self, '-16 -16 -24', '16 16 24');
self.flags = self.flags + FL_SWIM; self.flags |= FL_SWIM;
break; break;
case "monster_wizard": case "monster_wizard":
setsize (self, '-16 -16 -24', '16 16 40'); setsize (self, '-16 -16 -24', '16 16 40');
self.flags = self.flags + FL_FLY; self.flags |= FL_FLY;
break; break;
default: default:
// about 3/4 of quakes critters use this size // about 3/4 of quakes critters use this size

2
quake/client.qc
View file

@ -548,7 +548,7 @@ void() NextLevel =
serverflags |= 4; serverflags |= 4;
} else if (!(serverflags & 8)) { } else if (!(serverflags & 8)) {
mapname = "e4m1"; mapname = "e4m1";
serverflags -= 7; //FIXME should this be &= ~7? serverflags &= ~7;
} }
o = spawn(); o = spawn();

4
quake/demon.qc
View file

@ -82,7 +82,7 @@ void() demon1_jump4 =[ $leap4, demon1_jump5 ]
self.origin_z = self.origin_z + 1; self.origin_z = self.origin_z + 1;
self.velocity = v_forward * 600 + '0 0 250'; self.velocity = v_forward * 600 + '0 0 250';
if (self.flags & FL_ONGROUND) if (self.flags & FL_ONGROUND)
self.flags = self.flags - FL_ONGROUND; self.flags &= ~FL_ONGROUND;
}; };
void() demon1_jump5 =[ $leap5, demon1_jump6 ] {}; void() demon1_jump5 =[ $leap5, demon1_jump6 ] {};
void() demon1_jump6 =[ $leap6, demon1_jump7 ] {}; void() demon1_jump6 =[ $leap6, demon1_jump7 ] {};
@ -355,7 +355,7 @@ void() Demon_JumpTouch =
// self.velocity_x = (random() - 0.5) * 600; // self.velocity_x = (random() - 0.5) * 600;
// self.velocity_y = (random() - 0.5) * 600; // self.velocity_y = (random() - 0.5) * 600;
// self.velocity_z = 200; // self.velocity_z = 200;
// self.flags = self.flags - FL_ONGROUND; // self.flags &= ~FL_ONGROUND;
} }
return; // not on ground yet return; // not on ground yet
} }

4
quake/dog.qc
View file

@ -90,7 +90,7 @@ void() Dog_JumpTouch =
// self.velocity_x = (random() - 0.5) * 600; // self.velocity_x = (random() - 0.5) * 600;
// self.velocity_y = (random() - 0.5) * 600; // self.velocity_y = (random() - 0.5) * 600;
// self.velocity_z = 200; // self.velocity_z = 200;
// self.flags = self.flags - FL_ONGROUND; // self.flags &= ~FL_ONGROUND;
} }
return; // not on ground yet return; // not on ground yet
} }
@ -160,7 +160,7 @@ void() dog_leap2 =[ $leap2, dog_leap3 ]
self.origin_z = self.origin_z + 1; self.origin_z = self.origin_z + 1;
self.velocity = v_forward * 300 + '0 0 200'; self.velocity = v_forward * 300 + '0 0 200';
if (self.flags & FL_ONGROUND) if (self.flags & FL_ONGROUND)
self.flags = self.flags - FL_ONGROUND; self.flags &= ~FL_ONGROUND;
}; };
void() dog_leap3 =[ $leap3, dog_leap4 ] {}; void() dog_leap3 =[ $leap3, dog_leap4 ] {};

4
quake/misc.qc
View file

@ -23,12 +23,12 @@ void() light_use =
if (self.spawnflags & START_OFF) if (self.spawnflags & START_OFF)
{ {
lightstyle(self.style, "m"); lightstyle(self.style, "m");
self.spawnflags = self.spawnflags - START_OFF; self.spawnflags &= ~START_OFF;
} }
else else
{ {
lightstyle(self.style, "a"); lightstyle(self.style, "a");
self.spawnflags = self.spawnflags + START_OFF; self.spawnflags |= START_OFF;
} }
}; };

4
quake/monsters.qc
View file

@ -50,9 +50,9 @@ void() monster_death_use =
{ {
// fall to ground // fall to ground
if (self.flags & FL_FLY) if (self.flags & FL_FLY)
self.flags = self.flags - FL_FLY; self.flags &= ~FL_FLY;
if (self.flags & FL_SWIM) if (self.flags & FL_SWIM)
self.flags = self.flags - FL_SWIM; self.flags &= ~FL_SWIM;
if (!self.target) if (!self.target)
return; return;

2
quake/tarbaby.qc
View file

@ -111,7 +111,7 @@ void() Tar_JumpTouch =
// self.velocity_x = (random () - 0.5) * 600; // self.velocity_x = (random () - 0.5) * 600;
// self.velocity_y = (random () - 0.5) * 600; // self.velocity_y = (random () - 0.5) * 600;
// self.velocity_z = 200; // self.velocity_z = 200;
// self.flags = self.flags - FL_ONGROUND; // self.flags &= ~FL_ONGROUND;
} }
return; // not on ground yet return; // not on ground yet
} }