Skip to content

Commit 05cc633

Browse files
committed
v10.0.0.1338
- Removed unused Thread Delay variable. * Fixed some default values to be consistent with the config file.
1 parent 15e5be9 commit 05cc633

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

NFSMWExtraOptions/ExtraOptionsStuff.h

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ float heatLevel, gameSpeed, FallingRainSize, RainAmount, RoadReflection, RainInt
1313
int hotkeyToggleForceHeat, hotkeyForceHeatLevel, hotkeyToggleCopLights, hotkeyToggleHeadlights, hotkeyCarHack, hotkeyUnlockAllThings, hotkeyAutoDrive, randomizeCount, hotkeyToggleCops, hotkeyFreezeCamera, NosTrailRepeatCount, UG2SaveMoney, ForceMaximumFSAALevel;
1414
unsigned char raceType, raceMode, minLaps, maxLaps, minOpponents, maxOpponents, maxLapsRandomQR, maxOpponentsRandomQR, maxBlacklist, csBlacklist, headlightsMode, lowTraffic, medTraffic, highTraffic, ShowHiddenTracks, MaxUniqueOpponentCars, ShowAllCarsInFE, WindowedMode, SelectableMarkerCount, PurchasedCarLimit, CarbonStyleTirePop;
1515
bool copLightsEnabled, HideOnline, ShowOnlineOpts, removeSceneryGroupDoor, removePlayerBarriers, unfreezeKO, EnablePresetAndDebugCars, AlwaysRain, SkipMovies, EnableSound, EnableMusic, EnableCameras, ExOptsTeamTakeOver, ShowSubs, EnableHeatLevelOverride, CarbonStyleRaceProgress, moreVinyls, eatSomeBurgers, UnlockAllThings, GarageRotate, GarageZoom, GarageShowcase, EnableSaveLoadHotPos, EnableMaxPerfOnShop, EnableVTOverride, EnableDebugWorldCamera, DebugWorldCamera, DebugWatchCarCamera, ForceBlackEdition, HelicopterFix, X10Fix, WheelFix, ExperimentalSplitScreenFix, ShowDebugCarCustomize, CarbonStyleBustedScreen, ShowMessage, ReplayBlacklistRaces, PursuitActionMode, MoreCarsForOpponents, VisualFixesAndTweaks, UncensoredBustedScreen, ShowPursuitCops, ShowNonPursuitCops, ShowDebugEventID, CarbonStyleRandomCars, SkipCareerIntro, ShowTimeOfDay, BetterRandomRaces, AllowMultipleInstances, TimeBugFix, NoCatchUp, CarSkinFix, ImmobileColFix, NFSU2StyleLookBackCamera, NoRevLimiter, SkipNISs, ExpandMemoryPools, ShowPresetCarsInFE, AllowLongerProfileNames, DDayFix, BustedNISFix, ShowLanguageSelectScreen, DoScreenPrintf, WorldMapAnywhere, SkipTrackAnywhere;
16-
DWORD selectedCar, careerCar, raceOptions, Strings, HeatLevelAddr, VTecx, StartingCashDWORD, GameState, ThreadDelay;
16+
DWORD selectedCar, careerCar, raceOptions, Strings, HeatLevelAddr, VTecx, StartingCashDWORD, GameState;
1717
HWND windowHandle;
1818

1919
bool forceHeatLevel = 0, carHackEnabled = 0, once1 = 0, once2 = 0, once3 = 0, IsOnFocus, AutoDrive, ToggleCops = 1;
@@ -67,7 +67,7 @@ void Init()
6767
ShowOnlineOpts = iniReader.ReadInteger("Menu", "ShowOnlineOpts", 0) != 0;
6868
ShowSubs = iniReader.ReadInteger("Menu", "ShowSubs", 0) != 0;
6969
EnablePresetAndDebugCars = iniReader.ReadInteger("Menu", "ShowMoreCarCategories", 0) != 0;
70-
ShowLanguageSelectScreen = iniReader.ReadInteger("Menu", "ShowLanguageSelectScreen", 1) != 0;
70+
ShowLanguageSelectScreen = iniReader.ReadInteger("Menu", "ShowLanguageSelectScreen", 0) != 0;
7171
moreVinyls = iniReader.ReadInteger("Menu", "ShowSpecialVinyls", 1) != 0;
7272
ShowDebugCarCustomize = iniReader.ReadInteger("Menu", "ShowDebugCarCustomize", 0) != 0;
7373
ShowDebugEventID = iniReader.ReadInteger("Menu", "ShowDebugEventID", 0) != 0;
@@ -107,7 +107,7 @@ void Init()
107107
ForceBlackEdition = iniReader.ReadInteger("Gameplay", "ForceBlackEdition", 1) != 0;
108108
eatSomeBurgers = iniReader.ReadInteger("Gameplay", "UnlockBurgerKingChallenge", 0) != 0;
109109
EnableMaxPerfOnShop = iniReader.ReadInteger("Gameplay", "EnableMaxPerformanceOnShop", 1) != 0;
110-
ShowAllCarsInFE = iniReader.ReadInteger("Gameplay", "ShowAllCarsInFE", 1);
110+
ShowAllCarsInFE = iniReader.ReadInteger("Gameplay", "ShowAllCarsInFE", 0);
111111
// ShowPresetCarsInFE = iniReader.ReadInteger("Gameplay", "ShowPresetCarsInFE", 0);
112112
NoCatchUp = iniReader.ReadInteger("Gameplay", "NoCatchUp", 0) != 0;
113113
NoRevLimiter = iniReader.ReadInteger("Gameplay", "NoRevLimiter", 0) != 0;
@@ -120,16 +120,16 @@ void Init()
120120

121121
// Pursuit
122122
EnableHeatLevelOverride = iniReader.ReadInteger("Pursuit", "HeatLevelOverride", 0) != 0;
123-
MinHeatLevel = iniReader.ReadFloat("Pursuit", "MinimumHeatLevel", 1.00f);
124-
MaxHeatLevel = iniReader.ReadFloat("Pursuit", "MaximumHeatLevel", 10.00f);
123+
MinHeatLevel = iniReader.ReadFloat("Pursuit", "MinimumHeatLevel", 1.0f);
124+
MaxHeatLevel = iniReader.ReadFloat("Pursuit", "MaximumHeatLevel", 10.0f);
125125
PursuitActionMode = iniReader.ReadInteger("Pursuit", "PursuitActionMode", 0) != 0;
126126
ShowPursuitCops = iniReader.ReadInteger("Pursuit", "ShowPursuitCops", 1) != 0;
127127
ShowNonPursuitCops = iniReader.ReadInteger("Pursuit", "ShowNonPursuitCops", 0) != 0;
128128
CarbonStyleBustedScreen = iniReader.ReadInteger("Pursuit", "ShowBustedScreenFrame", 1) == 0;
129129
UncensoredBustedScreen = iniReader.ReadInteger("Pursuit", "UncensoredBustedScreen", 0) != 0;
130-
SpeedingLimit = iniReader.ReadFloat("Pursuit", "SpeedingLimit", 67.00f);
131-
ExcessiveSpeedingLimit = iniReader.ReadFloat("Pursuit", "ExcessiveSpeedingLimit", 80.50f);
132-
RecklessDrivingLimit = iniReader.ReadFloat("Pursuit", "RecklessDrivingLimit", 89.40f);
130+
SpeedingLimit = iniReader.ReadFloat("Pursuit", "SpeedingLimit", 67.0f);
131+
ExcessiveSpeedingLimit = iniReader.ReadFloat("Pursuit", "ExcessiveSpeedingLimit", 80.5f);
132+
RecklessDrivingLimit = iniReader.ReadFloat("Pursuit", "RecklessDrivingLimit", 89.4f);
133133

134134
// VisualTreatment
135135
EnableVTOverride = iniReader.ReadInteger("VisualTreatment", "EnableVisualTreatmentOverride", 0) != 0;
@@ -170,9 +170,8 @@ void Init()
170170
ShowMessage = iniReader.ReadInteger("Misc", "ShowMessage", 1) != 0;
171171
SkipCareerIntro = iniReader.ReadInteger("Misc", "SkipCareerIntro", 0) != 0;
172172
AllowMultipleInstances = iniReader.ReadInteger("Misc", "AllowMultipleInstances", 0) != 0;
173-
ThreadDelay = iniReader.ReadInteger("Misc", "ThreadDelay", 5);
174173
ExpandMemoryPools = iniReader.ReadInteger("Misc", "ExpandMemoryPools", 0) != 0;
175-
DoScreenPrintf = iniReader.ReadInteger("Misc", "DoScreenPrintf", 1) != 0;
174+
DoScreenPrintf = iniReader.ReadInteger("Misc", "DoScreenPrintf", 0) != 0;
176175
ForceMaximumFSAALevel = iniReader.ReadInteger("Misc", "ForceMaximumFSAALevel", -1);
177176

178177
// Limit values to fix increment & decrement behaviour breaking

NFSMWExtraOptions/HotkeyStuff.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
void Thing()
77
{
8-
//Sleep(ThreadDelay);
98
_asm pushad;
109

1110
raceOptions = *(DWORD*)_FEDatabase; // Race Options Pointer (Thanks to samfednik)
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)