From 4c5794b6d53269038732f5ac4cad472f6acef29f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 4 Mar 2017 12:11:56 +0100 Subject: [PATCH] - made GetObituary non-constant. This gets only called from within the play code and making it const would block potential use cases that involve changing some internal variables like counters. --- wadsrc/static/zscript/actor.txt | 2 +- wadsrc/static/zscript/inventory/weapons.txt | 2 +- wadsrc/static/zscript/shared/player.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wadsrc/static/zscript/actor.txt b/wadsrc/static/zscript/actor.txt index 233f75d408..029aebc0ae 100644 --- a/wadsrc/static/zscript/actor.txt +++ b/wadsrc/static/zscript/actor.txt @@ -425,7 +425,7 @@ class Actor : Thinker native } } - virtual String GetObituary(Actor victim, Actor inflictor, Name mod, bool playerattack) const + virtual String GetObituary(Actor victim, Actor inflictor, Name mod, bool playerattack) { if (mod == 'Telefrag') { diff --git a/wadsrc/static/zscript/inventory/weapons.txt b/wadsrc/static/zscript/inventory/weapons.txt index 0eba93bf8f..860d387e27 100644 --- a/wadsrc/static/zscript/inventory/weapons.txt +++ b/wadsrc/static/zscript/inventory/weapons.txt @@ -89,7 +89,7 @@ class Weapon : StateProvider native return s; } - override String GetObituary(Actor victim, Actor inflictor, Name mod, bool playerattack) const + override String GetObituary(Actor victim, Actor inflictor, Name mod, bool playerattack) { // Weapons may never return HitObituary by default. Override this if it is needed. return Obituary; diff --git a/wadsrc/static/zscript/shared/player.txt b/wadsrc/static/zscript/shared/player.txt index cbb361687d..b13b840150 100644 --- a/wadsrc/static/zscript/shared/player.txt +++ b/wadsrc/static/zscript/shared/player.txt @@ -119,7 +119,7 @@ class PlayerPawn : Actor native } } - override String GetObituary(Actor victim, Actor inflictor, Name mod, bool playerattack) const + override String GetObituary(Actor victim, Actor inflictor, Name mod, bool playerattack) { if (victim.player != player && victim.IsTeammate(self)) {