Cleanup: drop Server::hudGetHotbarImage()

[dragonfireclient.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 792cd104dd97ab070a455c9585c0eb0f047b771a..d9073cfb859e59806784b7610b9f97b0441e6c02 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "quicktune.h"
 #include "httpfetch.h"
 #include "gameparams.h"
-#include "database.h"
+#include "database/database.h"
 #include "config.h"
 #include "player.h"
 #include "porting.h"
@@ -41,14 +41,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #include "terminal_chat_console.h"
 #endif
 #ifndef SERVER
-#include "guiMainMenu.h"
+#include "gui/guiMainMenu.h"
 #include "client/clientlauncher.h"
-#include "guiEngine.h"
-#include "mainmenumanager.h"
+#include "gui/guiEngine.h"
+#include "gui/mainmenumanager.h"
 #endif
 
 #ifdef HAVE_TOUCHSCREENGUI
-       #include "touchscreengui.h"
+       #include "gui/touchscreengui.h"
 #endif
 
 #if !defined(SERVER) && \
@@ -74,11 +74,11 @@ static void print_help(const OptionList &allowed_options);
 static void print_allowed_options(const OptionList &allowed_options);
 static void print_version();
 static void print_worldspecs(const std::vector<WorldSpec> &worldspecs,
-                                                        std::ostream &os);
+       std::ostream &os, bool print_name = true, bool print_path = true);
 static void print_modified_quicktune_values();
 
 static void list_game_ids();
-static void list_worlds();
+static void list_worlds(bool print_name, bool print_path);
 static void setup_log_params(const Settings &cmd_args);
 static bool create_userdata_path();
 static bool init_common(const Settings &cmd_args, int argc, char *argv[]);
@@ -160,9 +160,15 @@ int main(int argc, char *argv[])
                return 0;
        }
 
-       // List worlds if requested
-       if (cmd_args.exists("world") && cmd_args.get("world") == "list") {
-               list_worlds();
+       // List worlds, world names, and world paths if requested
+       if (cmd_args.exists("worldlist")) {
+               if (cmd_args.get("worldlist") == "name") {
+                       list_worlds(true, false);
+               } else if (cmd_args.get("worldlist") == "path") {
+                       list_worlds(false, true);
+               } else {
+                       list_worlds(true, true);
+               }
                return 0;
        }
 
@@ -252,11 +258,23 @@ static void set_allowed_options(OptionList *allowed_options)
        allowed_options->insert(std::make_pair("map-dir", ValueSpec(VALUETYPE_STRING,
                        _("Same as --world (deprecated)"))));
        allowed_options->insert(std::make_pair("world", ValueSpec(VALUETYPE_STRING,
-                       _("Set world path (implies local game) ('list' lists all)"))));
+                       _("Set world path (implies local game)"))));
        allowed_options->insert(std::make_pair("worldname", ValueSpec(VALUETYPE_STRING,
                        _("Set world by name (implies local game)"))));
+       allowed_options->insert(std::make_pair("worldlist", ValueSpec(VALUETYPE_STRING,
+                       _("Get list of worlds (implies local game) ('path' lists paths, "
+                       "'name' lists names, 'both' lists both)"))));
        allowed_options->insert(std::make_pair("quiet", ValueSpec(VALUETYPE_FLAG,
                        _("Print to console errors only"))));
+#if !defined(_WIN32)
+       allowed_options->insert(std::make_pair("color", ValueSpec(VALUETYPE_STRING,
+                       _("Coloured logs ('always', 'never' or 'auto'), defaults to 'auto'"
+                       ))));
+#else
+       allowed_options->insert(std::make_pair("color", ValueSpec(VALUETYPE_STRING,
+                       _("Coloured logs ('always' or 'never'), defaults to 'never'"
+                       ))));
+#endif
        allowed_options->insert(std::make_pair("info", ValueSpec(VALUETYPE_FLAG,
                        _("Print more information to console"))));
        allowed_options->insert(std::make_pair("verbose",  ValueSpec(VALUETYPE_FLAG,
@@ -336,24 +354,26 @@ static void list_game_ids()
                std::cout << gameid <<std::endl;
 }
 
-static void list_worlds()
+static void list_worlds(bool print_name, bool print_path)
 {
        std::cout << _("Available worlds:") << std::endl;
        std::vector<WorldSpec> worldspecs = getAvailableWorlds();
-       print_worldspecs(worldspecs, std::cout);
+       print_worldspecs(worldspecs, std::cout, print_name, print_path);
 }
 
 static void print_worldspecs(const std::vector<WorldSpec> &worldspecs,
-                                                        std::ostream &os)
+       std::ostream &os, bool print_name, bool print_path)
 {
        for (const WorldSpec &worldspec : worldspecs) {
                std::string name = worldspec.name;
                std::string path = worldspec.path;
-               if (name.find(' ') != std::string::npos)
-                       name = std::string("'").append(name).append("'");
-               path = std::string("'").append(path).append("'");
-               name = padStringRight(name, 14);
-               os << "  " << name << " " << path << std::endl;
+               if (print_name && print_path) {
+                       os << "\t" << name << "\t\t" << path << std::endl;
+               } else if (print_name) {
+                       os << "\t" << name << std::endl;
+               } else if (print_path) {
+                       os << "\t" << path << std::endl;
+               }
        }
 }
 
@@ -382,6 +402,17 @@ static void setup_log_params(const Settings &cmd_args)
                g_logger.addOutputMaxLevel(&stderr_output, LL_ERROR);
        }
 
+       // Coloured log messages (see log.h)
+       if (cmd_args.exists("color")) {
+               std::string mode = cmd_args.get("color");
+               if (mode == "auto")
+                       Logger::color_mode = LOG_COLOR_AUTO;
+               else if (mode == "always")
+                       Logger::color_mode = LOG_COLOR_ALWAYS;
+               else
+                       Logger::color_mode = LOG_COLOR_NEVER;
+       }
+
        // If trace is enabled, enable logging of certain things
        if (cmd_args.getFlag("trace")) {
                dstream << _("Enabling trace level debug output") << std::endl;