Small fixes for VKDoom compatibility.

language.def_menu

@@ -342,13 +342,10 @@ SWWM_CZN2 = "For slope alignment code, and to Nash also for being a cool smart c
 SWWM_CVAL2 = "For the custom Nashgore footprints, and for being a good bun-bot friend.";
 SWWM_CBOUNCY2 = "For lots of help with testing and for letting me rant about lore for hours and being there to listen along. You're a wonderful friend.";
 SWWM_CSLEDGE2 = "For being great buds, not just for me but for all of us. Your support and encouragement are something I value a lot, and I can't thank you enough.";
-SWWM_CSPY2 = "For being so enthusiastic about everything in this mod, and for some sound design assistance here and there.";
 SWWM_CINSP1 = "Combine Kegan, HyperUltra64, TerminusEst13, Yholl and friends";
 SWWM_CINSP2 = "For inspiration and also for being really cool people. Bless all of you, keep being amazing.";
 SWWM_CCOMMUNITY1 = "All my amazing friends";
 SWWM_CCOMMUNITY2 = "For helping me keep this whole thing rolling, and for all the time we spend together. Stay awesome, everyone!";
-SWWM_CDEVS1 = "Randi, Graf, and the rest of the GZDoom dev team";
-SWWM_CDEVS2 = "For your work on the source port that brought back my faith in modding. I don't care what others think, you're great.";
 SWWM_CYOU1 = "You";
 SWWM_CYOU2 = "For playing this mod, thank you so much.";
 SWWM_CLOCAL = "Localization:";

language.es_menu

@@ -300,13 +300,10 @@ SWWM_CZN2 = "Por el código para alineación con superficies inclinadas, y a Nas
 SWWM_CVAL2 = "Por las huellas personalizadas para Nashgore, y por ser una buena amiga conejo-robot.";
 SWWM_CBOUNCY2 = "Por tu gran ayuda con el testeo y por dejar que suelte lore durante horas y estar ahí para escuchar. Eres un amigo maravilloso.";
 SWWM_CSLEDGE2 = "Por ser grandes colegas, no solo conmigo si no con todos nosotros. Vuestro apoyo y ánimo es algo que valoro muchísimo, y no hay forma de agradecéroslo suficientemente.";
-SWWM_CSPY2 = "Por el nivel de entusiasmo mostrado por todo en este mod, y por asistencia con mezclado de sonido aquí y allá.";
 SWWM_CINSP1 = "Combine Kegan, HyperUltra64, TerminusEst13, Yholl y amigos";
 SWWM_CINSP2 = "Por servir de inspiración y por ser gente muy molona. Benditos seáis todos, seguid siendo fenomenales.";
 SWWM_CCOMMUNITY1 = "Todo mi súper colegueo";
 SWWM_CCOMMUNITY2 = "Por ayudarme a seguir trabajando en esto, y por todo el tiempo que compartimos. ¡Os adoro!";
-SWWM_CDEVS1 = "Randi, Graf, y el resto del equipo de desarrollo de GZDoom";
-SWWM_CDEVS2 = "Por vuestro trabajo en el source port que me ha devuelto la fe en el modding. No me importa lo que piensen los demás, sois la caña.";
 SWWM_CYOU1 = "Tú";
 SWWM_CYOU2 = "Por jugar a este mod, muchísimas gracias.";
 SWWM_CLOCAL = "Traducción:";

language.version

@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r953 \cu(Mon 11 Sep 22:20:25 CEST 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r953 \cu(2023-09-11 22:20:25)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r955 \cu(Thu 14 Sep 12:45:34 CEST 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r955 \cu(2023-09-14 12:45:34)\c-";

menudef.txt

@@ -229,11 +229,6 @@ AddOptionMenu "OptionsMenu"
 	Submenu "$SWWM_MTITLE", "SWWMOptionMenu"
 	Submenu "$SWWM_MCREDS", "SWWMCreditsMenu"
 }
-AddOptionMenu "OptionsMenuSimple"
-{
-	Submenu "$SWWM_MTITLE", "SWWMOptionMenu"
-	Submenu "$SWWM_MCREDS", "SWWMCreditsMenu"
-}
 ListMenu "MainMenu"
 {
 	Class "SWWMMainMenu"

shaders/glsl/Envmask.fp

@@ -70,6 +70,5 @@ void SetupMaterial( inout Material mat )
 	mat.Base.rgb += envcol*mask.z;
 #endif
 	mat.Normal = ApplyNormalMap(vTexCoord.st);
-	if ( (uTextureMode&TEXF_Brightmap) != 0 )
-		mat.Bright = texture(brighttexture,vTexCoord.st);
+	mat.Bright = texture(brighttexture,vTexCoord.st);
 }

shaders/glsl/Overbright.fp

@@ -5,9 +5,6 @@ void SetupMaterial( inout Material mat )
 	mat.Base = getTexel(vTexCoord.st);
 	mat.Base.rgb *= OVERFACT;
 	mat.Normal = ApplyNormalMap(vTexCoord.st);
-	if ( (uTextureMode&TEXF_Brightmap) != 0 )
-	{
-		mat.Bright = texture(brighttexture,vTexCoord.st);
-		mat.Bright.rgb *= OVERFACT;
-	}
+	mat.Bright = texture(brighttexture,vTexCoord.st);
+	mat.Bright.rgb *= OVERFACT;
 }

shaders/glsl/PlasmaBlast.fp

@@ -29,8 +29,7 @@ void SetupMaterial( inout Material mat )
 #endif
 	mat.Base = vec4(base.rgb+envcol*mask,base.a);
 	mat.Normal = ApplyNormalMap(vTexCoord.st);
-	if ( (uTextureMode&TEXF_Brightmap) != 0 )
-		mat.Bright = texture(brighttexture,vTexCoord.st);
+	mat.Bright = texture(brighttexture,vTexCoord.st);
 	// status canvas tex (only need two channels)
 	vec2 fade = texture(fadetex,vec2(.5)).rg;
 	// red: battery connection led

zscript/menu/swwm_credits.zsc

@@ -180,10 +180,8 @@ Class SWWMCreditsMenu : GenericMenu
 		cthanks.Push(new("SWWMCreditsEntry").Init("Val Pal","$SWWM_CVAL2"));
 		cthanks.Push(new("SWWMCreditsEntry").Init("BouncyTEM","$SWWM_CBOUNCY2"));
 		cthanks.Push(new("SWWMCreditsEntry").Init("\ctCptSledge\c- & \cdBunray\c-","$SWWM_CSLEDGE2"));
-		cthanks.Push(new("SWWMCreditsEntry").Init("a1337spy","$SWWM_CSPY2"));
 		cthanks.Push(new("SWWMCreditsEntry").Init("$SWWM_CINSP1","$SWWM_CINSP2"));
 		cthanks.Push(new("SWWMCreditsEntry").Init("$SWWM_CCOMMUNITY1","$SWWM_CCOMMUNITY2"));
-		cthanks.Push(new("SWWMCreditsEntry").Init("$SWWM_CDEVS1","$SWWM_CDEVS2"));
 		cthanks.Push(new("SWWMCreditsEntry").Init("$SWWM_CYOU1","$SWWM_CYOU2"));
 		speed = 16.;
 		spos = ss.y-logosz.y;