summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/minetest.63
-rw-r--r--doc/minetestserver.63
-rw-r--r--src/main.cpp14
3 files changed, 20 insertions, 0 deletions
diff --git a/doc/minetest.6 b/doc/minetest.6
index 80991289e..d94c12cb6 100644
--- a/doc/minetest.6
+++ b/doc/minetest.6
@@ -37,6 +37,9 @@ Disable main menu
\-\-help
Show allowed options
.TP
+\-\-version
+Show version information
+.TP
\-\-logfile <value>
Set logfile path (debug.txt)
.TP
diff --git a/doc/minetestserver.6 b/doc/minetestserver.6
index 35c4a1fe6..1d4a5f838 100644
--- a/doc/minetestserver.6
+++ b/doc/minetestserver.6
@@ -31,6 +31,9 @@ Set gameid
\-\-help
Show allowed options
.TP
+\-\-version
+Show version information
+.TP
\-\-logfile <value>
Set logfile path (debug.txt)
.TP
diff --git a/src/main.cpp b/src/main.cpp
index 10547b711..455138d5b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -772,6 +772,8 @@ int main(int argc, char *argv[])
std::map<std::string, ValueSpec> allowed_options;
allowed_options.insert(std::make_pair("help", ValueSpec(VALUETYPE_FLAG,
_("Show allowed options"))));
+ allowed_options.insert(std::make_pair("version", ValueSpec(VALUETYPE_FLAG,
+ _("Show version information"))));
allowed_options.insert(std::make_pair("config", ValueSpec(VALUETYPE_STRING,
_("Load configuration from specified file"))));
allowed_options.insert(std::make_pair("port", ValueSpec(VALUETYPE_STRING,
@@ -843,6 +845,18 @@ int main(int argc, char *argv[])
return cmd_args.getFlag("help") ? 0 : 1;
}
+
+ if(cmd_args.getFlag("version"))
+ {
+#ifdef SERVER
+ dstream<<"minetestserver "<<minetest_version_hash<<std::endl;
+#else
+ dstream<<"Minetest "<<minetest_version_hash<<std::endl;
+ dstream<<"Using Irrlicht "<<IRRLICHT_SDK_VERSION<<std::endl;
+#endif
+ dstream<<"Build info: "<<minetest_build_info<<std::endl;
+ return 0;
+ }
/*
Low-level initialization