OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Merge branch '460_stuff'

Browse source
This commit is contained in:
Mari the Deer 2021-05-22 18:00:33 +02:00
commit 013f501339
8 changed files with 20 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

22
zscript/compat/swwm_compat.zsc
View file

@ -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':

20
zscript/hud/swwm_hud.zsc
View file

@ -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);

1
zscript/menu/swwm_credits.zsc
View file

@ -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)"));