Skip to content

Commit 8e7cec1

Browse files
Merge pull request #4 from TheCodingDad-TisonK/development
fix: persist HUD layout and visibility on game save (v1.1.2.0)
2 parents 66be862 + 7e9dba9 commit 8e7cec1

3 files changed

Lines changed: 14 additions & 10 deletions

File tree

main.lua

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- =========================================================
2-
-- FS25 Tax Mod (version 1.1.1.0)
2+
-- FS25 Tax Mod (version 1.1.2.0)
33
-- =========================================================
44
-- Daily tax deductions with monthly returns
55
-- =========================================================
@@ -16,7 +16,7 @@ source(modDirectory .. "src/ui/TaxHUD.lua")
1616
FS25TaxMod = {}
1717
FS25TaxMod.modDir = modDirectory
1818
FS25TaxMod.modName = modName
19-
FS25TaxMod.version = "1.1.1.0"
19+
FS25TaxMod.version = "1.1.2.0"
2020
FS25TaxMod.Debug = false
2121

2222
local settings = {
@@ -402,6 +402,7 @@ end
402402
local function onUnload()
403403
if taxHUD then
404404
if taxHUD.editMode then taxHUD:exitEditMode() end
405+
taxHUD:saveLayout()
405406
taxHUD:delete()
406407
taxHUD = nil
407408
FS25TaxMod.taxHUD = nil
@@ -440,6 +441,7 @@ end)
440441

441442
Mission00.saveToXMLFile = Utils.appendedFunction(Mission00.saveToXMLFile, function(mission, xmlFilename)
442443
saveSettings()
444+
if taxHUD then taxHUD:saveLayout() end
443445
end)
444446

445447
local taxMouseHandler = {}
@@ -475,7 +477,7 @@ function taxToggleHUD() FS25TaxMod:consoleTaxHUD() end
475477
function taxDebug(l) FS25TaxMod:consoleTaxDebug(l) end
476478

477479
print("========================================")
478-
print(" FS25 Tax Mod v1.1.1.0 LOADED ")
480+
print(" FS25 Tax Mod v1.1.2.0 LOADED ")
479481
print(" Author: TisonK ")
480482
print(" Type 'tax' in console for help ")
481483
print("========================================")

modDesc.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/NMC-TBone/xml-schema/main/modDesc.xsd">
55

66
<author>TisonK</author>
7-
<version>1.1.1.0</version>
7+
<version>1.1.2.0</version>
88

99
<title>
1010
<en>Tax Mod</en>

src/ui/TaxHUD.lua

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,10 @@ function TaxHUD:saveLayout()
183183
if not path then return end
184184
local xml = XMLFile.create("tax_hud", path, "hudLayout")
185185
if xml then
186-
xml:setFloat("hudLayout.posX", self.posX)
187-
xml:setFloat("hudLayout.posY", self.posY)
188-
xml:setFloat("hudLayout.scale", self.scale)
186+
xml:setFloat("hudLayout.posX", self.posX)
187+
xml:setFloat("hudLayout.posY", self.posY)
188+
xml:setFloat("hudLayout.scale", self.scale)
189+
xml:setBool("hudLayout.visible", self.visible)
189190
xml:save()
190191
xml:delete()
191192
end
@@ -196,9 +197,10 @@ function TaxHUD:loadLayout()
196197
if not path or not fileExists(path) then return end
197198
local xml = XMLFile.load("tax_hud", path)
198199
if xml then
199-
self.posX = xml:getFloat("hudLayout.posX", self.posX)
200-
self.posY = xml:getFloat("hudLayout.posY", self.posY)
201-
self.scale = xml:getFloat("hudLayout.scale", self.scale)
200+
self.posX = xml:getFloat("hudLayout.posX", self.posX)
201+
self.posY = xml:getFloat("hudLayout.posY", self.posY)
202+
self.scale = xml:getFloat("hudLayout.scale", self.scale)
203+
self.visible = xml:getBool("hudLayout.visible", self.visible)
202204
xml:delete()
203205
end
204206
end

0 commit comments

Comments
 (0)