mirror of
https://github.com/nzp-team/quakec.git
synced 2024-11-25 05:11:05 +00:00
Server: Restore Box Glow for FTE, fix Power-Up timeout
This commit is contained in:
parent
0ccb6357f0
commit
4d5363b08f
2 changed files with 6 additions and 12 deletions
|
@ -1383,7 +1383,6 @@ void() findboxspot =
|
|||
newspot.angles_y += 90;
|
||||
|
||||
// Spawn the Box Glow if permitted
|
||||
#ifndef PC
|
||||
if (!(self.owner.spawnflags & 2))
|
||||
{
|
||||
local entity g;
|
||||
|
@ -1393,7 +1392,6 @@ void() findboxspot =
|
|||
setorigin(g,newspot.origin);
|
||||
g.angles = newspot.angles;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Remove teddy
|
||||
remove(self);
|
||||
|
@ -1732,7 +1730,6 @@ void() mystery_box =
|
|||
setmodel (self, "models/machines/mystery.mdl");
|
||||
setsize (self, VEC_HULL2_MIN, VEC_HULL2_MAX);
|
||||
|
||||
#ifndef PC
|
||||
if (!(self.spawnflags & 2))
|
||||
{
|
||||
local entity g;
|
||||
|
@ -1742,7 +1739,6 @@ void() mystery_box =
|
|||
setorigin(g,self.origin);
|
||||
g.angles = self.angles;
|
||||
}
|
||||
#endif
|
||||
|
||||
self.touch = mystery_touch;
|
||||
boxOrigin = self.origin;
|
||||
|
|
|
@ -243,7 +243,6 @@ void(vector org) PU_NukeExplode =
|
|||
setorigin(explosion, org);
|
||||
explosion.think = PU_NukeExplosionThink;
|
||||
explosion.nextthink = time + 0.10;
|
||||
explosion.ltime = time + 3;
|
||||
}
|
||||
|
||||
//
|
||||
|
@ -457,10 +456,6 @@ void() PU_Flash =
|
|||
{
|
||||
// Toggle the Power-Up model on and off
|
||||
if (self.hitcount % 2) {
|
||||
// Store model
|
||||
if (!self.oldmodel)
|
||||
self.oldmodel = self.model;
|
||||
|
||||
// Disappear
|
||||
setmodel(self, "");
|
||||
}
|
||||
|
@ -584,9 +579,7 @@ void(vector where, float type) Spawn_Powerup =
|
|||
sparkle.origin = where;
|
||||
setorigin(sparkle, sparkle.origin);
|
||||
|
||||
#ifndef PC
|
||||
setmodel(sparkle,"models/sprites/sprkle.spr");
|
||||
#endif
|
||||
|
||||
sparkle.think = PU_SparkleThink;
|
||||
sparkle.nextthink = time + 0.1;
|
||||
|
@ -605,9 +598,14 @@ void(vector where, float type) Spawn_Powerup =
|
|||
}
|
||||
|
||||
// Assign the Power-Up model and sound
|
||||
setmodel(powerup, PU_ModelPath(powerup.walktype));
|
||||
powerup.model = powerup.oldmodel = PU_ModelPath(powerup.walktype);
|
||||
setmodel(powerup, powerup.model);
|
||||
powerup.powerup_vo = PU_VoiceoverPath(powerup.walktype);
|
||||
|
||||
// Time out
|
||||
powerup.think = PU_Flash;
|
||||
powerup.nextthink = time + 15;
|
||||
|
||||
// Finally assign collision function
|
||||
powerup.touch = PU_Touch;
|
||||
|
||||
|
|
Loading…
Reference in a new issue