zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-27 04:00:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'scriptable_cutscenes' into newrenderer

Browse source
This commit is contained in:
Christoph Oelckers 2021-05-03 18:50:41 +02:00
commit 6589222da6
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/core/gamecontrol.cpp
View file

@ -670,13 +670,16 @@ static TArray<GrpEntry> SetupGame()
{ {
for (auto& str : game) for (auto& str : game)
{ {
int g = 0;
for (auto& grp : groups) for (auto& grp : groups)
{ {
if (grp.FileInfo.gameid.CompareNoCase(str) == 0) if (grp.FileInfo.gameid.CompareNoCase(str) == 0)
{ {
userConfig.gamegrp = grp.FileName; userConfig.gamegrp = grp.FileName;
groupno = g;
goto foundit; goto foundit;
} }
g++;
} }
} }
} }
@ -684,16 +687,18 @@ static TArray<GrpEntry> SetupGame()
// If the user has specified a file name, let's see if we know it. // If the user has specified a file name, let's see if we know it.
// //
if (userConfig.gamegrp.Len()) if (groupno == -1 && userConfig.gamegrp.Len())
{ {
FString gamegrplower = "/" + userConfig.gamegrp.MakeLower(); FString gamegrplower = userConfig.gamegrp.MakeLower();
if (gamegrplower[1] != ':' || gamegrplower[2] != '/') gamegrplower.Insert(0, "/");
int g = 0; int g = 0;
for (auto& grp : groups) for (auto& grp : groups)
{ {
auto grplower = grp.FileName.MakeLower(); auto grplower = grp.FileName.MakeLower();
grplower.Substitute("\\", "/"); FixPathSeperator(grplower);
if (grplower.LastIndexOf(gamegrplower) == grplower.Len() - gamegrplower.Len()) int pos = grplower.LastIndexOf(gamegrplower);
if (pos >= 0 && pos == grplower.Len() - gamegrplower.Len())
{ {
groupno = g; groupno = g;
break; break;