From 6bfe8afde26573b6e9f8bd5bb30098b3e3e0de7d Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Thu, 11 Jun 2020 22:07:47 +0200
Subject: [PATCH] Add current version message to options page
---
src/gui/mainMenu/AlphaDisclaimer.tw | 2 +-
src/gui/options/options.tw | 37 ++++++++++++++++-------------
2 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/gui/mainMenu/AlphaDisclaimer.tw b/src/gui/mainMenu/AlphaDisclaimer.tw
index 717c8b16c4e..a911ece80df 100644
--- a/src/gui/mainMenu/AlphaDisclaimer.tw
+++ b/src/gui/mainMenu/AlphaDisclaimer.tw
@@ -30,7 +30,7 @@
Pregmod is a modification of the original <i>Free Cities</i> created by FCdev, which can be seen at https://freecitiesblog.blogspot.com/.
</div>
<div class="note">
- version: $ver, mod version: $pmodVer, build: $releaseID <<if App.Version.commitHash>>commit: <<= App.Version.commitHash>><</if>>
+ version: $ver, mod version: $pmodVer, build: $releaseID<<if App.Version.commitHash>>, commit: <<= App.Version.commitHash>><</if>>
</div>
<div id="version">
<<link "More version info">>
diff --git a/src/gui/options/options.tw b/src/gui/options/options.tw
index eca799a9e6b..4b0b15f9e26 100644
--- a/src/gui/options/options.tw
+++ b/src/gui/options/options.tw
@@ -30,23 +30,26 @@
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
<<includeDOM _options.render()>>
-<br>
-This save was created using FC version $ver build $releaseID.
-<br> [[Apply Backwards Compatibility Update|Backwards Compatibility]]
-<<if $secExpEnabled == 1>>
- <br> [[Apply Security Expansion mod backwards compatibility |SecExpBackwardCompatibility]]
-<</if>>
-<<if $SF.Toggle && $SF.Active >= 1>>
- <br>
- <<link "Apply Special Force Expansion mod backwards compatibility">>
- <<= App.SF.BC()>>
- <<goto "Options">>
- <</link>>
-<</if>>
-<br><<link "Reset extended family mode controllers">>
- <<run resetFamilyCounters()>>
- <<replace "#familyHint">>//@@.lightgreen;Done:@@ all family relations flushed and rebuilt.//<</replace>>
- <</link>>
+<div>
+ This save was created using FC version $ver build $releaseID. You are currently playing version: <<= App.Version.base>>, mod version: <<= App.Version.pmod>>, build: <<= App.Version.release>><<if App.Version.commitHash>>, commit: <<= App.Version.commitHash>><</if>>
+<div>
+<div class="indent">
+ [[Apply Backwards Compatibility Update|Backwards Compatibility]]
+ <<if $secExpEnabled == 1>>
+ <br>[[Apply Security Expansion mod backwards compatibility |SecExpBackwardCompatibility]]
+ <</if>>
+ <<if $SF.Toggle && $SF.Active >= 1>>
+ <br>
+ <<link "Apply Special Force Expansion mod backwards compatibility">>
+ <<= App.SF.BC()>>
+ <<goto "Options">>
+ <</link>>
+ <</if>>
+</div>
+<<link "Reset extended family mode controllers">>
+ <<run resetFamilyCounters()>>
+ <<replace "#familyHint">>//@@.lightgreen;Done:@@ all family relations flushed and rebuilt.//<</replace>>
+<</link>>
<span id="familyHint">//Clears and rebuilds .sister and .daughter tracking.//</span>
<<if isNaN($rep)>>
<br>[[Reset Reputation|Options][$rep = 0]]
--
GitLab