From f6d3de76cf138b9e0156bf07556c419101ab66f3 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 7 Apr 2019 23:45:08 +0200 Subject: [PATCH 1/2] - fixed: ACS's APROP_ViewHeight needs to check if a real player is attached to a PlayerPawn. --- src/p_acs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_acs.cpp b/src/p_acs.cpp index e19a4c78c2..6e1795f0d3 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -4372,7 +4372,7 @@ int DLevelScript::GetActorProperty (int tid, int property) case APROP_Radius: return DoubleToACS(actor->radius); case APROP_ReactionTime:return actor->reactiontime; case APROP_MeleeRange: return DoubleToACS(actor->meleerange); - case APROP_ViewHeight: if (actor->IsKindOf(NAME_PlayerPawn)) + case APROP_ViewHeight: if (actor->player) { return DoubleToACS(actor->player->DefaultViewHeight()); } From 3c07485d11fd9986cbf3824e59a842e1663a7351 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 7 Apr 2019 23:54:39 +0200 Subject: [PATCH 2/2] - fixed: Replacing a text image with actual text may only happen if the text comes from the string table. --- src/gamedata/textures/texturemanager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gamedata/textures/texturemanager.cpp b/src/gamedata/textures/texturemanager.cpp index a53a14c580..17e711d662 100644 --- a/src/gamedata/textures/texturemanager.cpp +++ b/src/gamedata/textures/texturemanager.cpp @@ -428,6 +428,7 @@ bool FTextureManager::OkForLocalization(FTextureID texnum, const char *substitut uint32_t langtable = 0; if (*substitute == '$') substitute = GStrings.GetString(substitute+1, &langtable); + else return true; // String literals from the source data should never override graphics from the same definition. if (substitute == nullptr) return true; // The text does not exist. // Modes 2, 3 and 4 must not replace localized textures.