do not use /**< and other styles of comments
+* write regular comments with //, not with /* */
+
* more info on good practices can be found at:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml
Addon::get_md5() const
{
if (!installed) {
- if (stored_md5 == "") log_warning << "Add-on not installed and no stored MD5 available" << std::endl;
+ if (stored_md5 == "") { log_warning << "Add-on not installed and no stored MD5 available" << std::endl; }
return stored_md5;
}
reader.get("ammo", ammo);
countMe = false;
sound_manager->preload("sounds/dartfire.wav");
- if (start_dir == AUTO) log_warning << "Setting a DartTrap's direction to AUTO is no good idea" << std::endl;
+ if (start_dir == AUTO) { log_warning << "Setting a DartTrap's direction to AUTO is no good idea" << std::endl; }
state = IDLE;
set_colgroup_active(COLGROUP_DISABLED);
if (initial_delay == 0) initial_delay = 0.1f;
gradient_top = top;
gradient_bottom = bottom;
- if (gradient_top.red > 1.0 || gradient_top.green > 1.0
- || gradient_top.blue > 1.0 || gradient_top.alpha > 1.0)
+ if (gradient_top.red > 1.0 || gradient_top.green > 1.0 ||
+ gradient_top.blue > 1.0 || gradient_top.alpha > 1.0)
+ {
log_warning << "top gradient color has values above 1.0" << std::endl;
- if (gradient_bottom.red > 1.0 || gradient_bottom.green > 1.0
- || gradient_bottom.blue > 1.0 || gradient_bottom.alpha > 1.0)
+ }
+
+ if (gradient_bottom.red > 1.0 || gradient_bottom.green > 1.0 ||
+ gradient_bottom.blue > 1.0 || gradient_bottom.alpha > 1.0)
+ {
log_warning << "bottom gradient color has values above 1.0" << std::endl;
+ }
}
void
if( dir_str == "right" ) dir = RIGHT;
reader.get("facing-down", facing_down);
if (facing_down) dir = DOWN;
- if (dir == AUTO) log_warning << "Setting an Ispy's direction to AUTO is no good idea" << std::endl;
+ if (dir == AUTO) { log_warning << "Setting an Ispy's direction to AUTO is no good idea" << std::endl; }
// set initial sprite action
sprite->set_action((dir == DOWN) ? "idle-down" : ((dir == LEFT) ? "idle-left" : "idle-right"));
}
if(empty)
+ {
log_info << "Tilemap '" << name << "', z-pos '" << z_pos << "' is empty." << std::endl;
+ }
}
TileMap::TileMap(const TileSet *new_tileset, std::string name, int z_pos,
--- /dev/null
+// SuperTux
+// Copyright (C) 2014 Ingo Ruhnke <grumbel@gmail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#include "supertux/command_line_arguments.hpp"
+
+#include <stdexcept>
+#include <physfs.h>
+#include <boost/format.hpp>
+
+#include "supertux/gameconfig.hpp"
+#include "supertux/main.hpp"
+#include "util/gettext.hpp"
+#include "version.h"
+
+CommandLineArguments::CommandLineArguments() :
+ m_action(NO_ACTION),
+ m_log_level(LOG_WARNING),
+ fullscreen_size(),
+ fullscreen_refresh_rate(),
+ window_size(),
+ aspect_size(),
+ use_fullscreen(),
+ video(),
+ show_fps(),
+ sound_enabled(),
+ music_enabled(),
+ console_enabled(),
+ start_level(),
+ enable_script_debugger(),
+ start_demo(),
+ record_demo()
+{
+}
+
+CommandLineArguments::~CommandLineArguments()
+{
+}
+
+void
+CommandLineArguments::print_datadir()
+{
+ // Print the datadir searchpath to stdout, one path per
+ // line. Then exit. Intended for use by the supertux-editor.
+ char **sp;
+ size_t sp_index;
+ sp = PHYSFS_getSearchPath();
+ if (sp)
+ for (sp_index = 0; sp[sp_index]; sp_index++)
+ std::cout << sp[sp_index] << std::endl;
+ PHYSFS_freeList(sp);
+}
+
+void
+CommandLineArguments::print_help(const char* argv0)
+{
+ std::string default_user_data_dir =
+ std::string(PHYSFS_getUserDir()) + WRITEDIR_NAME;
+
+ std::cerr << boost::format(_(
+ "\n"
+ "Usage: %s [OPTIONS] [LEVELFILE]\n\n"
+ "CommandLineArguments:\n"
+ " --verbose Print verbose messages\n"
+ " --debug Print extra verbose messages\n"
+ " -f, --fullscreen Run in fullscreen mode\n"
+ " -w, --window Run in window mode\n"
+ " -g, --geometry WIDTHxHEIGHT Run SuperTux in given resolution\n"
+ " -a, --aspect WIDTH:HEIGHT Run SuperTux with given aspect ratio\n"
+ " -d, --default Reset video settings to default values\n"
+ " --renderer RENDERER Use sdl, opengl, or auto to render\n"
+ " --disable-sound Disable sound effects\n"
+ " --disable-music Disable music\n"
+ " -h, --help Show this help message and quit\n"
+ " -v, --version Show SuperTux version and quit\n"
+ " --console Enable ingame scripting console\n"
+ " --noconsole Disable ingame scripting console\n"
+ " --show-fps Display framerate in levels\n"
+ " --no-show-fps Do not display framerate in levels\n"
+ " --record-demo FILE LEVEL Record a demo to FILE\n"
+ " --play-demo FILE LEVEL Play a recorded demo\n"
+ " -s, --debug-scripts Enable script debugger.\n"
+ " --print-datadir Print supertux's primary data directory.\n"
+ "\n"
+ "Environment variables:\n"
+ " SUPERTUX2_USER_DIR Directory for user data (savegames, etc.);\n"
+ " default %s\n"
+ "\n"
+ ))
+ % argv0 % default_user_data_dir
+ << std::flush;
+}
+
+void
+CommandLineArguments::print_version()
+{
+ std::cout << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl;
+}
+
+void
+CommandLineArguments::parse_args(int argc, char** argv)
+{
+ for(int i = 1; i < argc; ++i)
+ {
+ std::string arg = argv[i];
+
+ if (arg == "--version" || arg == "-v")
+ {
+ m_action = PRINT_VERSION;
+
+ }
+ else if (arg == "--help" || arg == "-h")
+ {
+ m_action = PRINT_HELP;
+ }
+ else if (arg == "--print-datadir")
+ {
+ m_action = PRINT_DATADIR;
+ }
+ else if (arg == "--debug")
+ {
+ m_log_level = LOG_DEBUG;
+ }
+ else if (arg == "--verbose")
+ {
+ if (m_log_level < LOG_INFO)
+ {
+ m_log_level = LOG_INFO;
+ }
+ }
+ else if (arg == "--fullscreen" || arg == "-f")
+ {
+ use_fullscreen = true;
+ }
+ else if (arg == "--default" || arg == "-d")
+ {
+ use_fullscreen = false;
+
+ window_size = Size(800, 600);
+ fullscreen_size = Size(800, 600);
+ fullscreen_refresh_rate = 0;
+ aspect_size = Size(0, 0); // auto detect
+ }
+ else if (arg == "--window" || arg == "-w")
+ {
+ use_fullscreen = false;
+ }
+ else if (arg == "--geometry" || arg == "-g")
+ {
+ i += 1;
+ if (i >= argc)
+ {
+ throw std::runtime_error("Need to specify a size (WIDTHxHEIGHT) for geometry argument");
+ }
+ else
+ {
+ int width, height;
+ if (sscanf(argv[i], "%dx%d", &width, &height) != 2)
+ {
+ throw std::runtime_error("Invalid geometry spec, should be WIDTHxHEIGHT");
+ }
+ else
+ {
+ window_size = Size(width, height);
+ fullscreen_size = Size(width, height);
+ fullscreen_refresh_rate = 0;
+ }
+ }
+ }
+ else if (arg == "--aspect" || arg == "-a")
+ {
+ i += 1;
+ if (i >= argc)
+ {
+ throw std::runtime_error("Need to specify a ratio (WIDTH:HEIGHT) for aspect ratio");
+ }
+ else
+ {
+ int aspect_width = 0;
+ int aspect_height = 0;
+ if (strcmp(argv[i], "auto") == 0)
+ {
+ aspect_width = 0;
+ aspect_height = 0;
+ }
+ else if (sscanf(argv[i], "%d:%d", &aspect_width, &aspect_height) != 2)
+ {
+ throw std::runtime_error("Invalid aspect spec, should be WIDTH:HEIGHT or auto");
+ }
+ else
+ {
+ float aspect_ratio = static_cast<float>(aspect_width) / static_cast<float>(aspect_height);
+
+ // use aspect ratio to calculate logical resolution
+ if (aspect_ratio > 1) {
+ aspect_size = Size(static_cast<int>(600 * aspect_ratio + 0.5),
+ 600);
+ } else {
+ aspect_size = Size(600,
+ static_cast<int>(600 * 1/aspect_ratio + 0.5));
+ }
+ }
+ }
+ }
+ else if (arg == "--renderer")
+ {
+ i += 1;
+ if (i >= argc)
+ {
+ throw std::runtime_error("Need to specify a renderer for renderer argument");
+ }
+ else
+ {
+ video = VideoSystem::get_video_system(argv[i]);
+ }
+ }
+ else if (arg == "--show-fps")
+ {
+ show_fps = true;
+ }
+ else if (arg == "--no-show-fps")
+ {
+ show_fps = false;
+ }
+ else if (arg == "--console")
+ {
+ console_enabled = true;
+ }
+ else if (arg == "--noconsole")
+ {
+ console_enabled = false;
+ }
+ else if (arg == "--disable-sound" || arg == "--disable-sfx")
+ {
+ sound_enabled = false;
+ }
+ else if (arg == "--disable-music")
+ {
+ music_enabled = false;
+ }
+ else if (arg == "--play-demo")
+ {
+ if (i+1 >= argc)
+ {
+ throw std::runtime_error("Need to specify a demo filename");
+ }
+ else
+ {
+ start_demo = argv[++i];
+ }
+ }
+ else if (arg == "--record-demo")
+ {
+ if (i+1 >= argc)
+ {
+ throw std::runtime_error("Need to specify a demo filename");
+ }
+ else
+ {
+ record_demo = argv[++i];
+ }
+ }
+ else if (arg == "--debug-scripts" || arg == "-s")
+ {
+ enable_script_debugger = true;
+ }
+ else if (arg[0] != '-')
+ {
+ start_level = arg;
+ }
+ else
+ {
+ throw std::runtime_error((boost::format("Unknown option '%1%''. Use --help to see a list of options") % arg).str());
+ }
+ }
+}
+
+void
+CommandLineArguments::merge_into(Config& config)
+{
+#define merge_option(x) if (x) { config.x = *x; }
+
+ merge_option(fullscreen_size);
+ merge_option(fullscreen_refresh_rate);
+ merge_option(window_size);
+ merge_option(aspect_size);
+ merge_option(use_fullscreen);
+ merge_option(video);
+ merge_option(show_fps);
+ merge_option(sound_enabled);
+ merge_option(music_enabled);
+ merge_option(console_enabled);
+ merge_option(start_level);
+ merge_option(enable_script_debugger);
+ merge_option(start_demo);
+ merge_option(record_demo);
+
+#undef merge_option
+}
+
+/* EOF */
--- /dev/null
+// SuperTux
+// Copyright (C) 2014 Ingo Ruhnke <grumbel@gmail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_SUPERTUX_OPTIONS_HPP
+#define HEADER_SUPERTUX_SUPERTUX_OPTIONS_HPP
+
+#include <boost/optional.hpp>
+
+#include "math/size.hpp"
+#include "util/log.hpp"
+#include "video/video_systems.hpp"
+
+class Config;
+
+/** Command line argument parsing */
+class CommandLineArguments
+{
+public:
+ enum Action
+ {
+ NO_ACTION,
+ PRINT_VERSION,
+ PRINT_HELP,
+ PRINT_DATADIR
+ };
+
+private:
+ Action m_action;
+ LogLevel m_log_level;
+
+public:
+ boost::optional<Size> fullscreen_size;
+ boost::optional<int> fullscreen_refresh_rate;
+ boost::optional<Size> window_size;
+ boost::optional<Size> aspect_size;
+
+ // boost::optional<float> magnification;
+
+ boost::optional<bool> use_fullscreen;
+ boost::optional<VideoSystem::Enum> video;
+ // boost::optional<bool> try_vsync;
+ boost::optional<bool> show_fps;
+ boost::optional<bool> sound_enabled;
+ boost::optional<bool> music_enabled;
+ boost::optional<bool> console_enabled;
+
+ // boost::optional<int> random_seed;
+
+ boost::optional<std::string> start_level;
+ boost::optional<bool> enable_script_debugger;
+ boost::optional<std::string> start_demo;
+ boost::optional<std::string> record_demo;
+
+ // boost::optional<std::string> locale;
+
+public:
+ CommandLineArguments();
+ ~CommandLineArguments();
+
+ Action get_action() const { return m_action; }
+ LogLevel get_log_level() const { return m_log_level; }
+
+ void parse_args(int argc, char** argv);
+
+ void print_help(const char* argv0);
+ void print_version();
+ void print_datadir();
+
+ void merge_into(Config& config);
+
+private:
+ CommandLineArguments(const CommandLineArguments&) = delete;
+ CommandLineArguments& operator=(const CommandLineArguments&) = delete;
+};
+
+#endif
+
+/* EOF */
#include "supertux/game_manager.hpp"
#include "supertux/gameconfig.hpp"
#include "supertux/globals.hpp"
+#include "supertux/command_line_arguments.hpp"
#include "supertux/player_status.hpp"
#include "supertux/resources.hpp"
#include "supertux/screen_fade.hpp"
namespace { DrawingContext *context_pointer; }
-#ifdef _WIN32
-# define WRITEDIR_NAME PACKAGE_NAME
-#else
-# define WRITEDIR_NAME "." PACKAGE_NAME
-#endif
-
void
Main::init_config()
{
}
void
-Main::print_usage(const char* argv0)
-{
- std::string default_user_data_dir =
- std::string(PHYSFS_getUserDir()) + WRITEDIR_NAME;
-
- std::cerr << boost::format(_(
- "\n"
- "Usage: %s [OPTIONS] [LEVELFILE]\n\n"
- "Options:\n"
- " -f, --fullscreen Run in fullscreen mode\n"
- " -w, --window Run in window mode\n"
- " -g, --geometry WIDTHxHEIGHT Run SuperTux in given resolution\n"
- " -a, --aspect WIDTH:HEIGHT Run SuperTux with given aspect ratio\n"
- " -d, --default Reset video settings to default values\n"
- " --renderer RENDERER Use sdl, opengl, or auto to render\n"
- " --disable-sfx Disable sound effects\n"
- " --disable-music Disable music\n"
- " -h, --help Show this help message and quit\n"
- " -v, --version Show SuperTux version and quit\n"
- " --console Enable ingame scripting console\n"
- " --noconsole Disable ingame scripting console\n"
- " --show-fps Display framerate in levels\n"
- " --no-show-fps Do not display framerate in levels\n"
- " --record-demo FILE LEVEL Record a demo to FILE\n"
- " --play-demo FILE LEVEL Play a recorded demo\n"
- " -s, --debug-scripts Enable script debugger.\n"
- " --print-datadir Print supertux's primary data directory.\n"
- "\n"
- "Environment variables:\n"
- " SUPERTUX2_USER_DIR Directory for user data (savegames, etc.);\n"
- " default %s\n"
- "\n"
- ))
- % argv0 % default_user_data_dir
- << std::flush;
-}
-
-/**
- * Options that should be evaluated prior to any initializations at all go here
- */
-bool
-Main::pre_parse_commandline(int argc, char** argv)
-{
- for(int i = 1; i < argc; ++i) {
- std::string arg = argv[i];
-
- if(arg == "--version" || arg == "-v") {
- std::cout << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl;
- return true;
- }
- if(arg == "--help" || arg == "-h") {
- print_usage(argv[0]);
- return true;
- }
- if(arg == "--print-datadir") {
- /*
- * Print the datadir searchpath to stdout, one path per
- * line. Then exit. Intended for use by the supertux-editor.
- */
- char **sp;
- size_t sp_index;
- sp = PHYSFS_getSearchPath();
- if (sp)
- for (sp_index = 0; sp[sp_index]; sp_index++)
- std::cout << sp[sp_index] << std::endl;
- PHYSFS_freeList(sp);
- return true;
- }
- }
-
- return false;
-}
-
-/**
- * Options that should be evaluated after config is read go here
- */
-bool
-Main::parse_commandline(int argc, char** argv)
-{
- for(int i = 1; i < argc; ++i) {
- std::string arg = argv[i];
-
- if(arg == "--fullscreen" || arg == "-f") {
- g_config->use_fullscreen = true;
- } else if(arg == "--default" || arg == "-d") {
- g_config->use_fullscreen = false;
-
- g_config->window_size = Size(800, 600);
- g_config->fullscreen_size = Size(800, 600);
- g_config->fullscreen_refresh_rate = 0;
- g_config->aspect_size = Size(0, 0); // auto detect
-
- } else if(arg == "--window" || arg == "-w") {
- g_config->use_fullscreen = false;
- } else if(arg == "--geometry" || arg == "-g") {
- i += 1;
- if(i >= argc)
- {
- print_usage(argv[0]);
- throw std::runtime_error("Need to specify a size (WIDTHxHEIGHT) for geometry argument");
- }
- else
- {
- int width, height;
- if (sscanf(argv[i], "%dx%d", &width, &height) != 2)
- {
- print_usage(argv[0]);
- throw std::runtime_error("Invalid geometry spec, should be WIDTHxHEIGHT");
- }
- else
- {
- g_config->window_size = Size(width, height);
- g_config->fullscreen_size = Size(width, height);
- g_config->fullscreen_refresh_rate = 0;
- }
- }
- } else if(arg == "--aspect" || arg == "-a") {
- i += 1;
- if(i >= argc)
- {
- print_usage(argv[0]);
- throw std::runtime_error("Need to specify a ratio (WIDTH:HEIGHT) for aspect ratio");
- }
- else
- {
- int aspect_width = 0;
- int aspect_height = 0;
- if (strcmp(argv[i], "auto") == 0)
- {
- aspect_width = 0;
- aspect_height = 0;
- }
- else if (sscanf(argv[i], "%d:%d", &aspect_width, &aspect_height) != 2)
- {
- print_usage(argv[0]);
- throw std::runtime_error("Invalid aspect spec, should be WIDTH:HEIGHT or auto");
- }
- else
- {
- float aspect_ratio = static_cast<float>(aspect_width) / static_cast<float>(aspect_height);
-
- // use aspect ratio to calculate logical resolution
- if (aspect_ratio > 1) {
- g_config->aspect_size = Size(static_cast<int>(600 * aspect_ratio + 0.5),
- 600);
- } else {
- g_config->aspect_size = Size(600,
- static_cast<int>(600 * 1/aspect_ratio + 0.5));
- }
- }
- }
- } else if(arg == "--renderer") {
- i += 1;
- if(i >= argc)
- {
- print_usage(argv[0]);
- throw std::runtime_error("Need to specify a renderer for renderer argument");
- }
- else
- {
- g_config->video = VideoSystem::get_video_system(argv[i]);
- }
- } else if(arg == "--show-fps") {
- g_config->show_fps = true;
- } else if(arg == "--no-show-fps") {
- g_config->show_fps = false;
- } else if(arg == "--console") {
- g_config->console_enabled = true;
- } else if(arg == "--noconsole") {
- g_config->console_enabled = false;
- } else if(arg == "--disable-sfx") {
- g_config->sound_enabled = false;
- } else if(arg == "--disable-music") {
- g_config->music_enabled = false;
- } else if(arg == "--play-demo") {
- if(i+1 >= argc) {
- print_usage(argv[0]);
- throw std::runtime_error("Need to specify a demo filename");
- }
- g_config->start_demo = argv[++i];
- } else if(arg == "--record-demo") {
- if(i+1 >= argc) {
- print_usage(argv[0]);
- throw std::runtime_error("Need to specify a demo filename");
- }
- g_config->record_demo = argv[++i];
- } else if(arg == "--debug-scripts" || arg == "-s") {
- g_config->enable_script_debugger = true;
- } else if(arg[0] != '-') {
- g_config->start_level = arg;
- } else {
- log_warning << "Unknown option '" << arg << "'. Use --help to see a list of options" << std::endl;
- }
- }
-
- return false;
-}
-
-void
Main::init_sdl()
{
if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) < 0) {
{
int result = 0;
- try {
- /* Do this before pre_parse_commandline, because --help now shows the
- * default user data dir. */
+ try
+ {
+ CommandLineArguments args;
+
+ // Do this before pre_parse_commandline, because --help now shows the
+ // default user data dir.
init_physfs(argv[0]);
+
+ try
+ {
+ args.parse_args(argc, argv);
+ g_log_level = args.get_log_level();
+ }
+ catch(const std::exception& err)
+ {
+ std::cout << "Error: " << err.what() << std::endl;
+ return EXIT_FAILURE;
+ }
+
+ switch (args.get_action())
+ {
+ case CommandLineArguments::PRINT_VERSION:
+ args.print_version();
+ return 0;
- if(pre_parse_commandline(argc, argv))
- return 0;
+ case CommandLineArguments::PRINT_HELP:
+ args.print_help(argv[0]);
+ return 0;
+
+ case CommandLineArguments::PRINT_DATADIR:
+ args.print_datadir();
+ return 0;
+
+ default:
+ // continue and start the game as usual
+ break;
+ }
init_sdl();
Console::instance = new Console();
timelog("config");
init_config();
+ args.merge_into(*g_config);
+
timelog("commandline");
- if(parse_commandline(argc, argv))
- return 0;
timelog("video");
std::unique_ptr<Renderer> renderer(VideoSystem::new_renderer());
#ifndef HEADER_SUPERTUX_SUPERTUX_MAIN_HPP
#define HEADER_SUPERTUX_SUPERTUX_MAIN_HPP
+#ifdef _WIN32
+# define WRITEDIR_NAME PACKAGE_NAME
+#else
+# define WRITEDIR_NAME "." PACKAGE_NAME
+#endif
+
class Main
{
private:
- bool parse_commandline(int argc, char** argv);
- bool pre_parse_commandline(int argc, char** argv);
void init_audio();
void init_config();
void init_physfs(const char* argv0);
void init_sdl();
void init_tinygettext();
void init_video();
- void print_usage(const char* argv0);
void quit_audio();
public:
update_game_objects();
- if(solid_tilemaps.size() < 1) log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl;
+ if(solid_tilemaps.size() < 1) { log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl; }
fix_old_tiles();
if(!camera) {
update_game_objects();
- if(solid_tilemaps.size() < 1) log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl;
+ if(solid_tilemaps.size() < 1) { log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl; }
fix_old_tiles();
update_game_objects();
#include "math/rectf.hpp"
#include "supertux/console.hpp"
+LogLevel g_log_level = LOG_WARNING;
+
static std::ostream& get_logging_instance (void)
{
if (Console::instance != NULL)
#include <config.h>
#include <ostream>
+enum LogLevel { LOG_NONE, LOG_FATAL, LOG_WARNING, LOG_INFO, LOG_DEBUG };
+extern LogLevel g_log_level;
+
std::ostream& log_debug_f(const char* file, int line);
-#define log_debug log_debug_f(__FILE__, __LINE__)
+#define log_debug if (g_log_level < LOG_DEBUG) {} else log_debug_f(__FILE__, __LINE__)
std::ostream& log_info_f(const char* file, int line);
-#define log_info log_info_f(__FILE__, __LINE__)
+#define log_info if (g_log_level < LOG_INFO) {} else log_info_f(__FILE__, __LINE__)
std::ostream& log_warning_f(const char* file, int line);
-#define log_warning log_warning_f(__FILE__, __LINE__)
+#define log_warning if (g_log_level < LOG_WARNING) {} else log_warning_f(__FILE__, __LINE__)
std::ostream& log_fatal_f(const char* file, int line);
-#define log_fatal log_fatal_f(__FILE__, __LINE__)
+#define log_fatal if (g_log_level < LOG_FATAL) {} else log_fatal_f(__FILE__, __LINE__)
class Vector;
std::ostream& operator<< (std::ostream& str, const Vector& vector);
bool has_multibyte_mark(unsigned char c);
uint32_t decode_utf8(const std::string& text, size_t& p);
-std::string encode_utf8(uint32_t code);
/**
* returns true if this byte matches a bitmask of 10xx.xxxx, i.e. it is the 2nd, 3rd or 4th byte of a multibyte utf8 string
{
log_info << "SDL_Renderer: " << info.name << std::endl;
log_info << "SDL_RendererFlags: " << std::endl;
- if (info.flags & SDL_RENDERER_SOFTWARE) log_info << " SDL_RENDERER_SOFTWARE" << std::endl;
- if (info.flags & SDL_RENDERER_ACCELERATED) log_info << " SDL_RENDERER_ACCELERATED" << std::endl;
- if (info.flags & SDL_RENDERER_PRESENTVSYNC) log_info << " SDL_RENDERER_PRESENTVSYNC" << std::endl;
- if (info.flags & SDL_RENDERER_TARGETTEXTURE) log_info << " SDL_RENDERER_TARGETTEXTURE" << std::endl;
+ if (info.flags & SDL_RENDERER_SOFTWARE) { log_info << " SDL_RENDERER_SOFTWARE" << std::endl; }
+ if (info.flags & SDL_RENDERER_ACCELERATED) { log_info << " SDL_RENDERER_ACCELERATED" << std::endl; }
+ if (info.flags & SDL_RENDERER_PRESENTVSYNC) { log_info << " SDL_RENDERER_PRESENTVSYNC" << std::endl; }
+ if (info.flags & SDL_RENDERER_TARGETTEXTURE) { log_info << " SDL_RENDERER_TARGETTEXTURE" << std::endl; }
log_info << "Texture Formats: " << std::endl;
for(size_t i = 0; i < info.num_texture_formats; ++i)
{
projects / supertux.git / commitdiff