From 5bac1614c4bdf770865a0a2b6b39857db0f3d903 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Mon, 14 Feb 2022 01:22:58 +0100
Subject: [PATCH] Fix more wrong code (constant arrays not declared as "static
 const) This fixes a crash in recent GZDoom devbuilds.

---
 language.version                                    | 4 ++--
 zscript/handler/swwm_handler_cheats.zsc             | 4 ++--
 zscript/handler/swwm_statichandler_achievements.zsc | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/language.version b/language.version
index fa023b19f..d57e2a711 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r158 \cu(Mon 14 Feb 01:14:50 CET 2022)\c-";
-SWWM_SHORTVER="\cw1.2pre r158 \cu(2022-02-14 01:14:50)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r160 \cu(Mon 14 Feb 01:23:14 CET 2022)\c-";
+SWWM_SHORTVER="\cw1.2pre r160 \cu(2022-02-14 01:23:14)\c-";
diff --git a/zscript/handler/swwm_handler_cheats.zsc b/zscript/handler/swwm_handler_cheats.zsc
index 178b1fec9..847546a8a 100644
--- a/zscript/handler/swwm_handler_cheats.zsc
+++ b/zscript/handler/swwm_handler_cheats.zsc
@@ -399,7 +399,7 @@ extend Class SWWMHandler
 	private ui bool CheatInput( InputEvent e )
 	{
 		// cheat code handling
-		String cht[] =
+		static const String cht[] =
 		{
 			"swwmlodsofemone", "swwmdeeplore", "swwmfroggygang", "swwmforgetaboutit",
 			"swwmmisterproper", "swwmstinky",
@@ -412,7 +412,7 @@ extend Class SWWMHandler
 			"swwmmarioisaweenie",     "swwmpunish",            "swwmboingball",
 			"swwmgassy",              "swwmiamsuperman",       "swwmtouchstone"
 		};
-		String cmd[] =
+		static const String cmd[] =
 		{
 			"swwmmoneycheat", "swwmlorecheat", "swwmfroggycheat", "swwmamnesiacheat",
 			"swwmjanitorcheat", "swwmsewercountcheat",
diff --git a/zscript/handler/swwm_statichandler_achievements.zsc b/zscript/handler/swwm_statichandler_achievements.zsc
index b59faecd0..1d62a9ba5 100644
--- a/zscript/handler/swwm_statichandler_achievements.zsc
+++ b/zscript/handler/swwm_statichandler_achievements.zsc
@@ -179,7 +179,7 @@ extend Class SWWMStaticHandler
 			return;
 		}
 		// decode
-		int cypher[] = {0xAD,0xEA,0xDB,0xED};
+		static const int cypher[] = {0xAD,0xEA,0xDB,0xED};
 		String nstr = "";
 		for ( int i=0; i<statestr.length(); i+=2 )
 		{
@@ -301,7 +301,7 @@ extend Class SWWMStaticHandler
 		progstr.Replace("}","");
 		progstr.Replace("\"","");
 		// cheap encode
-		int cypher[] = {0xAD,0xEA,0xDB,0xED};
+		static const int cypher[] = {0xAD,0xEA,0xDB,0xED};
 		String nstr = "";
 		for ( int i=0; i<statestr.length(); i++ )
 		{