IF guard for unused spring weapon

Author: Niko

decompile/General/Vehicle/TEST_VehPhysGeneral_JumpAndFriction.c

@@ -78,8 +78,13 @@ void FUN_80060630(struct Thread* t, struct Driver* d)
   uVar14 = 0;
   *(unsigned int *)(puVar15 + 0x20) = *(unsigned int *)(uVar12 + 0x90);
   iVar9 = 0;
+  
   if ((*(unsigned int *)(uVar12 + 0x2c8) & 1) == 0) {
+
 LAB_80060ab0:
+
+// UNUSED Spring Weapon
+#if 0
     if (((*(unsigned int *)(uVar12 + 0x2c8) & 0x8000) != 0) && (*(char *)(uVar12 + 0x36) == '\x05')) {
       *(unsigned int *)(uVar12 + 0x2c8) = *(unsigned int *)(uVar12 + 0x2c8) & 0xffff7fff;
       if ((*(short *)(uVar12 + 0x3f4) != 0) && (*(short *)(uVar12 + 0x3f2) == 0)) {
@@ -95,7 +100,9 @@ void FUN_80060630(struct Thread* t, struct Driver* d)
       }
       *(unsigned short *)(uVar12 + 0x3c) = 0;
     }
-    if (*(char *)(uVar12 + 0x366) == '\0') {
+#endif
+	
+	if (*(char *)(uVar12 + 0x366) == '\0') {
       if (((*(short *)(uVar12 + 0x3f4) == 0) || (*(short *)(uVar12 + 0x3f0) == 0)) ||
          (*(short *)(uVar12 + 0x3f2) != 0)) {
         if ((*(unsigned int *)(uVar12 + 0x2c8) & 1) != 0) {

decompile/General/Vehicle/VehPhysGeneral_4_JumpAndFriction.c

@@ -91,7 +91,8 @@ void DECOMP_VehPhysGeneral_JumpAndFriction(struct Thread *t, struct Driver *d)
 
 CHECK_FOR_ANY_JUMP:
 
-
+// UNUSED Spring Weapon
+#if 0
     // If you want to fire a weapon
     if (((d->actionsFlagSet & 0x8000) != 0) &&
 
@@ -119,6 +120,7 @@ void DECOMP_VehPhysGeneral_JumpAndFriction(struct Thread *t, struct Driver *d)
       }
       d->noItemTimer = 0;
     }
+#endif
 
     // if not being forced to jump (turtles), this should cause the tiny jumps on top of walls.
     if (d->forcedJump_trampoline == 0)
@@ -232,7 +234,7 @@ void DECOMP_VehPhysGeneral_JumpAndFriction(struct Thread *t, struct Driver *d)
              ((-1 < d->baseSpeed || (-1 < iVar8)))) goto PROCESS_ACCEL;
         }
 
-        iVar9 = d->const_Accel_ClassStat + (d->accelConst << 5) / 5;
+        iVar9 = d->const_Accel_ClassStat + ((int)d->accelConst << 5) / 5;
 
         if ((d->stepFlagSet & 3) == 0) 
 		{
@@ -263,21 +265,33 @@ void DECOMP_VehPhysGeneral_JumpAndFriction(struct Thread *t, struct Driver *d)
 
     if (d->baseSpeed < 0) {
       d->unk_offset3B2 = -(short)uVar10;
+	  
+	  movement.vx -= param_1;
+	  movement.vy -= param_2;
+	  movement.vz -= param_3;
+	  
+	  // unused?
+	  #if 0
       d->unkVectorX = -(short)param_1;
       d->unkVectorY = -(short)param_2;
       d->unkVectorZ = -(short)param_3;
+	  #endif
     }
     else {
       d->unk_offset3B2 = (short)uVar10;
+	  
+	  movement.vx += param_1;
+	  movement.vy += param_2;
+	  movement.vz += param_3;
+	  
+	  // unused?
+	  #if 0
       d->unkVectorX = (short)param_1;
       d->unkVectorY = (short)param_2;
       d->unkVectorZ = (short)param_3;
-    }
-	
-    movement.vx += d->unkVectorX;
-    movement.vy += d->unkVectorY;
-    movement.vz += d->unkVectorZ;
-    
+	  #endif
+	}
+
 	uVar14 = VehCalc_FastSqrt(
 		movement.vx * movement.vx +
         movement.vy * movement.vy +