Merge pull request #979 from klaussilveira/fix-ai

Fix bug where NPCs do not cower when the player shoots nearby
RobertBeckebans · Feb 28, 2025 · 1971da1 · 1971da1
2 parents 502f8f7 + fe69f28
commit 1971da1
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/neo/d3xp/Game_local.cpp b/neo/d3xp/Game_local.cpp
@@ -4488,7 +4488,7 @@ void idGameLocal::AlertAI( idEntity* ent )
 	if( ent && ent->IsType( idActor::Type ) )
 	{
 		// alert them for the next frame
-		lastAIAlertTime = time + 1;
+		lastAIAlertTime = framenum + 1;
 		lastAIAlertEntity = static_cast<idActor*>( ent );
 	}
 }
@@ -4500,14 +4500,7 @@ idGameLocal::GetAlertEntity
 */
 idActor* idGameLocal::GetAlertEntity()
 {
-	int timeGroup = 0;
-	if( lastAIAlertTime && lastAIAlertEntity.GetEntity() )
-	{
-		timeGroup = lastAIAlertEntity.GetEntity()->timeGroup;
-	}
-	SetTimeState ts( timeGroup );
-
-	if( lastAIAlertTime >= time )
+	if( lastAIAlertTime >= framenum )
 	{
 		return lastAIAlertEntity.GetEntity();
 	}