diff --git a/mario/editor.cpp b/mario/editor.cpp index beab099..0ca333b 100644 --- a/mario/editor.cpp +++ b/mario/editor.cpp @@ -944,7 +944,7 @@ int main() { // TODO file name loadMap( scene, global_vars.mario, "test_binary.bin", renderer, - global_vars.objects ); + global_vars.objects, true, MAP_WIDTH ); auto font = std::make_shared< SDLPP::Font >( "testfont.ttf", 36 ); auto font_config = std::make_shared< SDLPP::FontConfiguration >( diff --git a/mario/maploader.cpp b/mario/maploader.cpp index 00e79b6..b55643b 100644 --- a/mario/maploader.cpp +++ b/mario/maploader.cpp @@ -7,7 +7,6 @@ #include "objectids.hpp" #include "global_vars.hpp" -// TODO move to one function void loadMap( std::shared_ptr< SDLPP::Scene > &scene, std::shared_ptr< SDLPP::RenderObject > mario, const std::string &file, @@ -22,7 +21,7 @@ void loadMap( std::shared_ptr< SDLPP::Scene > &scene, std::shared_ptr< SDLPP::RenderObject > &mario, const std::string &file, std::shared_ptr< SDLPP::Renderer > &renderer, - std::vector< mapColumnType > &objects, bool editor ) { + std::vector< mapColumnType > &objects, bool editor, size_t editor_width ) { std::ifstream map_file; map_file.open( file, std::ios::in | std::ios::binary ); uint16_t cols; @@ -101,8 +100,8 @@ void loadMap( std::shared_ptr< SDLPP::Scene > &scene, } } } - if ( editor && objects.size() < 18 ) { - objects.resize( 18 ); + if ( editor && objects.size() < editor_width ) { + objects.resize( editor_width ); } } diff --git a/mario/maploader.hpp b/mario/maploader.hpp index d301085..27f008f 100644 --- a/mario/maploader.hpp +++ b/mario/maploader.hpp @@ -27,7 +27,7 @@ void loadMap( std::shared_ptr< SDLPP::Scene > &scene, std::shared_ptr< SDLPP::RenderObject > &mario, const std::string &file, std::shared_ptr< SDLPP::Renderer > &renderer, - std::vector< mapColumnType > &objects, bool editor = true ); + std::vector< mapColumnType > &objects, bool editor = false, size_t editor_width = 0 ); void saveMap( const std::string &file, std::vector< mapColumnType > &objects ); #endif