From 40352751c834f0dc3ab0a6ac5b1a6419fae47f5c Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Sun, 10 Aug 2014 22:31:55 +0200 Subject: [PATCH] Added some m_ prefixes and made variables private in World --- src/supertux/menu/contrib_menu.cpp | 4 +- src/supertux/world.cpp | 82 ++++++++++++++++++-------------------- src/supertux/world.hpp | 24 ++++++----- 3 files changed, 54 insertions(+), 56 deletions(-) diff --git a/src/supertux/menu/contrib_menu.cpp b/src/supertux/menu/contrib_menu.cpp index 49d0b5ea5..adeaa4233 100644 --- a/src/supertux/menu/contrib_menu.cpp +++ b/src/supertux/menu/contrib_menu.cpp @@ -54,7 +54,7 @@ ContribMenu::ContribMenu() : world->load(*it + "/info"); - if (!world->hide_from_contribs) + if (!world->hide_from_contribs()) { { // FIXME: yuck, this should be easier std::ostringstream stream; @@ -92,7 +92,7 @@ ContribMenu::check_menu() if (index != -1) { World* world = m_contrib_worlds[index].get(); - if (!world->is_levelset) + if (!world->is_levelset()) { // FIXME: not the most elegant of solutions to std::move() the // World, but the ContribMenu should get destructed after this, diff --git a/src/supertux/world.cpp b/src/supertux/world.cpp index 05acd7390..fbfe809b5 100644 --- a/src/supertux/world.cpp +++ b/src/supertux/world.cpp @@ -33,32 +33,28 @@ World::World() : m_worldmap_filename(), - levels(), - basedir(), - savegame_filename(), - world_thread(), - title(), - description(), - player_status(), - hide_from_contribs(), - is_levelset() + m_levels(), + m_basedir(), + m_savegame_filename(), + m_world_thread(), + m_title(), + m_description(), + m_player_status(new PlayerStatus), + m_hide_from_contribs(false), + m_is_levelset(true) { - player_status.reset(new PlayerStatus()); - - is_levelset = true; - hide_from_contribs = false; - sq_resetobject(&world_thread); + sq_resetobject(&m_world_thread); } World::~World() { - sq_release(scripting::global_vm, &world_thread); + sq_release(scripting::global_vm, &m_world_thread); } void World::set_savegame_filename(const std::string& filename) { - this->savegame_filename = filename; + m_savegame_filename = filename; // make sure the savegame directory exists std::string dirname = FileSystem::dirname(filename); if(!PHYSFS_exists(dirname.c_str())) { @@ -80,8 +76,8 @@ World::set_savegame_filename(const std::string& filename) void World::load(const std::string& filename) { - basedir = FileSystem::dirname(filename); - m_worldmap_filename = basedir + "worldmap.stwm"; + m_basedir = FileSystem::dirname(filename); + m_worldmap_filename = m_basedir + "worldmap.stwm"; lisp::Parser parser; const lisp::Lisp* root = parser.parse(filename); @@ -92,18 +88,18 @@ World::load(const std::string& filename) if(info == NULL) throw std::runtime_error("File is not a world or levelsubset file"); - hide_from_contribs = false; - is_levelset = true; + m_hide_from_contribs = false; + m_is_levelset = true; - info->get("title", title); - info->get("description", description); - info->get("levelset", is_levelset); - info->get("hide-from-contribs", hide_from_contribs); + info->get("title", m_title); + info->get("description", m_description); + info->get("levelset", m_is_levelset); + info->get("hide-from-contribs", m_hide_from_contribs); // Level info file doesn't define any levels, so read the // directory to see what we can find - std::string path = basedir; + std::string path = m_basedir; char** files = PHYSFS_enumerateFiles(path.c_str()); if(!files) { log_warning << "Couldn't read subset dir '" << path << "'" << std::endl; @@ -115,12 +111,12 @@ World::load(const std::string& filename) Level level; level.fullpath = path + *filename; level.name = *filename; - levels.push_back(level); + m_levels.push_back(level); } } PHYSFS_freeList(files); - std::sort(levels.begin(), levels.end(), + std::sort(m_levels.begin(), m_levels.end(), [](const Level& lhs, const Level& rhs) { return StringUtil::numeric_less(lhs.fullpath, rhs.fullpath); @@ -142,18 +138,18 @@ World::run() load_state(); - std::string filename = basedir + "/world.nut"; + std::string filename = m_basedir + "/world.nut"; try { IFileStreambuf ins(filename); std::istream in(&ins); - sq_release(scripting::global_vm, &world_thread); - world_thread = scripting::create_thread(scripting::global_vm); - scripting::compile_and_run(scripting::object_to_vm(world_thread), in, filename); + sq_release(scripting::global_vm, &m_world_thread); + m_world_thread = scripting::create_thread(scripting::global_vm); + scripting::compile_and_run(scripting::object_to_vm(m_world_thread), in, filename); } catch(std::exception& ) { // fallback: try to load worldmap worldmap.stwm using namespace worldmap; - g_screen_manager->push_screen(std::unique_ptr(new WorldMap(basedir + "worldmap.stwm", get_player_status()))); + g_screen_manager->push_screen(std::unique_ptr(new WorldMap(m_basedir + "worldmap.stwm", get_player_status()))); } } @@ -162,7 +158,7 @@ World::save_state() { using namespace scripting; - lisp::Writer writer(savegame_filename); + lisp::Writer writer(m_savegame_filename); writer.start_list("supertux-savegame"); writer.write("version", 1); @@ -177,7 +173,7 @@ World::save_state() } writer.start_list("tux"); - player_status->write(writer); + m_player_status->write(writer); writer.end_list("tux"); writer.start_list("state"); @@ -199,15 +195,15 @@ World::load_state() { using namespace scripting; - if(!PHYSFS_exists(savegame_filename.c_str())) + if(!PHYSFS_exists(m_savegame_filename.c_str())) { - log_info << savegame_filename << ": doesn't exist, not loading state" << std::endl; + log_info << m_savegame_filename << ": doesn't exist, not loading state" << std::endl; } else { try { lisp::Parser parser; - const lisp::Lisp* root = parser.parse(savegame_filename); + const lisp::Lisp* root = parser.parse(m_savegame_filename); const lisp::Lisp* lisp = root->get_lisp("supertux-savegame"); if(lisp == NULL) @@ -221,7 +217,7 @@ World::load_state() const lisp::Lisp* tux = lisp->get_lisp("tux"); if(tux == NULL) throw std::runtime_error("No tux section in savegame"); - player_status->read(*tux); + m_player_status->read(*tux); const lisp::Lisp* state = lisp->get_lisp("state"); if(state == NULL) @@ -247,13 +243,13 @@ World::load_state() const std::string& World::get_level_filename(unsigned int i) const { - return levels[i].fullpath; + return m_levels[i].fullpath; } unsigned int World::get_num_levels() const { - return levels.size(); + return m_levels.size(); } int @@ -293,7 +289,7 @@ World::get_num_solved_levels() const } else { - for(auto level : levels) + for(auto level : m_levels) { sq_pushstring(vm, level.name.c_str(), -1); if(SQ_FAILED(sq_get(vm, -2))) @@ -324,13 +320,13 @@ World::get_num_solved_levels() const const std::string& World::get_basedir() const { - return basedir; + return m_basedir; } const std::string& World::get_title() const { - return title; + return m_title; } /* EOF */ diff --git a/src/supertux/world.hpp b/src/supertux/world.hpp index f9764a4a1..a7ffd2757 100644 --- a/src/supertux/world.hpp +++ b/src/supertux/world.hpp @@ -44,10 +44,13 @@ public: const std::string& get_basedir() const; const std::string& get_title() const; - PlayerStatus* get_player_status() const { return player_status.get(); } + PlayerStatus* get_player_status() const { return m_player_status.get(); } void run(); + bool hide_from_contribs() const { return m_hide_from_contribs; } + bool is_levelset() const { return m_is_levelset; } + private: std::string m_worldmap_filename; struct Level @@ -57,17 +60,16 @@ private: std::string name; }; - std::vector levels; - std::string basedir; - std::string savegame_filename; - HSQOBJECT world_thread; - std::string title; - std::string description; - std::unique_ptr player_status; + std::vector m_levels; + std::string m_basedir; + std::string m_savegame_filename; + HSQOBJECT m_world_thread; + std::string m_title; + std::string m_description; + std::unique_ptr m_player_status; -public: - bool hide_from_contribs; - bool is_levelset; + bool m_hide_from_contribs; + bool m_is_levelset; private: World(const World&) = delete; -- 2.11.0