Small gui adjustment and another nil check for shovel positions

Courseplay · Dec 12, 2024 · aa4df41 · aa4df41
1 parent d579914
commit aa4df41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/scripts/gui/hud/CpBaseHud.lua b/scripts/gui/hud/CpBaseHud.lua
@@ -56,14 +56,7 @@ CpBaseHud.uvs = {
     },
     driveNowSymbol = {
         {0, 768, 128, 128}
-    },
-    goalSymbol = GuiUtils.getUVs({
-        788,
-	30,
-	44,
-	44
-    }, AIPlaceableMarkerHotspot.FILE_RESOLUTION),
-
+    },    
     exitSymbol = {
         {148, 184, 32, 32}, {256, 512}
     },
@@ -352,15 +345,16 @@ function CpBaseHud:init(vehicle)
     end)
 
     --- Goal button.
-    local width, height = getNormalizedScreenValues(34, 34)    
+    local width, height = getNormalizedScreenValues(30, 30)    
     local goalOverlay = CpGuiUtil.createOverlay({width, height},
-                                                {AIPlaceableMarkerHotspot.FILENAME, self.uvs.goalSymbol}, 
+                                                {"dataS/menu/gui.png", nil}, 
                                                 self.OFF_COLOR,
-                                                self.alignments.bottomRight)
+                                                self.alignments.bottomRight,
+                                                "gui.aiParameterPosition")
 
     self.goalBtn = CpHudButtonElement.new(goalOverlay, self.baseHud)
     local x, y = unpack(self.lines[7].right)
-    self.goalBtn:setPosition(x + self.wMargin/4, y - self.hMargin/4)
+    self.goalBtn:setPosition(x + self.wMargin/4, y - self.hMargin/3)
     self.goalBtn:setCallback("onClickPrimary", vehicle, function (vehicle)
         self:openCourseGeneratorGui(vehicle)
     end)

diff --git a/scripts/specializations/CpShovelPositions.lua b/scripts/specializations/CpShovelPositions.lua
@@ -444,7 +444,7 @@ function CpShovelPositions:setShovelPosition(dt, shovelLimits, armLimits, height
 	end
 
 	local alpha, oldRotRelativeArmRot = 0, 0
-	if hasIntersection and i1y ~= nil then
+	if hasIntersection and i1y ~= nil and i1z ~= nil then
 		--- Controls the arm height
 		setTranslation(armProjectionNode, 0, i1y, i1z)
 		setTranslation(armToolRefNode, ax, ay, az)