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

Adapted Cocoa IWAD picker to recent changes in IWAD loading

Browse source
This commit is contained in:
alexey.lysiuk 2017-08-20 12:35:40 +03:00
parent cc3e36cfdc
commit 2375823055
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/posix/osx/iwadpicker_cocoa.mm
View file

@ -395,11 +395,11 @@ static NSString* GetArchitectureString()
#endif #endif
} }
static void RestartWithParameters(const char* iwadPath, NSString* parameters) static void RestartWithParameters(const WadStuff& wad, NSString* parameters)
{ {
assert(nil != parameters); assert(nil != parameters);
defaultiwad = ExtractFileBase(iwadPath); defaultiwad = wad.Name;
GameConfig->DoGameSetup("Doom"); GameConfig->DoGameSetup("Doom");
M_SaveDefaults(NULL); M_SaveDefaults(NULL);
@ -427,7 +427,7 @@ static void RestartWithParameters(const char* iwadPath, NSString* parameters)
[arguments addObject:@"-wad_picker_restart"]; [arguments addObject:@"-wad_picker_restart"];
[arguments addObject:@"-iwad"]; [arguments addObject:@"-iwad"];
[arguments addObject:[NSString stringWithUTF8String:iwadPath]]; [arguments addObject:[NSString stringWithUTF8String:wad.Path]];
for (int i = 1, count = Args->NumArgs(); i < count; ++i) for (int i = 1, count = Args->NumArgs(); i < count; ++i)
{ {
@ -477,7 +477,7 @@ int I_PickIWad_Cocoa (WadStuff *wads, int numwads, bool showwin, int defaultiwad
{ {
if (0 != [parametersToAppend length]) if (0 != [parametersToAppend length])
{ {
RestartWithParameters(wads[ret].Path, parametersToAppend); RestartWithParameters(wads[ret], parametersToAppend);
} }
} }