Rename timing hack variables for clarity. Add variable to show base timing.

Author: Merp

MerpMod/Definition.c

@@ -515,8 +515,9 @@ DEFINERAMVAR("MerpMod LC Timing Mode",LCTimingMode,"uint8","E");
 DEFINERAMVAR("MerpMod LC Timing Lock Value",LCTimingLock,"float","E");
 DEFINERAMVAR("MerpMod LC Timing Retard",LCTimingRetard,"float","E");
 DEFINERAMVAR("MerpMod LC Timing Retard Multiplier",LCTimingRetardMultiplier,"float","E");
-DEFINERAMVAR("MerpMod Base Timing Final Target",BaseTimingTarget,"float","E");
-DEFINERAMVAR("MerpMod Base Timing Final Output",BaseTimingOutput,"float","E");
+DEFINERAMVAR("MerpMod Base Timing",BaseTiming,"float","E");
+DEFINERAMVAR("MerpMod Final Timing",FinalTiming,"float","E");
+DEFINERAMVAR("MerpMod Timing Output",TimingOutput,"float","E");
 
 DEFNEW1D("Launch Control Timing Mode",DefaultLCTimingMode);
 DEFNEW1D("Launch Control Timing Lock",DefaultLCTimingLock);	

MerpMod/Metadata.c

@@ -488,7 +488,7 @@ const MetaReplace POLFHook METADATA =
 		op: OpReplace4Bytes,
 		address: hTableBaseTiming,
 		oldval: tBaseTiming,
-		newval: (int)&(pRamVariables.BaseTimingOutput),
+		newval: (int)&(pRamVariables.TimingOutput),
 		name: STR(Timing Table Hook)
 	};
 #else
@@ -497,7 +497,7 @@ const MetaReplace POLFHook METADATA =
 		op: OpReplace4Bytes,
 		address: hTableBaseTimingPCruise,
 		oldval: tBaseTimingPCruise,
-		newval: (int)&(pRamVariables.BaseTimingOutput),
+		newval: (int)&(pRamVariables.TimingOutput),
 		name: STR(Base Timing Primary Cruise Table Hook)
 	};
 	const MetaReplace BaseTimingPNonCruiseTablePatch METADATA =

MerpMod/RamVariables.h

@@ -137,8 +137,9 @@ typedef struct
 	unsigned char 	LCTimingMode;
 	unsigned char	TimingHackEnabled;
 	unsigned char	Tempty1;	
-	float	BaseTimingTarget;
-	float 	BaseTimingOutput;	//97
+	float	BaseTiming;
+	float 	FinalTiming;	//97
+	float	TimingOutput;
 	float 	LCTimingRetard;		//97
 	float 	LCTimingLock;		//97
 	float	LCTimingLockRPM;

MerpMod/TableHackTests.c

@@ -43,16 +43,16 @@ void TimingHackUnitTests()
 	Assert(pRamVariables.LCTimingLock == DefaultLCTimingLock, "check timing lock default value");
 	Assert(pRamVariables.MapBlendRatio == DefaultBlend, "Check default blending value");
 	Assert(pRamVariables.TimingHackInitFlag == 0x01, "Check Timing init flag is set");
-	Assert(pRamVariables.BaseTimingOutput == -12.96875, "check timing map 1 is used");
+	Assert(pRamVariables.TimingOutput == -12.96875, "check timing map 1 is used");
 
 	pRamVariables.MapBlendRatio = 1;
 	TimingHack();
-	Assert(pRamVariables.BaseTimingOutput == -20, "check timing map 1 is used");
+	Assert(pRamVariables.TimingOutput == -20, "check timing map 1 is used");
 
 
 	pRamVariables.MapBlendRatio = 0.5;
 	TimingHack();
-	Assert(pRamVariables.BaseTimingOutput == ((-12.96875 - 20)/2), "check timing map 1 is used");
+	Assert(pRamVariables.TimingOutput == ((-12.96875 - 20)/2), "check timing map 1 is used");
 
 	pRamVariables.LCTimingMode = LCTimingModeLocked;		//Set locked timing, default is +20
 

MerpMod/TimingHacks.c

@@ -45,6 +45,7 @@ float TimingHack()
 #endif
 
 	OutputValue = BlendAndSwitch(TimingTableGroup, *pEngineLoad, *pEngineSpeed);
+	pRamVariables.BaseTiming = OutputValue;
 
 #if TIMING_RAM_TUNING
 	}
@@ -65,12 +66,12 @@ float TimingHack()
 
 	OutputValue -= Abs(pRamVariables.SubtractiveKCA);
 
-	pRamVariables.BaseTimingTarget = OutputValue;
+	pRamVariables.FinalTiming = OutputValue;
 
 	if(pRamVariables.TimingHackEnabled == HackEnabled)
-		pRamVariables.BaseTimingOutput = OutputValue;
+		pRamVariables.TimingOutput = OutputValue;
 	else
-		pRamVariables.BaseTimingOutput = Pull3DHooked((void*)PrimaryOEMTimingTable, *pEngineLoad, *pEngineSpeed);	
+		pRamVariables.TimingOutput = Pull3DHooked((void*)PrimaryOEMTimingTable, *pEngineLoad, *pEngineSpeed);	
 
 	//Call existing!
 	BaseTimingHooked();