Mario: merge mapLoader functions into one

2021-05-31 18:54:43 +02:00
parent 0b3689b0ae
commit af3954cb61
2 changed files with 42 additions and 72 deletions
@@ -20,14 +20,14 @@ typedef std::tuple< uint8_t, uint16_t, uint8_t, uint8_t, uint8_t, uint8_t >
 typedef std::array< mapObjectType, 16 > mapColumnType;

 void loadMap( std::shared_ptr< SDLPP::Scene > &scene,
-              std::shared_ptr< SDLPP::RectangleRender > mario,
+              std::shared_ptr< SDLPP::RenderObject > mario,
              const std::string &file,
              std::shared_ptr< SDLPP::Renderer > &renderer );
 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 );
+              std::vector< mapColumnType > &objects, bool editor = true );
 void saveMap( const std::string &file, std::vector< mapColumnType > &objects );

 #endif