feat: TU0 HowToPlay & Settings Menu (C++ Only)
This commit is contained in:
1 parent
0786cba82e
commit
9191967d7a
27 files changed
+2139
-5198
No files matched your search
@@ -700,7 +700,7 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,con
|
||||
app.DebugPrintf("SetDefaultOptions - Difficulty = 1\n");
|
||||
SetGameSettings(iPad,eGameSetting_Difficulty,1);
|
||||
}
|
||||
SetGameSettings(iPad,eGameSetting_Sensitivity_InGame,100);
|
||||
SetGameSettings(iPad,eGameSetting_Sensitivity,100);
|
||||
SetGameSettings(iPad,eGameSetting_ViewBob,1);
|
||||
SetGameSettings(iPad,eGameSetting_ControlScheme,0);
|
||||
SetGameSettings(iPad,eGameSetting_ControlInvertLook,(pSettings->iYAxisInversion!=0)?1:0);
|
||||
@@ -709,7 +709,7 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,con
|
||||
SetGameSettings(iPad,eGameSetting_GamertagsVisible,1);
|
||||
|
||||
// Interim TU 1.6.6
|
||||
SetGameSettings(iPad,eGameSetting_Sensitivity_InMenu,100);
|
||||
SetGameSettings(iPad,eGameSetting_Sensitivity,100);
|
||||
SetGameSettings(iPad,eGameSetting_DisplaySplitscreenGamertags,1);
|
||||
SetGameSettings(iPad,eGameSetting_Hints,1);
|
||||
SetGameSettings(iPad,eGameSetting_Autosave,2);
|
||||
@@ -836,8 +836,8 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat
|
||||
// need to fill in values for the new profile data. No need to save the profile - that'll happen if they get changed, or if the auto save for the profile kicks in
|
||||
{
|
||||
GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData;
|
||||
pGameSettings->ucMenuSensitivity=100; //eGameSetting_Sensitivity_InMenu
|
||||
pGameSettings->ucInterfaceOpacity=80; //eGameSetting_Sensitivity_InMenu
|
||||
pGameSettings->ucSensitivity=100; //eGameSetting_Sensitivity
|
||||
pGameSettings->usBitmaskValues|=0x0200; //eGameSetting_DisplaySplitscreenGamertags - on
|
||||
pGameSettings->usBitmaskValues|=0x0400; //eGameSetting_Hints - on
|
||||
pGameSettings->usBitmaskValues|=0x1000; //eGameSetting_Autosave - 2
|
||||
@@ -1081,8 +1081,8 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat
|
||||
#endif
|
||||
|
||||
GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData;
|
||||
pGameSettings->ucMenuSensitivity=100; //eGameSetting_Sensitivity_InMenu
|
||||
pGameSettings->ucInterfaceOpacity=80; //eGameSetting_Sensitivity_InMenu
|
||||
pGameSettings->ucSensitivity=100; //eGameSetting_Sensitivity
|
||||
pGameSettings->usBitmaskValues|=0x0200; //eGameSetting_DisplaySplitscreenGamertags - on
|
||||
pGameSettings->usBitmaskValues|=0x0400; //eGameSetting_Hints - on
|
||||
pGameSettings->usBitmaskValues|=0x1000; //eGameSetting_Autosave - 2
|
||||
@@ -1131,7 +1131,7 @@ void CMinecraftApp::ApplyGameSettingsChanged(int iPad)
|
||||
ActionGameSettings(iPad,eGameSetting_SoundFXVolume );
|
||||
ActionGameSettings(iPad,eGameSetting_Gamma );
|
||||
ActionGameSettings(iPad,eGameSetting_Difficulty );
|
||||
ActionGameSettings(iPad,eGameSetting_Sensitivity_InGame );
|
||||
ActionGameSettings(iPad,eGameSetting_Sensitivity );
|
||||
ActionGameSettings(iPad,eGameSetting_ViewBob );
|
||||
ActionGameSettings(iPad,eGameSetting_ControlScheme );
|
||||
ActionGameSettings(iPad,eGameSetting_ControlInvertLook);
|
||||
@@ -1140,7 +1140,7 @@ void CMinecraftApp::ApplyGameSettingsChanged(int iPad)
|
||||
ActionGameSettings(iPad,eGameSetting_GamertagsVisible);
|
||||
|
||||
// Interim TU 1.6.6
|
||||
ActionGameSettings(iPad,eGameSetting_Sensitivity_InMenu );
|
||||
ActionGameSettings(iPad,eGameSetting_Sensitivity );
|
||||
ActionGameSettings(iPad,eGameSetting_DisplaySplitscreenGamertags);
|
||||
ActionGameSettings(iPad,eGameSetting_Hints);
|
||||
ActionGameSettings(iPad,eGameSetting_InterfaceOpacity);
|
||||
@@ -1210,7 +1210,7 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
|
||||
}
|
||||
|
||||
break;
|
||||
case eGameSetting_Sensitivity_InGame:
|
||||
case eGameSetting_Sensitivity:
|
||||
// 4J-PB - we don't use the options value
|
||||
// tell the input that we've changed the sensitivity - range of the slider is 0 to 200, default is 100
|
||||
pMinecraft->options->set(Options::Option::SENSITIVITY,((float)GameSettingsA[iPad]->ucSensitivity)/100.0f);
|
||||
@@ -1278,15 +1278,6 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
|
||||
}
|
||||
}
|
||||
break;
|
||||
// Interim TU 1.6.6
|
||||
case eGameSetting_Sensitivity_InMenu:
|
||||
// 4J-PB - we don't use the options value
|
||||
// tell the input that we've changed the sensitivity - range of the slider is 0 to 200, default is 100
|
||||
//pMinecraft->options->set(Options::Option::SENSITIVITY,((float)GameSettingsA[iPad]->ucSensitivity)/100.0f);
|
||||
//InputManager.SetJoypadSensitivity(iPad,((float)GameSettingsA[iPad]->ucSensitivity)/100.0f);
|
||||
|
||||
break;
|
||||
|
||||
case eGameSetting_DisplaySplitscreenGamertags:
|
||||
for( BYTE idx = 0; idx < XUSER_MAX_COUNT; ++idx)
|
||||
{
|
||||
@@ -1639,7 +1630,7 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
|
||||
GameSettingsA[iPad]->bSettingsChanged=true;
|
||||
}
|
||||
break;
|
||||
case eGameSetting_Sensitivity_InGame:
|
||||
case eGameSetting_Sensitivity:
|
||||
if(GameSettingsA[iPad]->ucSensitivity!=ucVal)
|
||||
{
|
||||
GameSettingsA[iPad]->ucSensitivity=ucVal;
|
||||
@@ -1736,16 +1727,6 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
|
||||
GameSettingsA[iPad]->bSettingsChanged=true;
|
||||
}
|
||||
break;
|
||||
|
||||
// 4J-PB - Added for Interim TU for 1.6.6
|
||||
case eGameSetting_Sensitivity_InMenu:
|
||||
if(GameSettingsA[iPad]->ucMenuSensitivity!=ucVal)
|
||||
{
|
||||
GameSettingsA[iPad]->ucMenuSensitivity=ucVal;
|
||||
ActionGameSettings(iPad,eVal);
|
||||
GameSettingsA[iPad]->bSettingsChanged=true;
|
||||
}
|
||||
break;
|
||||
case eGameSetting_DisplaySplitscreenGamertags:
|
||||
if((GameSettingsA[iPad]->usBitmaskValues&0x0200)!=((ucVal&0x01)<<9))
|
||||
{
|
||||
@@ -2070,7 +2051,7 @@ unsigned char CMinecraftApp::GetGameSettings(int iPad,eGameSetting eVal)
|
||||
case eGameSetting_Difficulty:
|
||||
return GameSettingsA[iPad]->usBitmaskValues&0x0003;
|
||||
break;
|
||||
case eGameSetting_Sensitivity_InGame:
|
||||
case eGameSetting_Sensitivity:
|
||||
return GameSettingsA[iPad]->ucSensitivity;
|
||||
break;
|
||||
case eGameSetting_ViewBob:
|
||||
@@ -2091,11 +2072,6 @@ unsigned char CMinecraftApp::GetGameSettings(int iPad,eGameSetting eVal)
|
||||
case eGameSetting_SplitScreenVertical:
|
||||
return ((GameSettingsA[iPad]->usBitmaskValues&0x0100)>>8);
|
||||
break;
|
||||
// 4J-PB - Added for Interim TU for 1.6.6
|
||||
case eGameSetting_Sensitivity_InMenu:
|
||||
return GameSettingsA[iPad]->ucMenuSensitivity;
|
||||
break;
|
||||
|
||||
case eGameSetting_DisplaySplitscreenGamertags:
|
||||
return ((GameSettingsA[iPad]->usBitmaskValues&0x0200)>>9);
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user