diff --git a/credits.txt b/credits.txt index 7e2c43867..aea483a0a 100644 --- a/credits.txt +++ b/credits.txt @@ -42,3 +42,4 @@ Most of the work here is original, but there are some notable exceptions: * Ryan Cordell (Demon, Cacodemon, Revenant, Archvile) * Amuscaria (Baron of Hell, Hell Knight) - SiFi270 (Less mean-spirited Keen replacement) + - Widescreen version of Hexen finale screens by Nash. diff --git a/gameinfo.txt b/gameinfo.txt index 8b4ac5e44..7a6e05ed1 100644 --- a/gameinfo.txt +++ b/gameinfo.txt @@ -2,3 +2,4 @@ STARTUPCOLORS = "FF FF FF", "80 40 FF" STARTUPTITLE = "Some Weird Weapons Mod: GZDoom Edition" STARTUPTYPE = "Hexen" STARTUPSONG = "music/H2I4D2E.XM" +LOADWIDESCREEN = 1 diff --git a/graphics/FINALE1_noorb.png b/graphics/FINALE1_noorb.png index 6e9a0cf15..8bbd3cae4 100644 Binary files a/graphics/FINALE1_noorb.png and b/graphics/FINALE1_noorb.png differ diff --git a/language.version b/language.version index cb7834050..24f5561fc 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r500 \cu(Sat 22 May 00:36:45 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r500 \cu(2021-05-22 00:36:45)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r501 \cu(Sat 22 May 18:00:33 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r501 \cu(2021-05-22 18:00:33)\c-"; diff --git a/zscript.txt b/zscript.txt index 29e5d42a9..67476e4e1 100644 --- a/zscript.txt +++ b/zscript.txt @@ -1,4 +1,4 @@ -version "4.5" +version "4.6" /* SWWM GZ Main Codebase diff --git a/zscript/compat/swwm_compat.zsc b/zscript/compat/swwm_compat.zsc index 9b8ab2abd..cc3ac7599 100644 --- a/zscript/compat/swwm_compat.zsc +++ b/zscript/compat/swwm_compat.zsc @@ -88,27 +88,19 @@ Class SWWMLevelCompatibility : LevelPostProcessor // Doom E3M8 case 'EF128313112110ED6C1549AF96AF26C9': level.nextsecretmap = level.nextmap; // so the handler can detect this - // NOT YET IMPLEMENTED - /*if ( LevelInfo.MapExists("E4M1") ) level.nextmap = "E4M1"; - else if ( LevelInfo.MapExists("MAP01") ) level.nextmap = "MAP01";*/ - if ( Wads.FindLump("M_EPI4",0,1) != -1 ) level.nextmap = "E4M1"; - else if ( Wads.FindLump("M_HELL",0,1) != -1 ) level.nextmap = "MAP01"; + if ( LevelInfo.MapExists("E4M1") ) level.nextmap = "E4M1"; + else if ( LevelInfo.MapExists("MAP01") ) level.nextmap = "MAP01"; break; // Doom E4M8 case '2DC939E508AB8EB68AF79D5B60568711': level.nextsecretmap = level.nextmap; // so the handler can detect this - // NOT YET IMPLEMENTED - /*if ( LevelInfo.MapExists("E5M1") ) level.nextmap = "E5M1"; - else if ( LevelInfo.MapExists("MAP01") ) level.nextmap = "MAP01";*/ - if ( Wads.FindLump("M_EPI5",0,1) != -1 ) level.nextmap = "E5M1"; - else if ( Wads.FindLump("M_HELL",0,1) != -1 ) level.nextmap = "MAP01"; + if ( LevelInfo.MapExists("E5M1") ) level.nextmap = "E5M1"; + else if ( LevelInfo.MapExists("MAP01") ) level.nextmap = "MAP01"; break; // SIGIL E5M8 case '6EAD80DA1F30B4B3546FA294EEF9F87C': level.nextsecretmap = level.nextmap; // so the handler can detect this - // NOT YET IMPLEMENTED - /*if ( LevelInfo.MapExists("MAP01") ) level.nextmap = "MAP01";*/ - if ( Wads.FindLump("M_HELL",0,1) != -1 ) level.nextmap = "MAP01"; + if ( LevelInfo.MapExists("MAP01") ) level.nextmap = "MAP01"; break; // Heretic E1M8 case '27639D04F8090D57A47D354992435893': @@ -123,9 +115,7 @@ Class SWWMLevelCompatibility : LevelPostProcessor // Heretic E3M8 case '4719C2C71EF28F52310B889DD5A9778B': level.nextsecretmap = level.nextmap; // so the handler can detect this - // NOT YET IMPLEMENTED - /*if ( LevelInfo.MapExists("E4M1") ) level.nextmap = "E4M1";*/ - if ( Wads.FindLump("EXTENDED",0,1) != -1 ) level.nextmap = "E4M1"; + if ( LevelInfo.MapExists("E4M1") ) level.nextmap = "E4M1"; break; // Heretic E4M8 case '30D1480A6D4F3A3153739D4CCF659C4E': diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index 351bf4ab6..ec57cb0c5 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -683,31 +683,27 @@ Class SWWMStatusBar : BaseStatusBar tag = String.Format("\cg%s\c-",StringTable.Localize("$SWWM_EEXIT")); else if ( poi.trackedline.special == Exit_Secret ) { - // NOT YET IMPLEMENTED - /*LevelInfo l = LevelInfo.FindLevelInfo(level.nextsecretmap); + LevelInfo l = LevelInfo.FindLevelInfo(level.nextsecretmap); if ( l && l.isValid() ) tag = String.Format("\cx%s:\c- %s\c-",StringTable.Localize("$SWWM_SEXIT"),l.LookupLevelName()); - else */tag = String.Format("\cx%s\c-",StringTable.Localize("$SWWM_SEXIT")); + else tag = String.Format("\cx%s\c-",StringTable.Localize("$SWWM_SEXIT")); } else if ( (poi.trackedline.special == Exit_Normal) || ((poi.trackedline.special == ACS_Execute) && (poi.trackedline.Args[0] == -Int('E1M8_KNOCKOUT'))) ) { - // NOT YET IMPLEMENTED - /*LevelInfo l = LevelInfo.FindLevelInfo(level.nextmap); + LevelInfo l = LevelInfo.FindLevelInfo(level.nextmap); if ( l && l.isValid() ) tag = String.Format("\cy%s:\c- %s\c-",StringTable.Localize("$SWWM_NEXIT"),l.LookupLevelName()); - else */tag = String.Format("\cy%s\c-",StringTable.Localize("$SWWM_NEXIT")); + else tag = String.Format("\cy%s\c-",StringTable.Localize("$SWWM_NEXIT")); } else if ( poi.trackedline.special == Teleport_NewMap ) { - // NOT YET IMPLEMENTED - /*LevelInfo l = LevelInfo.FindLevelByNum(poi.trackedline.Args[0]); + LevelInfo l = LevelInfo.FindLevelByNum(poi.trackedline.Args[0]); if ( l && l.isValid() ) tag = String.Format("\cy%s\c-%s\c-",StringTable.Localize("$SWWM_EXIT"),l.LookupLevelName()); - else */tag = String.Format("\cy%s\c-",StringTable.Localize("$SWWM_NEXIT")); + else tag = String.Format("\cy%s\c-",StringTable.Localize("$SWWM_NEXIT")); } else if ( ((poi.trackedline.special == ACS_Execute) || (poi.trackedline.special == ACS_ExecuteAlways)) && (poi.trackedline.Args[0] == -Int('MapFadeOut')) ) { - // NOT YET IMPLEMENTED - /*LevelInfo l = LevelInfo.FindLevelByNum(poi.trackedline.Args[2]); + LevelInfo l = LevelInfo.FindLevelByNum(poi.trackedline.Args[2]); if ( (level.levelnum != 1) && l && l.isValid() ) tag = String.Format("\cy%s\c-%s\c-",StringTable.Localize("$SWWM_EXIT"),l.LookupLevelName()); - else */tag = String.Format("\cy%s\c-",StringTable.Localize("$SWWM_NEXIT")); + else tag = String.Format("\cy%s\c-",StringTable.Localize("$SWWM_NEXIT")); } } Font fnt = LangFont(mMiniwiFont); diff --git a/zscript/menu/swwm_credits.zsc b/zscript/menu/swwm_credits.zsc index 6f68e77ef..c7a92b7ef 100644 --- a/zscript/menu/swwm_credits.zsc +++ b/zscript/menu/swwm_credits.zsc @@ -166,6 +166,7 @@ Class SWWMCreditsMenu : GenericMenu cassets.Push(new("SWWMCreditsEntry").Init(sfnt,"Amuscaria","$SWWM_ASSBARONS")); cassets.Push(new("SWWMCreditsEntry").Init(sfnt,"Ryan Cordell","$SWWM_ASSOTHERS")); cassets.Push(new("SWWMCreditsEntry").Init(sfnt,"SiFi270","$SWWM_ASSKEEN")); + cassets.Push(new("SWWMCreditsEntry").Init(sfnt,"Nash","WidePix")); cmusic.Push(new("SWWMCreditsEntry").Init(sfnt,"Teque","Traumatic State\nDragony\nHidden Tune #242\nHypercardish 1.1")); cmusic.Push(new("SWWMCreditsEntry").Init(sfnt,"lol","olg.mp3")); cfanart.Push(new("SWWMCreditsEntry").Init(sfnt,"Substance20 (@S20TBL)"));