OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Somehow forgot to bump zscript ver to 4.9.

Browse source 
Now there's a shitload of warnings about signed/unsigned comparisons, but those are a gzdoom oversight, they'll be fixed soon.
This commit is contained in:
Mari the Deer 2022-08-05 21:02:09 +02:00
commit c41e9c4615
6 changed files with 10 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r253 \cu(Fri 5 Aug 17:59:09 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r253 \cu(2022-08-05 17:59:09)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r254 \cu(Fri 5 Aug 21:02:09 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r254 \cu(2022-08-05 21:02:09)\c-";

2
zscript.txt
View file

@ -1,4 +1,4 @@
version "4.8.2"
version "4.9"
/*
DEMOLITIONIST Main Codebase

4
zscript/handler/swwm_statichandler_achievements.zsc
View file

@ -107,7 +107,7 @@ extend Class SWWMStaticHandler
private void ParseAchievementList( out Array<SWWMAchievementInfo> achievements )
{
achievements.Clear();
let lmp = SWWMUtility.FindLumpByFullName("achievements.lst");
let lmp = Wads.FindLumpFullName("achievements.lst");
if ( lmp == -1 ) ThrowAbortException("'achievements.lst' not found");
String dat;
Array<String> list, ln;
@ -163,7 +163,7 @@ extend Class SWWMStaticHandler
achievements.Push(ac);
bidx++;
}
lmp = SWWMUtility.FindLumpByFullName("achievements.lst",lmp+1);
lmp = Wads.FindLumpFullName("achievements.lst",lmp+1);
}
}

2
zscript/menu/swwm_menus.zsc
View file

@ -11,7 +11,7 @@ Class OptionMenuItemSWWMVoiceOption : OptionMenuItemOptionBase
Super.Init(label,command,'',graycheck,center);
mCVar = CVar.FindCVar(mAction);
int lmp;
for ( lmp = SWWMUtility.FindLumpByFullName("swwmvoicepack.txt"); lmp != -1; lmp = SWWMUtility.FindLumpByFullName("swwmvoicepack.txt",lmp+1) )
for ( lmp = Wads.FindLumpFullName("swwmvoicepack.txt"); lmp != -1; lmp = Wads.FindLumpFullName("swwmvoicepack.txt",lmp+1) )
{
Array<String> lst;
lst.Clear();

8
zscript/swwm_statichandler.zsc
View file

@ -127,7 +127,7 @@ Class SWWMStaticHandler : StaticEventHandler
// fix voice type cvar
int lmp;
Array<String> types;
for ( lmp = SWWMUtility.FindLumpByFullName("swwmvoicepack.txt"); lmp != -1; lmp = SWWMUtility.FindLumpByFullName("swwmvoicepack.txt",lmp+1) )
for ( lmp = Wads.FindLumpFullName("swwmvoicepack.txt"); lmp != -1; lmp = Wads.FindLumpFullName("swwmvoicepack.txt",lmp+1) )
{
Array<String> lst;
lst.Clear();
@ -153,7 +153,7 @@ Class SWWMStaticHandler : StaticEventHandler
S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
}
// warning for unsupported
if ( SWWMUtility.FindLumpByFullName("swwmgamesupported.txt") != -1 ) return;
if ( Wads.FindLumpFullName("swwmgamesupported.txt") != -1 ) return;
Console.Printf(
"\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\c-\n"
"\cx┃ \cr[\cgWARNING\cr] \cx┃\c-\n"
@ -330,7 +330,7 @@ Class SWWMStaticHandler : StaticEventHandler
else if ( e.Name ~== "swwmtestdlgsize" )
{
let f = Font.GetFont('TewiFont');
let lmp = SWWMUtility.FindLumpByFullName("language.def_dlg");
let lmp = Wads.FindLumpFullName("language.def_dlg");
Array<String> lst;
lst.Clear();
String dat = Wads.ReadLump(lmp);
@ -359,7 +359,7 @@ Class SWWMStaticHandler : StaticEventHandler
l.Destroy();
}
if ( !fail ) Console.Printf("ALL OK");
lmp = SWWMUtility.FindLumpByFullName("language.es_dlg");
lmp = Wads.FindLumpFullName("language.es_dlg");
lst.Clear();
dat = Wads.ReadLump(lmp);
dat.Split(lst,"\n",0);

11
zscript/utility/swwm_utility.zsc
View file

@ -252,17 +252,6 @@ Class SWWMUtility
return c;
}
// THANKS ZSCRIPT
static clearscope int FindLumpByFullName( String name, int startlump = 0, int ns = Wads.GlobalNamespace )
{
for ( int lmp = Wads.FindLump(name,startlump,ns); lmp != -1; lmp = Wads.FindLump(name,lmp+1,ns) )
{
if ( Wads.GetLumpFullName(lmp) ~== name )
return lmp;
}
return -1;
}
// not sure if I should use this, looks a bit ugly
static clearscope void ThousandsStr( out String s, int col = -1 )
{