OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Cleaning up.

Browse source
This commit is contained in:
Mari the Deer 2023-02-11 17:03:43 +01:00
commit 35b8b986db
15 changed files with 127 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

3
zscript/handler/swwm_handler_replacements.zsc
View file

@ -3,7 +3,6 @@
extend Class SWWMHandler
{
bool nugflip; // h/a nugget flip-flop spawn counter
bool equinoxhack; // hackaround for UseInventory
private Class<Actor> GetDRLAReplacee( Class<Actor> a )
{
@ -700,7 +699,7 @@ extend Class SWWMHandler
}
else if ( (e.Replacee is 'RedCard') && !(e.Replacee is 'ChexRedCard') )
{
if ( !equinoxhack && (level.GetChecksum() ~== "3805A661D5C4523AFF7BF86991071043") )
if ( level.GetChecksum() ~== "3805A661D5C4523AFF7BF86991071043" )
{
if ( profiling ) ProfileTock(PT_CHECKREPLACEMENT);
return; // don't replace red key in Equinox MAP13

9
zscript/handler/swwm_statichandler.zsc
View file

@ -89,8 +89,7 @@ Class SWWMStaticHandler : StaticEventHandler
for ( int i=0; i<MAXPLAYERS; i++ )
{
if ( !playeringame[i] || !(players[i].mo is 'Demolitionist') ) continue;
let demo = Demolitionist(players[i].mo);
demo.CheckUnderwaterAmb(true);
Demolitionist(players[i].mo).CheckUnderwaterAmb(true);
}
}
SWWMHandler.ClearAllShaders();
@ -139,7 +138,7 @@ Class SWWMStaticHandler : StaticEventHandler
// fix voice type cvar
int lmp;
Array<String> types;
for ( lmp = Wads.FindLumpFullName("swwmvoicepack.txt"); lmp != -1; lmp = Wads.FindLumpFullName("swwmvoicepack.txt",lmp+1) )
for ( lmp = Wads.FindLumpFullName("swwmvoicepack",0,true); lmp != -1; lmp = Wads.FindLumpFullName("swwmvoicepack",lmp+1,true) )
{
Array<String> lst;
lst.Clear();
@ -159,7 +158,7 @@ Class SWWMStaticHandler : StaticEventHandler
else LoadAchievements();
// precache fonts
Array<String> fonts;
for ( lmp = Wads.FindLumpFullName("precachefonts.txt"); lmp != -1; lmp = Wads.FindLumpFullName("precachefonts.txt",lmp+1) )
for ( lmp = Wads.FindLumpFullName("precachefonts",0,true); lmp != -1; lmp = Wads.FindLumpFullName("precachefonts",lmp+1,true) )
{
Array<String> lst;
lst.Clear();
@ -180,7 +179,7 @@ Class SWWMStaticHandler : StaticEventHandler
S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
}
// warning for unsupported
if ( Wads.FindLumpFullName("swwmgamesupported.txt") != -1 ) return;
if ( Wads.FindLumpFullName("swwmgamesupported",0,true) != -1 ) return;
Console.Printf(
"\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\c-\n"
"\cx┃ \cr[\cgWARNING\cr] \cx┃\c-\n"