zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The shareware -file check wasn't working anymore.

Browse source 
SVN r3156 (trunk)
This commit is contained in:
Christoph Oelckers 2011-02-20 08:27:48 +00:00
parent 1b93b56f46
commit 4eaa7b1aaf
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/d_main.cpp
View file

@ -1587,10 +1587,6 @@ static void GetCmdLineFiles(TArray<FString> &wadfiles)
int i, argc; int i, argc;
argc = Args->CheckParmList("-file", &args); argc = Args->CheckParmList("-file", &args);
if ((gameinfo.flags & GI_SHAREWARE) && argc > 0)
{
I_FatalError ("You cannot -file with the shareware version. Register!");
}
for (i = 0; i < argc; ++i) for (i = 0; i < argc; ++i)
{ {
D_AddWildFile(wadfiles, args[i]); D_AddWildFile(wadfiles, args[i]);
@ -2044,7 +2040,7 @@ void D_DoomMain (void)
GetCmdLineFiles(pwads); GetCmdLineFiles(pwads);
FString iwad = CheckGameInfo(pwads); FString iwad = CheckGameInfo(pwads);
// The IWAD selection dialogue dpes not show in fullscreen so if the // The IWAD selection dialogue does not show in fullscreen so if the
// restart is initiated without a defined IWAD assume for now that it's not going to change. // restart is initiated without a defined IWAD assume for now that it's not going to change.
if (iwad.Len() == 0) iwad = lastIWAD; if (iwad.Len() == 0) iwad = lastIWAD;
@ -2055,6 +2051,11 @@ void D_DoomMain (void)
gameinfo.ConfigName = iwad_info->Configname; gameinfo.ConfigName = iwad_info->Configname;
lastIWAD = iwad; lastIWAD = iwad;
if ((gameinfo.flags & GI_SHAREWARE) && pwads.Size() > 0)
{
I_FatalError ("You cannot -file with the shareware version. Register!");
}
FBaseCVar::DisableCallbacks(); FBaseCVar::DisableCallbacks();
GameConfig->DoGameSetup (gameinfo.ConfigName); GameConfig->DoGameSetup (gameinfo.ConfigName);