zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke/RR: strip trailing spaces off strings parsed in CON.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-19 21:02:31 +02:00
parent 6e919f2364
commit 4d94fa9b03
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/games/duke/src/gamedef.cpp
View file

@ -64,7 +64,9 @@ static TArray<FString> exclEpisodes;
void GameInterface::AddExcludedEpisode(FString episode) void GameInterface::AddExcludedEpisode(FString episode)
{ {
exclEpisodes.Push(FStringTable::MakeMacro(episode.GetChars())); auto s = FStringTable::MakeMacro(episode.GetChars());
s.StripRight();
exclEpisodes.Push(s);
} }
@ -1679,7 +1681,9 @@ int ConCompiler::parsecommand()
// We need both a volume and a cluster for this new episode. // We need both a volume and a cluster for this new episode.
auto vol = MustFindVolume(j); auto vol = MustFindVolume(j);
auto clust = MustFindCluster(j + 1); auto clust = MustFindCluster(j + 1);
vol->name = clust->name = FStringTable::MakeMacro(parsebuffer.Data(), i); FString s = FStringTable::MakeMacro(parsebuffer.Data(), i);;
s.StripRight();
vol->name = clust->name = s;
if (j > 0) vol->flags |= VF_SHAREWARELOCK; if (j > 0) vol->flags |= VF_SHAREWARELOCK;
if (exclEpisodes.Size()) if (exclEpisodes.Size())
{ {
@ -1694,6 +1698,7 @@ int ConCompiler::parsecommand()
return 0; return 0;
} }
case concmd_defineskillname: case concmd_defineskillname:
{
popscriptvalue(); popscriptvalue();
transnum(LABEL_DEFINE); transnum(LABEL_DEFINE);
j = popscriptvalue(); j = popscriptvalue();
@ -1708,9 +1713,11 @@ int ConCompiler::parsecommand()
textptr++, i++; textptr++, i++;
} }
parsebuffer.Push(0); parsebuffer.Push(0);
gSkillNames[j] = FStringTable::MakeMacro(parsebuffer.Data(), i); FString s = FStringTable::MakeMacro(parsebuffer.Data(), i);
s.StripRight();
gSkillNames[j] = s;
return 0; return 0;
}
case concmd_definelevelname: case concmd_definelevelname:
{ {
popscriptvalue(); popscriptvalue();
@ -1767,6 +1774,7 @@ int ConCompiler::parsecommand()
} }
parsebuffer.Push(0); parsebuffer.Push(0);
map->name = FStringTable::MakeMacro(parsebuffer.Data()); map->name = FStringTable::MakeMacro(parsebuffer.Data());
map->name.StripRight();
return 0; return 0;
} }
case concmd_definequote: case concmd_definequote: