Remove redundant functions from blocks.cpp, fix editor problem with pagination

2021-07-24 19:59:25 +02:00
parent 3be728843a
commit d638108223
8 changed files with 113 additions and 381 deletions
@@ -131,17 +131,17 @@ void loadMap( std::shared_ptr< SDLPP::Scene > &scene,
                auto obj = createTerrainBlock(
                    block.getTerrainId(), block.getTerrainType(),
                    renderer, i, j, destructible, editor );
-                if(obj == nullptr)
-                    continue;
-                obj->setCoinCount(coinCount);
-                if(removeCollisions) {
-                    obj->removeCollisions();
-                }
-                if ( obj != nullptr ) {
-                    if ( editor ) {
-                        obj->getCollisions()[0]->setId( EDITOR_TERRAIN_ID );
+                if(obj != nullptr) {
+                    obj->setCoinCount(coinCount);
+                    if(removeCollisions) {
+                        obj->removeCollisions();
+                    }
+                    if ( obj != nullptr ) {
+                        if ( editor ) {
+                            obj->getCollisions()[0]->setId( EDITOR_TERRAIN_ID );
+                        }
+                        scene->addObject( obj );
                    }
-                    scene->addObject( obj );
                }
            }
            if ( block.hasCharacter() ) {