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

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Christoph Oelckers 2018-04-27 20:37:44 +02:00
commit c2333db725
4 changed files with 9 additions and 4 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

3
src/posix/cocoa/i_main.mm
View file

@ -145,9 +145,6 @@ static void I_DetectOS()
if (10 == majorVersion) switch (minorVersion) if (10 == majorVersion) switch (minorVersion)
{ {
case 4: name = "Mac OS X Tiger"; break;
case 5: name = "Mac OS X Leopard"; break;
case 6: name = "Mac OS X Snow Leopard"; break;
case 7: name = "Mac OS X Lion"; break; case 7: name = "Mac OS X Lion"; break;
case 8: name = "OS X Mountain Lion"; break; case 8: name = "OS X Mountain Lion"; break;
case 9: name = "OS X Mavericks"; break; case 9: name = "OS X Mavericks"; break;

2
wadsrc/static/zscript/shared/player.txt
View file

@ -1269,7 +1269,7 @@ class PlayerPawn : Actor native
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
native clearscope int GetMaxHealth(bool withupgrades = false) const; native clearscope int GetMaxHealth(bool withupgrades = false) const;
native bool ResetAirSupply (bool playgasp = false); native bool ResetAirSupply (bool playgasp = true);
native clearscope static String GetPrintableDisplayName(Class<Actor> cls); native clearscope static String GetPrintableDisplayName(Class<Actor> cls);
native void CheckMusicChange(); native void CheckMusicChange();
native void CalcHeight (); native void CalcHeight ();