- added 'nospriterename' key to GAMEINFO lump so that PWADs have a means to disable this feature without having to specify a command line switch.

SVN r2623 (trunk)
This commit is contained in:
Christoph Oelckers 2010-08-28 17:19:48 +00:00
parent 4e1a514455
commit 387bfc0260
2 changed files with 7 additions and 1 deletions

View file

@ -201,6 +201,7 @@ gamestate_t wipegamestate = GS_DEMOSCREEN; // can be -1 to force a wipe
bool PageBlank; bool PageBlank;
FTexture *Page; FTexture *Page;
FTexture *Advisory; FTexture *Advisory;
bool nospriterename;
cycle_t FrameCycles; cycle_t FrameCycles;
@ -1678,6 +1679,10 @@ static FString ParseGameInfo(TArray<FString> &pwads, const char *fn, const char
} }
while (sc.CheckToken(',')); while (sc.CheckToken(','));
} }
else if (!nextKey.CompareNoCase("NOSPRITERENAME"))
{
nospriterename = true;
}
} }
return iwad; return iwad;
} }

View file

@ -70,6 +70,7 @@ struct FWadCollection::LumpRecord
}; };
// EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
extern bool nospriterename;
// PUBLIC FUNCTION PROTOTYPES ---------------------------------------------- // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
@ -759,7 +760,7 @@ void FWadCollection::RenameSprites ()
} }
} }
renameAll = !!Args->CheckParm ("-oldsprites"); renameAll = !!Args->CheckParm ("-oldsprites") || nospriterename;
for (DWORD i = 0; i < LumpInfo.Size(); i++) for (DWORD i = 0; i < LumpInfo.Size(); i++)
{ {