zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 05:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added startup song definition for custom IWADs

Browse source 
https://forum.zdoom.org/viewtopic.php?t=60314
This commit is contained in:
alexey.lysiuk 2018-04-27 13:32:38 +03:00
parent c8eefd84fa
commit 2ae8b0c093
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/d_iwad.cpp
View file

@ -194,6 +194,12 @@ void FIWadManager::ParseIWadInfo(const char *fn, const char *data, int datasize,
iwad->StartupType = FStartupInfo::StrifeStartup; iwad->StartupType = FStartupInfo::StrifeStartup;
else iwad->StartupType = FStartupInfo::DefaultStartup; else iwad->StartupType = FStartupInfo::DefaultStartup;
} }
else if (sc.Compare("StartupSong"))
{
sc.MustGetStringName("=");
sc.MustGetString();
iwad->Song = sc.String;
}
else else
{ {
sc.ScriptError("Unknown keyword '%s'", sc.String); sc.ScriptError("Unknown keyword '%s'", sc.String);
@ -766,6 +772,7 @@ const FIWADInfo *FIWadManager::FindIWAD(TArray<FString> &wadfiles, const char *i
DoomStartupInfo.FgColor = iwad_info->FgColor; DoomStartupInfo.FgColor = iwad_info->FgColor;
} }
if (DoomStartupInfo.Type == 0) DoomStartupInfo.Type = iwad_info->StartupType; if (DoomStartupInfo.Type == 0) DoomStartupInfo.Type = iwad_info->StartupType;
if (DoomStartupInfo.Song.IsEmpty()) DoomStartupInfo.Song = iwad_info->Song;
I_SetIWADInfo(); I_SetIWADInfo();
return iwad_info; return iwad_info;
} }

1
src/d_main.h
View file

@ -101,6 +101,7 @@ struct FIWADInfo
FString Required; // Requires another IWAD FString Required; // Requires another IWAD
uint32_t FgColor = 0; // Foreground color for title banner uint32_t FgColor = 0; // Foreground color for title banner
uint32_t BkColor = 0xc0c0c0; // Background color for title banner uint32_t BkColor = 0xc0c0c0; // Background color for title banner
FString Song;
EGameType gametype = GAME_Doom; // which game are we playing? EGameType gametype = GAME_Doom; // which game are we playing?
int StartupType = FStartupInfo::DefaultStartup; // alternate startup type int StartupType = FStartupInfo::DefaultStartup; // alternate startup type
FString MapInfo; // Base mapinfo to load FString MapInfo; // Base mapinfo to load