Save FOV value to settings (#670)
* Save FOV value to settings.dat
* Batch font drawing to fix debug overlay FPS
* Revert "Batch font drawing to fix debug overlay FPS"
This reverts commit 7dcecdbd4d.
This commit is contained in:
@@ -836,6 +836,7 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,con
|
||||
SetGameSettings(iPad,eGameSetting_MusicVolume,DEFAULT_VOLUME_LEVEL);
|
||||
SetGameSettings(iPad,eGameSetting_SoundFXVolume,DEFAULT_VOLUME_LEVEL);
|
||||
SetGameSettings(iPad,eGameSetting_Gamma,50);
|
||||
SetGameSettings(iPad,eGameSetting_FOV,0);
|
||||
|
||||
// 4J-PB - Don't reset the difficult level if we're in-game
|
||||
if(Minecraft::GetInstance()->level==NULL)
|
||||
@@ -1330,6 +1331,7 @@ void CMinecraftApp::ApplyGameSettingsChanged(int iPad)
|
||||
ActionGameSettings(iPad,eGameSetting_MusicVolume );
|
||||
ActionGameSettings(iPad,eGameSetting_SoundFXVolume );
|
||||
ActionGameSettings(iPad,eGameSetting_Gamma );
|
||||
ActionGameSettings(iPad,eGameSetting_FOV );
|
||||
ActionGameSettings(iPad,eGameSetting_Difficulty );
|
||||
ActionGameSettings(iPad,eGameSetting_Sensitivity_InGame );
|
||||
ActionGameSettings(iPad,eGameSetting_ViewBob );
|
||||
@@ -1390,7 +1392,15 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
|
||||
}
|
||||
|
||||
break;
|
||||
case eGameSetting_Difficulty:
|
||||
case eGameSetting_FOV:
|
||||
if(iPad==ProfileManager.GetPrimaryPad())
|
||||
{
|
||||
float fovDeg = 70.0f + (float)GameSettingsA[iPad]->ucFov * 40.0f / 100.0f;
|
||||
pMinecraft->gameRenderer->SetFovVal(fovDeg);
|
||||
pMinecraft->options->set(Options::Option::FOV, (float)GameSettingsA[iPad]->ucFov / 100.0f);
|
||||
}
|
||||
break;
|
||||
case eGameSetting_Difficulty:
|
||||
if(iPad==ProfileManager.GetPrimaryPad())
|
||||
{
|
||||
pMinecraft->options->toggle(Options::Option::DIFFICULTY,GameSettingsA[iPad]->usBitmaskValues&0x03);
|
||||
@@ -1849,7 +1859,18 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
|
||||
GameSettingsA[iPad]->bSettingsChanged=true;
|
||||
}
|
||||
break;
|
||||
case eGameSetting_Difficulty:
|
||||
case eGameSetting_FOV:
|
||||
if(GameSettingsA[iPad]->ucFov!=ucVal)
|
||||
{
|
||||
GameSettingsA[iPad]->ucFov=ucVal;
|
||||
if(iPad==ProfileManager.GetPrimaryPad())
|
||||
{
|
||||
ActionGameSettings(iPad,eVal);
|
||||
}
|
||||
GameSettingsA[iPad]->bSettingsChanged=true;
|
||||
}
|
||||
break;
|
||||
case eGameSetting_Difficulty:
|
||||
if((GameSettingsA[iPad]->usBitmaskValues&0x03)!=(ucVal&0x03))
|
||||
{
|
||||
GameSettingsA[iPad]->usBitmaskValues&=~0x03;
|
||||
@@ -2289,7 +2310,10 @@ unsigned char CMinecraftApp::GetGameSettings(int iPad,eGameSetting eVal)
|
||||
case eGameSetting_Gamma:
|
||||
return GameSettingsA[iPad]->ucGamma;
|
||||
break;
|
||||
case eGameSetting_Difficulty:
|
||||
case eGameSetting_FOV:
|
||||
return GameSettingsA[iPad]->ucFov;
|
||||
break;
|
||||
case eGameSetting_Difficulty:
|
||||
return GameSettingsA[iPad]->usBitmaskValues&0x0003;
|
||||
break;
|
||||
case eGameSetting_Sensitivity_InGame:
|
||||
|
||||
Reference in New Issue
Block a user