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

…sappear() Misc cleanup.
VeraVisions · Sep 3, 2022 · 9deb12b · 9deb12b
1 parent 5a7d082
commit 9deb12b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/gs-entbase/server/button_target.qc b/src/gs-entbase/server/button_target.qc
@@ -84,12 +84,15 @@ button_target::Trigger(entity act, int status)
 	PlayerUse = __NULL__;
 	SetTakedamage(DAMAGE_NO);
 
-	frame = 1 - frame;
+	/* toggle texture frame */
+	float new_frame = (GetFrame() >= 1) ? 0 : 1;
+	SetFrame(new_frame);
+
 	UseTargets(act, status, m_flDelay);
 }
 
 void
 button_target::Damage(void)
 {
-	Trigger(g_dmg_eAttacker, TRIG_TOGGLE); /* TODO: Set state? */
+	Trigger(g_dmg_eAttacker, TRIG_TOGGLE);
 }
diff --git a/src/gs-entbase/server/cycler.qc b/src/gs-entbase/server/cycler.qc
@@ -61,9 +61,9 @@ void
 cycler::Pain(void)
 {
 	if (frame >= modelframecount(modelindex)) {
-		frame = 0;
+		SetFrame(0);
 	} else {
-		frame += 1;
+		SetFrame(GetFrame() + 1);
 	}
 	SetHealth(9999);
 }
diff --git a/src/gs-entbase/server/func_breakable.qc b/src/gs-entbase/server/func_breakable.qc
@@ -296,8 +296,7 @@ func_breakable::Explode(void)
 	FX_Explosion(rp);
 	Damage_Radius(rp, this, m_flExplodeMag, m_flExplodeRad, TRUE, 0);
 	UseTargets(this, TRIG_TOGGLE, 0.0f); /* delay... ignored. */
-	Hide();
-	SetSolid(SOLID_NOT);
+	Disappear();
 	SetTakedamage(DAMAGE_NO);
 }
 
@@ -345,8 +344,7 @@ func_breakable::Death(void)
 		ScheduleThink(Explode, random(0.0f, 0.5f));
 	} else {
 		FX_BreakModel(vlen(size) / 10, absmin, absmax, [0,0,0], GetSurfaceData(SURFDATA_MATERIAL));
-		Hide();
-		SetSolid(SOLID_NOT);
+		Disappear();
 		SetTakedamage(DAMAGE_NO);
 		UseTargets(eActivator, TRIG_TOGGLE, 0.0f);
 	}