Minor fixes

deathkiller · Apr 4, 2024 · 63d7e1c · 63d7e1c
1 parent dcc8fb3
commit 63d7e1c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp b/Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp
@@ -36,6 +36,8 @@ namespace Jazz2::UI::Menu
 
 		bool isInGame = dynamic_cast<InGameMenu*>(_root);
 
+		_items.clear();
+
 		// TRANSLATORS: Menu item in Options > Gameplay section
 		_items.emplace_back(GameplayOptionsItem { GameplayOptionsItemType::Enhancements, _("Enhancements") });
 		// TRANSLATORS: Menu item in Options > Gameplay section

diff --git a/Sources/Jazz2/UI/Menu/MainMenu.cpp b/Sources/Jazz2/UI/Menu/MainMenu.cpp
@@ -209,7 +209,7 @@ namespace Jazz2::UI::Menu
 		int32_t charOffset = 0;
 		int32_t charOffsetShadow = 0;
 
-		float titleY = _owner->_contentBounds.Y - 30;
+		float titleY = _owner->_contentBounds.Y - 30.0f;
 		float logoScale = 1.0f + (1.0f - _owner->_logoTransition) * 7.0f;
 		float logoTextScale = 1.0f + (1.0f - _owner->_logoTransition) * 2.0f;
 		float logoTranslateX = 1.0f + (1.0f - _owner->_logoTransition) * 1.2f;
@@ -981,7 +981,8 @@ namespace Jazz2::UI::Menu
 			renderQueue.addCommand(command);
 		}
 
-		DrawElement(MenuGlow, 0, center.X, 70.0f, 130, Alignment::Center, Colorf(1.0f, 1.0f, 1.0f, 0.14f), 16.0f, 10.0f, true);
+		float titleY = _contentBounds.Y - 30;
+		DrawElement(MenuGlow, 0, center.X, titleY, 130, Alignment::Center, Colorf(1.0f, 1.0f, 1.0f, 0.14f), 16.0f, 10.0f, true, true);
 
 		return true;
 	}

diff --git a/Sources/nCine/Input/JoyMapping.cpp b/Sources/nCine/Input/JoyMapping.cpp
@@ -451,7 +451,11 @@ namespace nCine
 
 			for (int i = 0; i < countof(AndroidAxisNameMapping); i++) {
 				mapping.desc.axes[i].name = AndroidAxisNameMapping[i];
-				mapping.desc.axes[i].min = -1.0f;
+				if (axis.name == AxisName::LTRIGGER || axis.name == AxisName::RTRIGGER) {
+					mapping.desc.axes[i].min = 0.0f;
+				} else {
+					mapping.desc.axes[i].min = -1.0f;
+				}
 				mapping.desc.axes[i].max = 1.0f;
 			}