Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Generals/Code/GameEngine/Source/Common/GlobalData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1198,6 +1198,13 @@ void GlobalData::parseGameDataDefinition( INI* ini )
TheWritableGlobalData->m_showMoneyPerMinute = optionPref.getShowMoneyPerMinute();

Int val=optionPref.getGammaValue();

// Clamp val to valid range to prevent division by zero or invalid calculations
if (val < 0)
val = 0;
if (val > 100)
val = 100;

//generate a value between 0.6 and 2.0.
if (val < 50)
{ //darker gamma
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,13 @@ Real OptionPreferences::getGammaValue(void)
return 50.0f;

Real gamma = (Real) atoi(it->second.str());

// Clamp gamma value to valid range to prevent crashes from corrupted Options.ini
if (gamma < 0.0f)
gamma = 0.0f;
if (gamma > 100.0f)
gamma = 100.0f;

return gamma;
}

Expand Down
7 changes: 7 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1236,6 +1236,13 @@ void GlobalData::parseGameDataDefinition( INI* ini )
TheWritableGlobalData->m_showMoneyPerMinute = optionPref.getShowMoneyPerMinute();

Int val=optionPref.getGammaValue();

// Clamp val to valid range to prevent division by zero or invalid calculations
if (val < 0)
val = 0;
if (val > 100)
val = 100;

//generate a value between 0.6 and 2.0.
if (val < 50)
{ //darker gamma
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,13 @@ Real OptionPreferences::getGammaValue(void)
return 50.0f;

Real gamma = (Real) atoi(it->second.str());

// Clamp gamma value to valid range to prevent crashes from corrupted Options.ini
if (gamma < 0.0f)
gamma = 0.0f;
if (gamma > 100.0f)
gamma = 100.0f;

return gamma;
}

Expand Down
Loading