From 8dfd1e6490f0a4dcc9213bbbeab4c280bda6a161 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 27 Apr 2018 10:53:26 +0300 Subject: [PATCH 1/3] Removed unsupported versions of macOS from detection list --- src/posix/cocoa/i_main.mm | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/posix/cocoa/i_main.mm b/src/posix/cocoa/i_main.mm index dbba5cea0..327628e95 100644 --- a/src/posix/cocoa/i_main.mm +++ b/src/posix/cocoa/i_main.mm @@ -145,9 +145,6 @@ static void I_DetectOS() 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 8: name = "OS X Mountain Lion"; break; case 9: name = "OS X Mavericks"; break; From c8eefd84fa056f3d52e8186289357399c169ed60 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 27 Apr 2018 11:03:02 +0300 Subject: [PATCH 2/3] Enabled playing of *gasp sound by default https://forum.zdoom.org/viewtopic.php?t=60361 --- wadsrc/static/zscript/shared/player.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/zscript/shared/player.txt b/wadsrc/static/zscript/shared/player.txt index 8ecce11cb..7b7682e4c 100644 --- a/wadsrc/static/zscript/shared/player.txt +++ b/wadsrc/static/zscript/shared/player.txt @@ -1269,7 +1269,7 @@ class PlayerPawn : Actor native //---------------------------------------------------------------------------- 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 cls); native void CheckMusicChange(); native void CalcHeight (); From 2ae8b0c09310cd957b2c727f662c316b929712b8 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 27 Apr 2018 13:32:38 +0300 Subject: [PATCH 3/3] Added startup song definition for custom IWADs https://forum.zdoom.org/viewtopic.php?t=60314 --- src/d_iwad.cpp | 7 +++++++ src/d_main.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index dd673ebe8..af8047a3d 100644 --- a/src/d_iwad.cpp +++ b/src/d_iwad.cpp @@ -194,6 +194,12 @@ void FIWadManager::ParseIWadInfo(const char *fn, const char *data, int datasize, iwad->StartupType = FStartupInfo::StrifeStartup; else iwad->StartupType = FStartupInfo::DefaultStartup; } + else if (sc.Compare("StartupSong")) + { + sc.MustGetStringName("="); + sc.MustGetString(); + iwad->Song = sc.String; + } else { sc.ScriptError("Unknown keyword '%s'", sc.String); @@ -766,6 +772,7 @@ const FIWADInfo *FIWadManager::FindIWAD(TArray &wadfiles, const char *i DoomStartupInfo.FgColor = iwad_info->FgColor; } if (DoomStartupInfo.Type == 0) DoomStartupInfo.Type = iwad_info->StartupType; + if (DoomStartupInfo.Song.IsEmpty()) DoomStartupInfo.Song = iwad_info->Song; I_SetIWADInfo(); return iwad_info; } diff --git a/src/d_main.h b/src/d_main.h index 5addc5eb4..f48521f8c 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -101,6 +101,7 @@ struct FIWADInfo FString Required; // Requires another IWAD uint32_t FgColor = 0; // Foreground color for title banner uint32_t BkColor = 0xc0c0c0; // Background color for title banner + FString Song; EGameType gametype = GAME_Doom; // which game are we playing? int StartupType = FStartupInfo::DefaultStartup; // alternate startup type FString MapInfo; // Base mapinfo to load