Reset accumulatedDamage #808

src/cdogs/actors.c

@@ -100,6 +100,7 @@
 #define GRIMACE_MELEE_TICKS 19
 #define DAMAGE_TEXT_DISTANCE_RESET_THRESHOLD (ACTOR_W / 2)
 #define FOOTPRINT_MAX 8
+#define GAME_TICKS_PER_SECOND 60 // Assuming 60 ticks per second for accumulatedDamage reset
 
 CArray gPlayerIds;
 
@@ -142,6 +143,17 @@ void UpdateActorState(TActor *actor, int ticks)
 		}
 		actor->petrified = MAX(0, actor->petrified - ticks);
 		actor->confused = MAX(0, actor->confused - ticks);
+
+		// Reset accumulated damage if 1 second of ticks passed
+		actor->damageCooldownTicks += ticks;
+		if (actor->accumulatedDamage)
+		{
+			if (actor->damageCooldownTicks >= GAME_TICKS_PER_SECOND)
+			{
+				actor->accumulatedDamage = 0;
+				actor->damageCooldownTicks = 0;
+			}
+		}
 	}
 
 	actor->slideLock = MAX(0, actor->slideLock - ticks);
@@ -2206,6 +2218,7 @@ void ActorHit(const NThingDamage d)
 		}
 		CA_FOREACH_END()
 		a->accumulatedDamage = damage;
+		a->damageCooldownTicks = 0;
 
 		GameEvent s = GameEventNew(GAME_EVENT_ADD_PARTICLE);
 		s.u.AddParticle.Class =

src/cdogs/actors.h

@@ -154,6 +154,7 @@ typedef struct Actor
 	int slideLock;
 	// For damage text
 	int accumulatedDamage;
+	int damageCooldownTicks;
 	// Facial expression when melee or taking damage
 	int grimaceCounter;