Merge pull request #87 from Courseplay/Gui-Additions

Fixed some leftover hud zoom code

Author: Tensuko

scripts/gui/hud/CpBaseHud.lua

@@ -296,18 +296,6 @@ function CpBaseHud:init(vehicle)
         self:openCourseGeneratorGui(vehicle)
     end)
 
-
-    ---- Disables zoom, while mouse is over the cp hud. 
-    local function disableCameraZoomOverHud(vehicle, superFunc, ...)
-        if vehicle.getIsMouseOverCpHud and vehicle:getIsMouseOverCpHud() then 
-            return
-        end
-        return superFunc(vehicle, ...)
-    end                                                   
-
-    Enterable.actionEventCameraZoomIn = Utils.overwrittenFunction(Enterable.actionEventCameraZoomIn, disableCameraZoomOverHud)
-    Enterable.actionEventCameraZoomOut = Utils.overwrittenFunction(Enterable.actionEventCameraZoomOut, disableCameraZoomOverHud)
-
     self.baseHud:setVisible(false)
 
     self.baseHud:setScale(self.uiScale, self.uiScale)

scripts/specializations/CpCourseManager.lua

@@ -354,10 +354,13 @@ function CpCourseManager:onWriteStream(streamId,connection)
 end
 
 function CpCourseManager:onPreDelete()
-    g_assignedCoursesManager:unregisterVehicle(self, self.id)
-    CpCourseManager.resetCourses(self)
     local spec = self.spec_cpCourseManager 
-    spec.courseDisplay:delete()
+    if spec then
+        g_assignedCoursesManager:unregisterVehicle(self, self.id)
+        CpCourseManager.resetCourses(self)
+        local spec = self.spec_cpCourseManager 
+        spec.courseDisplay:delete()
+    end
 end
 
 ------------------------------------------------------------------------

scripts/specializations/CpHud.lua

@@ -78,10 +78,10 @@ function CpHud.registerFunctions(vehicleType)
 end
 
 function CpHud.registerOverwrittenFunctions(vehicleType)
-   if vehicleType.functions["enterVehicleRaycastClickToSwitch"] ~= nil then 
+    if vehicleType.functions["enterVehicleRaycastClickToSwitch"] ~= nil then 
         SpecializationUtil.registerOverwrittenFunction(vehicleType, "enterVehicleRaycastClickToSwitch", CpHud.enterVehicleRaycastClickToSwitch)
-   end
-   SpecializationUtil.registerOverwrittenFunction(vehicleType, 'getCpStartText', CpHud.getCpStartText)
+    end
+    SpecializationUtil.registerOverwrittenFunction(vehicleType, 'getCpStartText', CpHud.getCpStartText)
 end
 
 --- Disables the click to switch action, while the mouse is over the cp hud.
@@ -104,7 +104,7 @@ function CpHud:onRegisterActionEvents(isActiveForInput, isActiveForInputIgnoreSe
     if self.isClient then
         local spec = self.spec_cpHud
         self:clearActionEventsTable(spec.actionEvents)
-        if self.isActiveForInputIgnoreSelectionIgnoreAI then
+        if self.isActiveForInputIgnoreSelectionIgnoreAI and self.propertyState ~= VehiclePropertyState.SHOP_CONFIG then
             --- Toggle mouse cursor action event
             --- Parameters: 
             --- (actionEventsTable, inputAction, target,
@@ -312,6 +312,15 @@ function CpHud:onLeaveVehicle(wasEntered)
     end
 end
 
+---- Disables zoom, while mouse is over the cp hud. 
+local function actionEventCameraZoomInOut(self, superFunc, ...)
+    if self.getIsMouseOverCpHud and self:getIsMouseOverCpHud() then 
+        return
+    end
+    return superFunc(self, ...)
+end              
+Enterable.actionEventCameraZoomInOut = Utils.overwrittenFunction(Enterable.actionEventCameraZoomInOut, actionEventCameraZoomInOut)                                   
+
 function CpHud:onStateChange(state, data)
     local spec = self.spec_cpHud
     if state == VehicleStateChange.ATTACH or state == VehicleStateChange.DETACH then