Don't show switch gun chatter for NPCs

cxong · Dec 9, 2023 · 8164233 · 8164233
1 parent 0a8b0c4
commit 8164233
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/cdogs/actors.c b/src/cdogs/actors.c
@@ -839,7 +839,11 @@ void ActorReplaceGun(const NActorReplaceGun rg)
 		a->gunIndex = rg.GunIdx;
 	}
 	SoundPlayAt(&gSoundDevice, wc->SwitchSound, a->Pos);
-	ActorSetChatter(a, wc->name, CHATTER_SWITCH_GUN);
+	// Show gun switch text as chatter, but only for PCs
+	if (a->PlayerUID >= 0)
+	{
+		ActorSetChatter(a, wc->name, CHATTER_SWITCH_GUN);
+	}
 }
 
 int ActorFindGun(const TActor *a, const WeaponClass *wc)
@@ -1961,7 +1965,11 @@ void ActorSwitchGun(const NActorSwitchGun sg)
 	}
 	const WeaponClass *gun = ACTOR_GET_WEAPON(a)->Gun;
 	SoundPlayAt(&gSoundDevice, gun->SwitchSound, a->thing.Pos);
-	ActorSetChatter(a, gun->name, CHATTER_SWITCH_GUN);
+	// Show gun switch text as chatter, but only for PCs
+	if (a->PlayerUID >= 0)
+	{
+		ActorSetChatter(a, gun->name, CHATTER_SWITCH_GUN);
+	}
 }
 
 void ActorPickupGun(const TActor *a, const WeaponClass *wc)