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

- enabled '+' command line args to execute CCMDs on startup.

Browse source
This commit is contained in:
Christoph Oelckers 2020-01-23 19:14:10 +01:00
parent aebea2eb92
commit bcc254e0ba
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/common/gamecontrol.cpp
View file

@ -681,6 +681,10 @@ int RunGame()
} }
mouseGrabInput(true); // the intros require the mouse to be grabbed. mouseGrabInput(true); // the intros require the mouse to be grabbed.
auto exec = C_ParseCmdLineParams(nullptr);
if (exec) exec->ExecCommands();
return gi->app_main(); return gi->app_main();
} }

6
source/common/music/music.cpp
View file

@ -320,10 +320,10 @@ bool S_ChangeMusic(const char* musicname, int order, bool looping, bool force)
{ {
// Always look in the 'music' subfolder as well. // Always look in the 'music' subfolder as well.
FStringf aliasMusicname("music/%s", musicname); FStringf aliasMusicname("music/%s", musicname);
if ((lumpnum = fileSystem.FindFile(musicname)) == -1 && (g_gameType & GAMEFLAG_SW)) if ((lumpnum = fileSystem.FindFile(aliasMusicname)) == -1 && (g_gameType & GAMEFLAG_SW))
{ {
// Some Shadow Warrioe distributions have the music in a subfolder named 'classic'. Check that, too. // Some Shadow Warrioe distributions have the music in a subfolder named 'classic'. Check that, too.
FStringf aliasMusicname("classic/music/%s", musicname); aliasMusicname.Format("classic/music/%s", musicname);
lumpnum = fileSystem.FindFile(aliasMusicname); lumpnum = fileSystem.FindFile(aliasMusicname);
} }
} }
@ -339,7 +339,7 @@ bool S_ChangeMusic(const char* musicname, int order, bool looping, bool force)
{ {
Printf(TEXTCOLOR_RED "Unable to play music " TEXTCOLOR_WHITE "\"%s\"\n", musicname); Printf(TEXTCOLOR_RED "Unable to play music " TEXTCOLOR_WHITE "\"%s\"\n", musicname);
} }
else if (printmusicinfo) Printf("Playing music from file system %s:%s\n", fileSystem.GetResourceFileFullName(fileSystem.GetFileContainer(lumpnum)), musicname); else if (printmusicinfo) Printf("Playing music from file system %s:%s\n", fileSystem.GetResourceFileFullName(fileSystem.GetFileContainer(lumpnum)), fileSystem.GetFileFullPath(lumpnum));
} }
else if (printmusicinfo) Printf("Playing music from external file %s\n", musicname); else if (printmusicinfo) Printf("Playing music from external file %s\n", musicname);