Small fixups:

- Unbreak input with cheat codes (and set a longer prefix).
 - Fix cracktro scrolls cutting off early.
 - Fix artifacts on M_SWWM graphic due to texture wrap.

FuturePlans.md

@@ -9,15 +9,23 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add after
   7. Blackfire Igniter *(UnSX 5, Ultra Suite 3)*
   8. Rail Carbine *("Tesla Beamer" in Ultra Suite 2 & 3)*
   9. Ray-Khom *(UnSX)*
-* **Actually make a fancy titlemap**
-* **Mod trailer**
-* **Add back the collectibles that were removed due to time constraints**
-* **Fake livestream chat overlay, with dynamic reactions to all sorts of stuff**
-* **Character and item images for the library**
+* ***(Maybe)* Add the collectibles that were removed due to time constraints**
+  - The Black Rat's Coven - Walpurgisnacht *(Debut album)*
+  - Cat Catcher *(Promo poster)*
+  - Hege Cactus *(Appears to absorb all water, causing intense thirst)*
+  - Raidemin Action Figure *(A popular Nukuri superhero, "looks a lot like you")*
+  - Hoagie *(Can't eat it, but looks delicious)*
+  - Lithium - Volume One *(A work of art, one of the finest graphic novels)*
+  - PISS Whiskey *("Is it actually piss or is that just the brand name? Either way, I don't want to know what's inside")*
+  - **[Heretic]** Firemace *("What kind of ridiculous weapon is this?")*
+  - **[Heretic]** Doomguy Action Figure *("Oh, he gets one too?")*
+  - **[Hexen]** Lord Vilkreath - Fundamentals of Puzzle Design *("The hell is this crap?")*
+  - **[Hexen]** Obelisk of the Golden Vale *("I puked out my guts when I touched that fucking thing")*
+* ***(Maybe)* Fake livestream chat overlay, with dynamic reactions to all sorts of stuff**
 * **Mothgirl summon for Lämp easter egg**
 * **Ibuki companion add-on *(w/ optional "stream friendly" clothing)***
-* **Saya model, for scenes or something idk *(or maybe a companion add-on too)***
-* **Kirin model???**
+* **Saya model, for scenes or something idk *(maybe a companion add-on too)***
+* ***(Maybe)* Kirin model???**
 * **Japanese localization???**
 * **Strife support, with rewritten dialogue**
 * **Monster/decoration replacements add-on**

language.version

@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r576 \cu(Sat 24 Oct 18:54:31 CEST 2020)";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r577 \cu(Sat 24 Oct 20:36:36 CEST 2020)";

shaders/glsl/LogoAnimated.fp

@@ -82,6 +82,11 @@ vec4 ProcessTexel()
 	tmp2.a = tmp.a+base.a*(1-tmp.a);
 	tmp2.rgb = (tmp.rgb*tmp.a+base.rgb*base.a*(1-tmp.a))/tmp2.a;
 	if ( tmp2.a == 0. ) tmp2.rgb = vec3(0.);
+	// clamp borders
+	vec2 sz = textureSize(tex,0);
+	vec2 px = uv*sz;
+	if ( (px.x <= 1) || (px.x >= sz.x) || (px.y <= 1) || (px.y >= sz.y) )
+		tmp2 = vec4(0.);
 	// ding, logo's done
 	return tmp2;
 }

zscript/swwm_handler.zsc

@@ -1227,20 +1227,20 @@ Class SWWMHandler : EventHandler
 
 	override bool InputProcess( InputEvent e )
 	{
-		if ( e.Type == InputEvent.TYPE_KeyDown )
+		if ( (e.Type == InputEvent.TYPE_KeyDown) && (e.KeyChar >= 0x61) && (e.KeyChar <= 0x7A) )
 		{
 			// cheat code handling
 			String cht[] =
 			{
-				"mklodsofemone", "mkdeeplore",
+				"swwmlodsofemone", "swwmdeeplore",
 				// SWWM Platinum cheats
-				"mkimstuck",            "mkarmojumbo",         "mkdangimhealthy",
-				"mkwarriorofzaemonath", "mkpowerparp",         "mkcannotseemyhands",
-				"mkreflectonme",        "mkgunzmeneeds",       "mkbloodrainsfromheaven",
-				"mknotwannaboom",       "mkverywrappyoatmeal", "mkflaggerybingo",
-				"mkheadsball",          "mksmarties",          "mknocilla",
-				"mkmarioisaweenie",     "mkpunish",            "mkboingball",
-				"mkgassy",              "mkiamsuperman",       "mktouchstone"
+				"swwmimstuck",            "swwmarmojumbo",         "swwmdangimhealthy",
+				"swwmwarriorofzaemonath", "swwmpowerparp",         "swwmcannotseemyhands",
+				"swwmreflectonme",        "swwmgunzmeneeds",       "swwmbloodrainsfromheaven",
+				"swwmnotwannaboom",       "swwmverywrappyoatmeal", "swwmflaggerybingo",
+				"swwmheadsball",          "swwmsmarties",          "swwmnocilla",
+				"swwmmarioisaweenie",     "swwmpunish",            "swwmboingball",
+				"swwmgassy",              "swwmiamsuperman",       "swwmtouchstone"
 			};
 			String cmd[] =
 			{
@@ -1256,25 +1256,28 @@ Class SWWMHandler : EventHandler
 			};
 			bool matchany = false;
 			kstr.AppendCharacter(e.KeyChar);
-			for ( int i=0; i<cht.Size(); i++ )
+			if ( kstr.Length() > 0 )
 			{
-				if ( kstr != cht[i].Left(kstr.length()) ) continue;
-				matchany = true;
-				if ( kstr != cht[i] ) continue;
-				SendNetworkEvent(cmd[i],consoleplayer);
-				kcode = 0;
-				kstr = "";
-				return true;
-			}
-			if ( !matchany )
-			{
-				kcode = 0;
-				kstr = "";
-			}
-			else
-			{
-				kcode++;
-				if ( kcode > 2 ) return true; // eat keypresses from this point
+				for ( int i=0; i<cht.Size(); i++ )
+				{
+					if ( kstr != cht[i].Left(kstr.length()) ) continue;
+					matchany = true;
+					if ( kstr != cht[i] ) continue;
+					SendNetworkEvent(cmd[i],consoleplayer);
+					kcode = 0;
+					kstr = "";
+					return true;
+				}
+				if ( !matchany )
+				{
+					kcode = 0;
+					kstr = "";
+				}
+				else
+				{
+					kcode++;
+					if ( kcode > 4 ) return true; // eat keypresses from this point
+				}
 			}
 			// F
 			if ( e.KeyChar == 0x66 )

zscript/swwm_title.zsc

@@ -110,7 +110,7 @@ Class SWWMTitleStuff : EventHandler
 				Color c = Color(int(127.5+127.5*sin(10*i+80*(level.maptime+e.FracTic)/Thinker.TICRATE)),0,0);
 				Screen.DrawChar(fnt,Font.CR_SAPPHIRE,xx-xxofs,yy,ch,DTA_VirtualWidth,320,DTA_VirtualHeight,200,DTA_KeepRatio,true,DTA_Alpha,alf);
 			}
-			xx += fnt.GetCharWidth(ch);
+			xx += fnt.GetCharWidth(ch)-1;	// keming
 		}
 	}
 }