Output version info to stdout and show in menu

Fixes #82.

diff --git a/Source/Game.hpp b/Source/Game.hpp
index 159cbe78fc3c5dfdbf508a0093500f92990175c1..36ad6c8c4de0080ffc2bcd20b4b97cb8e87d4e60 100644 (file)
--- a/Source/Game.hpp
+++ b/Source/Game.hpp
@@ -206,9 +206,9 @@ SDL_bool sdlEventProc(const SDL_Event &e);
 
 
 
-enum  optionIndex { UNKNOWN, HELP, FULLSCREEN, NOMOUSEGRAB, SOUND, OPENALINFO, SHOWRESOLUTIONS, DEVTOOLS };
+enum  optionIndex { UNKNOWN, VERSION, HELP, FULLSCREEN, NOMOUSEGRAB, SOUND, OPENALINFO, SHOWRESOLUTIONS, DEVTOOLS };
 /* Number of options + 1 */
-const int commandLineOptionsNumber = 9;
+const int commandLineOptionsNumber = 10;
 
 extern const option::Descriptor usage[13];
 

diff --git a/Source/Menu/Menu.cpp b/Source/Menu/Menu.cpp
index 1fbecd21644384e4a019444c8bbe05fccee5c514..b8d003187450c82f0c3849dbffae36f596c25829 100644 (file)
--- a/Source/Menu/Menu.cpp
+++ b/Source/Menu/Menu.cpp
@@ -25,6 +25,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Level/Campaign.hpp"
 #include "User/Settings.hpp"
 #include "Utils/Input.hpp"
+#include "Version.hpp"
 
 // Should not be needed, Menu should call methods from other classes to launch maps and challenges and so on
 #include "Level/Awards.hpp"
@@ -381,6 +382,7 @@ void Menu::Load()
             addButtonImage(1, Mainmenuitems[mainmenu == 1 ? 1 : 5], 18, 480 - 152 - 32, 128, 32);
             addButtonImage(2, Mainmenuitems[2], 18, 480 - 228 - 32, 112, 32);
             addButtonImage(3, Mainmenuitems[mainmenu == 1 ? 3 : 6], 18, 480 - 306 - 32, mainmenu == 1 ? 68 : 132, 32);
+            addLabel(-1, VERSION_NUMBER + VERSION_SUFFIX, 640 - 100, 10);
             break;
         case 3:
             addButton(0, "", 10 + 20, 440);

diff --git a/Source/main.cpp b/Source/main.cpp
index 3e37f646a81462aa9666054f6c6e2cfadf2b18ea..19bfa6ecde6ccee12be0c00bdbc254fcf99ba49e 100644 (file)
--- a/Source/main.cpp
+++ b/Source/main.cpp
@@ -24,6 +24,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Graphic/gamegl.hpp"
 #include "MacCompatibility.hpp"
 #include "User/Settings.hpp"
+#include "Version.hpp"
 
 #include <fstream>
 #include <iostream>
@@ -588,6 +589,7 @@ const option::Descriptor usage[] =
     {
       { UNKNOWN, 0, "", "", option::Arg::None, "USAGE: lugaru [options]\n\n"
                                                "Options:" },
+      { VERSION, 0, "v", "version", option::Arg::None, " -v, --version     Print version and exit." },
       { HELP, 0, "h", "help", option::Arg::None, " -h, --help        Print usage and exit." },
       { FULLSCREEN, 1, "f", "fullscreen", option::Arg::None, " -f, --fullscreen  Start the game in fullscreen mode." },
       { FULLSCREEN, 0, "w", "windowed", option::Arg::None, " -w, --windowed    Start the game in windowed mode (default)." },
@@ -620,6 +622,23 @@ int main(int argc, char** argv)
         return 1;
     }
 
+    // Always start by printing the version and info to the stdout
+    std::cout << "--------------------------------------------------------------------------\n"
+              << "Lugaru HD: The Rabbit's Foot, by Wolfire Games and the OSS Lugaru project.\n\n"
+              << "Licensed under the GPL 2.0+ and CC-BY-SA 3.0 and 4.0 licenses.\n"
+              << "More information, updates and bug reports at http://osslugaru.gitlab.io\n"
+              << std::endl;
+
+    std::cout << "Version " + VERSION_STRING + " -- " + VERSION_BUILD_TYPE + " build\n"
+              << "--------------------------------------------------------------------------\n"
+              << std::endl;
+
+    if (commandLineOptions[VERSION]) {
+        // That was enough, quit.
+        delete[] commandLineOptionsBuffer;
+        return 0;
+    }
+
     if (commandLineOptions[HELP]) {
         option::printUsage(std::cout, usage);
         delete[] commandLineOptionsBuffer;