Small cleaning up.

language.version

@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1114 \cu(Wed 20 Mar 13:45:22 CET 2024)\c-";
-SWWM_SHORTVER="\cw1.3pre r1114 \cu(2024-03-20 13:45:22)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1115 \cu(Thu 21 Mar 12:04:07 CET 2024)\c-";
+SWWM_SHORTVER="\cw1.3pre r1115 \cu(2024-03-21 12:04:07)\c-";

menudef.txt

@@ -111,7 +111,6 @@ OptionMenu "SWWMOptionMenu"
 	SafeCommand "$SWWM_ARESET", "event swwmresetachievements"
 	Submenu "$SWWM_DBGTITLE", "SWWMDebugMenu"
 	StaticText " "
-
 	StaticText "$SWWM_PTITLE", 1
 	SWWMPlayTime "$SWWM_PLAYTIME", "swwm_playtime"
 	SWWMVoiceOption "$SWWM_VOICETYPE", "swwm_voicetype"
@@ -121,6 +120,7 @@ OptionMenu "SWWMOptionMenu"
 	Option "$SWWM_VOICELOG", "swwm_voicelog", "YesNo"
 	Option "$SWWM_BEEPBOOP", "swwm_beepboop", "YesNo"
 	Option "$SWWM_ANALOGMOVE", "swwm_analogmove", "YesNo"
+	Option "$SWWM_SKIPSKILL", "swwm_skipskill", "YesNo"
 	Option "$SWWM_REVIVE", "swwm_revive", "YesNo"
 	ScaleSliderFix "$SWWM_REVIVECOOLDOWN", "swwm_revivecooldown", -1, 300, 30, "$SWWM_UNLIMITED", "$SWWM_ONERETRY"
 	Submenu "$SWWM_ATITLE", "SWWMAchievementMenu"
@@ -134,7 +134,6 @@ OptionMenu "SWWMOptionMenu"
 	StaticText " "
 	StaticText "$SWWM_UTITLE", 1
 	Option "$SWWM_MENUPAUSE", "swwm_menupause", "YesNo"
-	Option "$SWWM_SKIPSKILL", "swwm_skipskill", "YesNo"
 	Option "$SWWM_FORCESTATS", "swwm_forcestats", "SWWMForceStats"
 	Option "$SWWM_PERCENTSTATS", "swwm_percentstats", "YesNo"
 	Slider "$SWWM_HUDMARGIN", "swwm_hudmargin", 0, 10, 1, 0

zscript/player/swwm_player_anim.zsc

@@ -545,7 +545,7 @@ extend Class Demolitionist
 			return 2;	// sprinting
 		}
 		if ( bWalking ) return 0;	// walking
-		if ( isRunning() ) return 2;	// sprinting
+		if ( IsRunning() ) return 2;	// sprinting
 		return 1;	// running
 	}
 

zscript/player/swwm_player_move.zsc

@@ -1,11 +1,11 @@
 // general movement code
 extend Class Demolitionist
 {
-	bool isRunning()
+	bool IsRunning()
 	{
-		// for analog move, use midpoint between run/sprint
+		// for analog move, check for full sprint speed
 		if ( isAnalogMoving )
-			return (NormalizedMove().length() >= (gameinfo.normforwardmove[1]*256.));
+			return (NormalizedMove().length >= (gameinfo.normforwardmove[1]*256.));
 		return !!(player.cmd.buttons&BT_RUN);
 	}
 
@@ -46,7 +46,7 @@ extend Class Demolitionist
 				fact = SWWMUtility.MapRange(rspeed,sspeed,.4,1.1,mscale);
 			else fact = 1.1;	// sprinting
 		}
-		else fact = bWalking?.08:(player.cmd.buttons&BT_RUN)?1.1:.4;
+		else fact = bWalking?.08:IsRunning()?1.1:.4;
 		for ( Inventory i=Inv; i; i=i.Inv ) fact *= i.GetSpeedFactor();
 		return fact;
 	}
@@ -140,7 +140,7 @@ extend Class Demolitionist
 			if ( m != n )
 			{
 				int side = (sin(bobtime*180.)>0.)?1:-1;
-				int spd = bWalking?0:isRunning()?2:1;
+				int spd = bWalking?0:IsRunning()?2:1;
 				PlayFootstep(side,spd);
 			}
 		}
@@ -651,7 +651,7 @@ extend Class Demolitionist
 						// bhop, z vel relative to vel size
 						if ( vel.z < 25. )	// don't ramp up too hard
 						{
-							vel.z += jumpvelz*((isRunning()?1.2:.65)+vel.length()*.01);
+							vel.z += jumpvelz*((IsRunning()?1.2:.65)+vel.length()*.01);
 							// add part of last landing z velocity too
 							vel.z += max(0,-landvelz*(raging?.45:.35));
 						}
@@ -663,7 +663,7 @@ extend Class Demolitionist
 						// first jump
 						if ( vel.z < 10. )	// don't ramp up too hard
 						{
-							vel.z += jumpvelz*(bWalking?.75:isRunning()?1.25:1.);
+							vel.z += jumpvelz*(bWalking?.75:IsRunning()?1.25:1.);
 							// add part of last landing z velocity too
 							vel.z += max(0,-landvelz*(raging?.35:.25));
 						}

zscript/player/swwm_player_tick.zsc

@@ -348,7 +348,7 @@ extend Class Demolitionist
 				if ( FindInventory("RagekitPower") )
 				{
 					// stop for just a split second UNLESS bunnyhopping
-					if ( !isRunning() || (level.maptime >= (lastairtic+10)) )
+					if ( !IsRunning() || (level.maptime >= (lastairtic+10)) )
 						ReactionTime = 6;
 				}
 				else