zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into vulkan2

Browse source
This commit is contained in:
Rachael Alexanderson 2019-04-08 08:45:29 -04:00
commit b0bd8f800c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gamedata/textures/texturemanager.cpp
View file

@ -428,6 +428,7 @@ bool FTextureManager::OkForLocalization(FTextureID texnum, const char *substitut
uint32_t langtable = 0; uint32_t langtable = 0;
if (*substitute == '$') substitute = GStrings.GetString(substitute+1, &langtable); 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. if (substitute == nullptr) return true; // The text does not exist.
// Modes 2, 3 and 4 must not replace localized textures. // Modes 2, 3 and 4 must not replace localized textures.

2
src/p_acs.cpp
View file

@ -4372,7 +4372,7 @@ int DLevelScript::GetActorProperty (int tid, int property)
case APROP_Radius: return DoubleToACS(actor->radius); case APROP_Radius: return DoubleToACS(actor->radius);
case APROP_ReactionTime:return actor->reactiontime; case APROP_ReactionTime:return actor->reactiontime;
case APROP_MeleeRange: return DoubleToACS(actor->meleerange); 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()); return DoubleToACS(actor->player->DefaultViewHeight());
} }