added option to spawn damage numbers for all shootables; closes #13

XaserAcheron · May 21, 2017 · c882a4c · c882a4c
1 parent 76187c8
commit c882a4c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/cvarinfo.txt b/src/cvarinfo.txt
@@ -2,4 +2,5 @@ server int dam_font  =  0;
 server int dam_color = -1;
 server int dam_spray =  0;
 server int dam_physics = 0;
+server bool dam_shootable = false;
 server bool dam_enabled = true;
diff --git a/src/menudef.txt b/src/menudef.txt
@@ -17,6 +17,12 @@ OptionValue "DamPhysics"
 	1, "Float"
 }
 
+OptionValue "DamShootable"
+{
+	0, "Monsters Only"
+	1, "All Shootable Objects"
+}
+
 OptionValue "DamEnabled"
 {
 	0, "Disabled"
@@ -53,11 +59,16 @@ OptionMenu "DamNumsOptions"
 {
 	Position -15
 	Title       "DamNums Options"
-	Option		"Mod Enabled"  , "dam_enabled", "DamEnabled"
+	Option		"Mod Enabled"       , "dam_enabled"  , "DamEnabled"
+	Option      "Spawn Numbers For*", "dam_shootable", "DamShootable"
 	StaticText 	""
 	StaticText 	"Number Display Settings", 1
 	Option      "Font"         , "dam_font"   , "DamFonts"
 	Option      "Color"        , "dam_color"  , "DamColors"
 	Option      "Physics"      , "dam_physics", "DamPhysics"
 	Option      "Shotgun Spray", "dam_spray"  , "YesNo"
+	StaticText 	""
+	StaticText 	"Settings marked with an asterisk (*)", "Tan"
+	StaticText 	"will only take effect after changing", "Tan"
+	StaticText 	"maps or starting a new game.", "Tan"
 }
diff --git a/src/zscript/damnums/events.txt b/src/zscript/damnums/events.txt
@@ -12,7 +12,7 @@ class DamNumEventHandler : StaticEventHandler
 	 */
 	override void WorldThingDamaged(WorldEvent e)
 	{
-		if (dam_enabled && e.thing && e.Thing.bISMONSTER && dam_spray && e.DamageType != 'Massacre')
+		if (dam_enabled && self.ShouldSpawn(e.Thing) && dam_spray && e.DamageType != 'Massacre')
 		{
 			// Since WorldThingDamaged is (oddly) called after the actor's officially dead,
 			// we need to account for the case where the actor's height has been quartered.
@@ -27,18 +27,26 @@ class DamNumEventHandler : StaticEventHandler
 	 */
 	override void WorldThingSpawned(WorldEvent e)
 	{
-		if (e.Thing && e.Thing.bISMONSTER)
+		if (self.ShouldSpawn(e.Thing))
 		{
 			DamNumCourier.Create(e.thing);
 		}
 	}
 	override void WorldThingRevived(WorldEvent e)
 	{
-		if (e.Thing && e.Thing.bISMONSTER)
+		if (self.ShouldSpawn(e.Thing))
 		{
 			DamNumCourier.Create(e.thing);
 		}
 	}
+
+	/*
+	 * Determine if we should spawn/track a particular thing. Basically
+	 * an easy abstraction for the dam_shootable parameter.
+	 */
+	bool ShouldSpawn(Actor thing) {
+		return thing && (thing.bIsMonster || (dam_shootable && thing.bShootable));
+	}
 }
 
 /*