vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

func_breakable: This still used Hide() for some reason, changed to Disappear()

Browse source 
Misc cleanup.
This commit is contained in:
Marco Cawthorne 2022-09-02 22:02:54 -07:00
parent 5a7d082af7
commit 9deb12b68d
Signed by: eukara
GPG key ID: CE2032F0A2882A22
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gs-entbase/server/button_target.qc
View file

@ -84,12 +84,15 @@ button_target::Trigger(entity act, int status)
PlayerUse = __NULL__; PlayerUse = __NULL__;
SetTakedamage(DAMAGE_NO); SetTakedamage(DAMAGE_NO);
frame = 1 - frame; /* toggle texture frame */
float new_frame = (GetFrame() >= 1) ? 0 : 1;
SetFrame(new_frame);
UseTargets(act, status, m_flDelay); UseTargets(act, status, m_flDelay);
} }
void void
button_target::Damage(void) button_target::Damage(void)
{ {
Trigger(g_dmg_eAttacker, TRIG_TOGGLE); /* TODO: Set state? */ Trigger(g_dmg_eAttacker, TRIG_TOGGLE);
} }

4
src/gs-entbase/server/cycler.qc
View file

@ -61,9 +61,9 @@ void
cycler::Pain(void) cycler::Pain(void)
{ {
if (frame >= modelframecount(modelindex)) { if (frame >= modelframecount(modelindex)) {
frame = 0; SetFrame(0);
} else { } else {
frame += 1; SetFrame(GetFrame() + 1);
} }
SetHealth(9999); SetHealth(9999);
} }

6
src/gs-entbase/server/func_breakable.qc
View file

@ -296,8 +296,7 @@ func_breakable::Explode(void)
FX_Explosion(rp); FX_Explosion(rp);
Damage_Radius(rp, this, m_flExplodeMag, m_flExplodeRad, TRUE, 0); Damage_Radius(rp, this, m_flExplodeMag, m_flExplodeRad, TRUE, 0);
UseTargets(this, TRIG_TOGGLE, 0.0f); /* delay... ignored. */ UseTargets(this, TRIG_TOGGLE, 0.0f); /* delay... ignored. */
Hide(); Disappear();
SetSolid(SOLID_NOT);
SetTakedamage(DAMAGE_NO); SetTakedamage(DAMAGE_NO);
} }
@ -345,8 +344,7 @@ func_breakable::Death(void)
ScheduleThink(Explode, random(0.0f, 0.5f)); ScheduleThink(Explode, random(0.0f, 0.5f));
} else { } else {
FX_BreakModel(vlen(size) / 10, absmin, absmax, [0,0,0], GetSurfaceData(SURFDATA_MATERIAL)); FX_BreakModel(vlen(size) / 10, absmin, absmax, [0,0,0], GetSurfaceData(SURFDATA_MATERIAL));
Hide(); Disappear();
SetSolid(SOLID_NOT);
SetTakedamage(DAMAGE_NO); SetTakedamage(DAMAGE_NO);
UseTargets(eActivator, TRIG_TOGGLE, 0.0f); UseTargets(eActivator, TRIG_TOGGLE, 0.0f);
} }