From c41e9c461560392e1bc077fa62e3d2781166c21a Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Fri, 5 Aug 2022 21:02:09 +0200
Subject: [PATCH] Somehow forgot to bump zscript ver to 4.9. Now there's a
 shitload of warnings about signed/unsigned comparisons, but those are a
 gzdoom oversight, they'll be fixed soon.

---
 language.version                                    |  4 ++--
 zscript.txt                                         |  2 +-
 zscript/handler/swwm_statichandler_achievements.zsc |  4 ++--
 zscript/menu/swwm_menus.zsc                         |  2 +-
 zscript/swwm_statichandler.zsc                      |  8 ++++----
 zscript/utility/swwm_utility.zsc                    | 11 -----------
 6 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/language.version b/language.version
index 53c56f805..fbbdce27f 100644
--- a/language.version
+++ b/language.version
@@ -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-";
diff --git a/zscript.txt b/zscript.txt
index 74e3be246..3230521ec 100644
--- a/zscript.txt
+++ b/zscript.txt
@@ -1,4 +1,4 @@
-version "4.8.2"
+version "4.9"
 
 /*
    DEMOLITIONIST Main Codebase
diff --git a/zscript/handler/swwm_statichandler_achievements.zsc b/zscript/handler/swwm_statichandler_achievements.zsc
index bc68887ba..606836619 100644
--- a/zscript/handler/swwm_statichandler_achievements.zsc
+++ b/zscript/handler/swwm_statichandler_achievements.zsc
@@ -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);
 		}
 	}
 
diff --git a/zscript/menu/swwm_menus.zsc b/zscript/menu/swwm_menus.zsc
index 49d739ba0..ede82458e 100644
--- a/zscript/menu/swwm_menus.zsc
+++ b/zscript/menu/swwm_menus.zsc
@@ -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();
diff --git a/zscript/swwm_statichandler.zsc b/zscript/swwm_statichandler.zsc
index 38a067ba2..74db493c9 100644
--- a/zscript/swwm_statichandler.zsc
+++ b/zscript/swwm_statichandler.zsc
@@ -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);
diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc
index c284a507c..b038b7465 100644
--- a/zscript/utility/swwm_utility.zsc
+++ b/zscript/utility/swwm_utility.zsc
@@ -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 )
 	{