zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-04 06:55:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- properly macro-fy parsed strings from Blood's INI.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-19 21:09:49 +02:00
parent 4d94fa9b03
commit 1214f8ba00
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/core/mapinfo.h
View file

@ -65,12 +65,6 @@ extern int gDefaultVolume, gDefaultSkill;
// Localization capable replacement of the game specific solutions.
inline void MakeStringLocalizable(FString &quote)
{
// Only prepend a quote if the string is localizable.
if (quote.Len() > 0 && quote[0] != '$' && GStrings[quote]) quote.Insert(0, "$");
}
enum
{
MI_FORCEEOG = 1,
@ -172,7 +166,8 @@ struct MapRecord
void SetName(const char *n)
{
name = n;
MakeStringLocalizable(name);
name.StripRight();
name = FStringTable::MakeMacro(name);
}
void SetFileName(const char* n)
{

5
source/games/blood/src/levels.cpp
View file

@ -167,8 +167,9 @@ void levelLoadDefaults(void)
auto cluster = MustFindCluster(i);
auto volume = MustFindVolume(i);
CutsceneDef &csB = cluster->outro;
auto ep_str = BloodINI->GetKeyString(buffer, "Title", buffer);
cluster->name = volume->name = ep_str;
FString ep_str = BloodINI->GetKeyString(buffer, "Title", buffer);
ep_str.StripRight();
cluster->name = volume->name = FStringTable::MakeMacro(ep_str);
if (i > 1) volume->flags |= VF_SHAREWARELOCK;
if (BloodINI->GetKeyInt(buffer, "BloodBathOnly", 0)) volume->flags |= VF_HIDEFROMSP;