mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-08-20 09:57:09 +00:00
Added Old Swing Animation checkbox
This commit is contained in:
parent
a429a1ed95
commit
47f822bd94
|
|
@ -106,6 +106,7 @@ enum EGameHostOptionWorldSize
|
|||
#define GAMESETTING_PSVITANETWORKMODEADHOC 0x00020000
|
||||
#define GAMESETTING_FANCYGRAPHICS 0x01000000
|
||||
#define GAMESETTING_AMBIENTOCCLUSION 0x02000000
|
||||
#define GAMESETTING_OLDSWINGANIMATION 0x04000000
|
||||
|
||||
|
||||
// defines for languages
|
||||
|
|
|
|||
|
|
@ -147,6 +147,7 @@ enum eGameSetting
|
|||
eGameSetting_GamertagsVisible,
|
||||
eGameSetting_FancyGraphics,
|
||||
eGameSetting_AmbientOcclusion,
|
||||
eGameSetting_OldSwingAnimation,
|
||||
// Interim TU 1.6.6
|
||||
eGameSetting_Autosave,
|
||||
eGameSetting_DisplaySplitscreenGamertags,
|
||||
|
|
|
|||
|
|
@ -856,6 +856,8 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,con
|
|||
SetGameSettings(iPad,eGameSetting_FancyGraphics,1);
|
||||
SetGameSettings(iPad,eGameSetting_AmbientOcclusion,1);
|
||||
|
||||
SetGameSettings(iPad,eGameSetting_OldSwingAnimation,0);
|
||||
|
||||
// Interim TU 1.6.6
|
||||
SetGameSettings(iPad,eGameSetting_Sensitivity_InMenu,100);
|
||||
SetGameSettings(iPad,eGameSetting_DisplaySplitscreenGamertags,1);
|
||||
|
|
@ -1309,6 +1311,7 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat
|
|||
pGameSettings->uiBitmaskValues|=(GAMESETTING_UISIZE&0x00000800); // uisize 2
|
||||
pGameSettings->uiBitmaskValues|=(GAMESETTING_UISIZE_SPLITSCREEN&0x00004000); // splitscreen ui size 3
|
||||
pGameSettings->uiBitmaskValues|=GAMESETTING_ANIMATEDCHARACTER; //eGameSetting_AnimatedCharacter - on
|
||||
pGameSettings->uiBitmaskValues|=GAMESETTING_OLDSWINGANIMATION; //eGameSetting_OldSwingAnimation - off
|
||||
// TU12
|
||||
// favorite skins added, but only set in TU12 - set to FFs
|
||||
for(int i=0;i<MAX_FAVORITE_SKINS;i++)
|
||||
|
|
@ -1350,6 +1353,7 @@ void CMinecraftApp::ApplyGameSettingsChanged(int iPad)
|
|||
|
||||
ActionGameSettings(iPad,eGameSetting_FancyGraphics);
|
||||
ActionGameSettings(iPad,eGameSetting_AmbientOcclusion);
|
||||
ActionGameSettings(iPad,eGameSetting_OldSwingAnimation);
|
||||
|
||||
// Interim TU 1.6.6
|
||||
ActionGameSettings(iPad,eGameSetting_Sensitivity_InMenu );
|
||||
|
|
@ -1618,6 +1622,9 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
|
|||
case eGameSetting_AnimatedCharacter:
|
||||
//nothing to do here
|
||||
break;
|
||||
case eGameSetting_OldSwingAnimation:
|
||||
//nothing to do here
|
||||
break;
|
||||
case eGameSetting_PS3_EULA_Read:
|
||||
//nothing to do here
|
||||
break;
|
||||
|
|
@ -2155,6 +2162,23 @@ void CMinecraftApp::SetGameSettings(int iPad,eGameSetting eVal,unsigned char ucV
|
|||
|
||||
break;
|
||||
|
||||
case eGameSetting_OldSwingAnimation:
|
||||
if(((GameSettingsA[iPad]->uiBitmaskValues & GAMESETTING_OLDSWINGANIMATION) != 0) != ((ucVal & 0x01) != 0))
|
||||
{
|
||||
if(ucVal==1)
|
||||
{
|
||||
GameSettingsA[iPad]->uiBitmaskValues|=GAMESETTING_OLDSWINGANIMATION;
|
||||
}
|
||||
else
|
||||
{
|
||||
GameSettingsA[iPad]->uiBitmaskValues&=~GAMESETTING_OLDSWINGANIMATION;
|
||||
}
|
||||
ActionGameSettings(iPad,eVal);
|
||||
GameSettingsA[iPad]->bSettingsChanged=true;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case eGameSetting_Online:
|
||||
if((GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_ONLINE)!=(ucVal&0x01)<<1)
|
||||
{
|
||||
|
|
@ -2461,6 +2485,9 @@ unsigned char CMinecraftApp::GetGameSettings(int iPad,eGameSetting eVal)
|
|||
case eGameSetting_AmbientOcclusion:
|
||||
return (GameSettingsA[iPad]->uiBitmaskValues & GAMESETTING_AMBIENTOCCLUSION) >> 25;
|
||||
break;
|
||||
case eGameSetting_OldSwingAnimation:
|
||||
return (GameSettingsA[iPad]->uiBitmaskValues & GAMESETTING_OLDSWINGANIMATION) >> 26;
|
||||
break;
|
||||
case eGameSetting_Online:
|
||||
return (GameSettingsA[iPad]->uiBitmaskValues&GAMESETTING_ONLINE)>>1;
|
||||
break;
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -15,6 +15,7 @@ UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void *initData, UILayer
|
|||
m_checkboxDisplayAnimatedCharacter.init(app.GetString(IDS_CHECKBOX_ANIMATED_CHARACTER),eControl_DisplayAnimatedCharacter,(app.GetGameSettings(m_iPad,eGameSetting_AnimatedCharacter)!=0));
|
||||
m_checkboxSplitscreen.init(app.GetString(IDS_CHECKBOX_VERTICAL_SPLIT_SCREEN),eControl_Splitscreen,(app.GetGameSettings(m_iPad,eGameSetting_SplitScreenVertical)!=0));
|
||||
m_checkboxShowSplitscreenGamertags.init(app.GetString(IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS),eControl_ShowSplitscreenGamertags,(app.GetGameSettings(m_iPad,eGameSetting_DisplaySplitscreenGamertags)!=0));
|
||||
m_checkboxOldSwingAnimation.init(L"Old Swing Animation ", eControl_OldSwingAnimation,(app.GetGameSettings(m_iPad,eGameSetting_OldSwingAnimation)!=0));
|
||||
|
||||
WCHAR TempString[256];
|
||||
|
||||
|
|
@ -102,6 +103,7 @@ void UIScene_SettingsUIMenu::handleInput(int iPad, int key, bool repeat, bool pr
|
|||
app.SetGameSettings(m_iPad,eGameSetting_DisplayHUD,m_checkboxDisplayHUD.IsChecked()?1:0);
|
||||
app.SetGameSettings(m_iPad,eGameSetting_DisplayHand,m_checkboxDisplayHand.IsChecked()?1:0);
|
||||
app.SetGameSettings(m_iPad,eGameSetting_DisplaySplitscreenGamertags,m_checkboxShowSplitscreenGamertags.IsChecked()?1:0);
|
||||
app.SetGameSettings(m_iPad,eGameSetting_OldSwingAnimation,m_checkboxOldSwingAnimation.IsChecked()?1:0);
|
||||
app.SetGameSettings(m_iPad,eGameSetting_DeathMessages,m_checkboxDisplayDeathMessages.IsChecked()?1:0);
|
||||
app.SetGameSettings(m_iPad,eGameSetting_AnimatedCharacter,m_checkboxDisplayAnimatedCharacter.IsChecked()?1:0);
|
||||
|
||||
|
|
|
|||
|
|
@ -13,11 +13,12 @@ private:
|
|||
eControl_DisplayAnimatedCharacter,
|
||||
eControl_Splitscreen,
|
||||
eControl_ShowSplitscreenGamertags,
|
||||
eControl_OldSwingAnimation,
|
||||
eControl_UISize,
|
||||
eControl_UISizeSplitscreen
|
||||
};
|
||||
|
||||
UIControl_CheckBox m_checkboxDisplayHUD, m_checkboxDisplayHand, m_checkboxDisplayDeathMessages, m_checkboxDisplayAnimatedCharacter, m_checkboxSplitscreen, m_checkboxShowSplitscreenGamertags; // Checkboxes
|
||||
UIControl_CheckBox m_checkboxDisplayHUD, m_checkboxDisplayHand, m_checkboxDisplayDeathMessages, m_checkboxDisplayAnimatedCharacter, m_checkboxSplitscreen, m_checkboxShowSplitscreenGamertags, m_checkboxOldSwingAnimation; // Checkboxes
|
||||
UIControl_Slider m_sliderUISize, m_sliderUISizeSplitscreen; // Sliders
|
||||
UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene)
|
||||
UI_MAP_ELEMENT( m_checkboxDisplayHUD, "DisplayHUD")
|
||||
|
|
@ -26,6 +27,7 @@ private:
|
|||
UI_MAP_ELEMENT( m_checkboxDisplayAnimatedCharacter, "DisplayAnimatedCharacter")
|
||||
UI_MAP_ELEMENT( m_checkboxSplitscreen, "Splitscreen")
|
||||
UI_MAP_ELEMENT( m_checkboxShowSplitscreenGamertags, "ShowSplitscreenGamertags")
|
||||
UI_MAP_ELEMENT( m_checkboxOldSwingAnimation, "OldSwingAnimation")
|
||||
|
||||
UI_MAP_ELEMENT( m_sliderUISize, "UISize")
|
||||
UI_MAP_ELEMENT( m_sliderUISizeSplitscreen, "UISizeSplitscreen")
|
||||
|
|
|
|||
|
|
@ -550,6 +550,7 @@ void C_4JProfile::Initialise(DWORD dwTitleID,
|
|||
pGameSettings->uiBitmaskValues |= (GAMESETTING_UISIZE & 0x00000800); // uisize 2
|
||||
pGameSettings->uiBitmaskValues |= (GAMESETTING_UISIZE_SPLITSCREEN & 0x00004000); // splitscreen ui size 3
|
||||
pGameSettings->uiBitmaskValues |= GAMESETTING_ANIMATEDCHARACTER; //eGameSetting_AnimatedCharacter - on
|
||||
pGameSettings->uiBitmaskValues |= GAMESETTING_OLDSWINGANIMATION; //eGameSetting_OldSwingAnimation - off
|
||||
|
||||
// TU12
|
||||
// favorite skins added, but only set in TU12 - set to FFs
|
||||
|
|
|
|||
|
|
@ -549,7 +549,7 @@ void ItemInHandRenderer::render(float a)
|
|||
float d = 0.8f;
|
||||
|
||||
#if defined __ORBIS__ || defined __PS3__ || defined _WINDOWS64
|
||||
static const float swingPowFactor = 1.0f;
|
||||
float swingPowFactor = app.GetGameSettings(0, eGameSetting_OldSwingAnimation)? 4.0f : 1.0f;
|
||||
#else
|
||||
static const float swingPowFactor = 4.0f; // 4J added, to slow the swing down when nearest the player for avoiding luminance flash issues
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue