fix: slime block inaccurate damage properties + weird ui stuff

This commit is contained in:
Fireblade
2026-05-25 13:25:17 -04:00
parent fb46ed3005
commit e2b81cae79
7 changed files with 50 additions and 8 deletions
+1
View File
@@ -1486,6 +1486,7 @@ void CMinecraftApp::ApplyGameSettingsChanged(int iPad)
ActionGameSettings(iPad,eGameSetting_ControlScheme );
ActionGameSettings(iPad,eGameSetting_ControlInvertLook);
ActionGameSettings(iPad,eGameSetting_ControlSouthPaw);
ActionGameSettings(iPad,eGameSetting_ControlType);
ActionGameSettings(iPad,eGameSetting_SplitScreenVertical);
ActionGameSettings(iPad,eGameSetting_GamertagsVisible);
+2 -2
View File
@@ -326,11 +326,11 @@ void UIScene::loadMovie()
if(primaryPad < 0 || primaryPad >= XUSER_MAX_COUNT)
primaryPad = 0;
const int controlType = app.GetGameSettings(primaryPad, eGameSetting_ControlType);
const bool force720ForControlType = (controlType == 3 || controlType == 4 || controlType == 6);
const bool force720ForControlType = (controlType == 3 || controlType == 5);
// tutorial popups + HUD elements have inaccuracies + crashes that we need to fix here
const bool isTutorialPopupMovie = (moviePath.find(L"TutorialPopup") == 0);
const bool isHUDMovie = (moviePath.find(L"HUD") == 0);
const bool use1080 = (ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie || isHUDMovie);
const bool use1080 = (ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie);
if(use1080)
{
moviePath.append(L"1080.swf");
@@ -1510,6 +1510,7 @@ static Minecraft* InitialiseMinecraftRuntime()
app.InitGameSettings();
app.InitialiseTips();
ui.ReloadSkin();
return pMinecraft;
}