From 936b6806eb669c7923f304390ee05d788e037af4 Mon Sep 17 00:00:00 2001 From: Alan Youngblood Date: Sat, 5 Aug 2023 18:08:05 -0400 Subject: [PATCH] Added sanity checks to tiles --- assets/maps/kaiju-city-map.json | 2 +- src/config/credits.json | 4 ++-- src/ecs/TileMapComponent.h | 28 ++++++++++++++++------------ src/game/Game.cpp | 2 +- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/assets/maps/kaiju-city-map.json b/assets/maps/kaiju-city-map.json index e39e5aa..172ffb7 100644 --- a/assets/maps/kaiju-city-map.json +++ b/assets/maps/kaiju-city-map.json @@ -4,7 +4,7 @@ "layers":[ { "compression":"", - "data":"DQAAAA0AAAANAAAADQAAAA0AAAANAAAAAQAAAAIAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAAQAAAAIAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAAcAAAAIAAAADQAAAA0AAAANAAAAIgAAACIAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAAJAAAACgAAAAsAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAAJAAAACgAAAAsAAAALAAAACwAAAAsAAAANAAAADQAAAA0AAAANAAAADwAAABAAAAANAAAADQAAAA0AAAANAAAAIgAAABMAAAATAAAAEwAAABMAAAATAAAAEwAAABEAAAASAAAAEwAAABMAAAATAAAAEwAAABMAAAATAAAAEwAAABEAAAASAAAAEwAAABMAAAATAAAAEwAAAA0AAAANAAAADQAAAA0AAAAXAAAAGAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAGwAAABwAAAAdAAAAAQAAAAIAAAAEAAAABQAAAAUAAAAFAAAABQAAAAUAAAAGAAAAAQAAAAIAAAAZAAAAGgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAjAAAAJAAAACUAAAABAAAAAgAAAAwAAAANAAAADQAAAA0AAAANAAAADQAAAA4AAAABAAAAAgAAACEAAAAiAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAACsAAAAsAAAALQAAAAEAAAACAAAADAAAAA0AAAANAAAADQAAAA0AAAANAAAADgAAAAEAAAACAAAAKQAAACoAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAKwAAACwAAAAtAAAAAQAAAAIAAAAMAAAADQAAAA0AAAANAAAADQAAAA0AAAAOAAAAAQAAAAIAAAAxAAAAMgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAHwAAACAAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAArAAAALAAAAC0AAAABAAAAAgAAAAwAAAANAAAADQAAAA0AAAANAAAADQAAAA4AAAABAAAAAgAAAB4AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAnAAAAKAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAACsAAAAsAAAALQAAAAEAAAACAAAADAAAAA0AAAANAAAADQAAAA0AAAANAAAADgAAAAEAAAACAAAAJgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAC8AAAAwAAAADQAAAA0AAAANAAAADQAAABsAAAAcAAAAHAAAABwAAAAdAAAAAQAAAAIAAAAMAAAADQAAAA0AAAANAAAADQAAAA0AAAAOAAAAAQAAAAIAAAAZAAAAGgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAIwAAACMAAAAjAAAAJAAAACUAAAABAAAAAgAAAAwAAAANAAAADQAAAA0AAAANAAAADQAAAA4AAAABAAAAAgAAACEAAAAiAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAArAAAAIwAAACsAAAAsAAAALQAAAAEAAAACAAAADAAAAA0AAAANAAAADQAAAA0AAAANAAAADgAAAAEAAAACAAAAKQAAACoAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAADMAAAA0AAAAMwAAADQAAAA1AAAAAQAAAAIAAAAUAAAAFQAAABUAAAAVAAAAFQAAABUAAAAWAAAAAQAAAAIAAAAxAAAAMgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAAJAAAACgAAAAsAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAAJAAAACgAAAAsAAAALAAAACwAAAAsAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAABMAAAATAAAAEwAAABMAAAATAAAAEwAAABEAAAASAAAAEwAAABMAAAATAAAAEwAAABMAAAATAAAAEwAAABEAAAASAAAAEwAAABMAAAATAAAAEwAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAAQAAAAIAAAAZAAAAGgAAAA0AAAAfAAAAIAAAAA0AAAA4AAAAAQAAAAIAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAfAAAAIAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAABAAAAAgAAACEAAAAiAAAADQAAACcAAAAoAAAADQAAAEAAAAABAAAAAgAAADcAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAACcAAAAoAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAAEAAAACAAAAKQAAACoAAAAfAAAAIAAAAB8AAAAgAAAAOAAAAAEAAAACAAAAPwAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAALwAAADAAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAAQAAAAIAAAAxAAAAMgAAACcAAAAoAAAAJwAAACgAAABAAAAAAQAAAAIAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAABAAAAAgAAAA0AAAANAAAALwAAADAAAAAvAAAAMAAAAA0AAAABAAAAAgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAHAAAACAAAAA0AAAANAAAABwAAAAgAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA8AAAAQAAAABwAAAAgAAAAPAAAAEAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAFwAAABgAAAAPAAAAEAAAABcAAAAYAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAABwAAAAgAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAABcAAAAYAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAPAAAAEAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAABcAAAAYAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAfAAAAIAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAABwAAAAgAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAACcAAAAoAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAPAAAAEAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAALwAAADAAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAABcAAAAYAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAIgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAACIAAAAiAAAAIgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAiAAAAIgAAAA==", + "data":"DQAAAA0AAAANAAAADQAAAA0AAAANAAAAAQAAAAIAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAAQAAAAIAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAAcAAAAIAAAADQAAAA0AAAANAAAAIgAAACIAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAAJAAAACgAAAAsAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAAJAAAACgAAAAsAAAALAAAACwAAAAsAAAANAAAADQAAAA0AAAANAAAADwAAABAAAAANAAAADQAAAA0AAAANAAAAIgAAABMAAAATAAAAEwAAABMAAAATAAAAEwAAABEAAAASAAAAEwAAABMAAAATAAAAEwAAABMAAAATAAAAEwAAABEAAAASAAAAEwAAABMAAAATAAAAEwAAAA0AAAANAAAADQAAAA0AAAAXAAAAGAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAGwAAABwAAAAdAAAAAQAAAAIAAAAEAAAABQAAAAUAAAAFAAAABQAAAAUAAAAGAAAAAQAAAAIAAAAZAAAAGgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAjAAAAJAAAACUAAAABAAAAAgAAAAwAAAANAAAADQAAAA0AAAANAAAADQAAAA4AAAABAAAAAgAAACEAAAAiAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAACsAAAAsAAAALQAAAAEAAAACAAAADAAAAA0AAAANAAAADQAAAA0AAAANAAAADgAAAAEAAAACAAAAKQAAACoAAAANAAAADQAAAA0AAAAAAAAAAAAAAAAAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAKwAAACwAAAAtAAAAAQAAAAIAAAAMAAAADQAAAA0AAAANAAAADQAAAA0AAAAOAAAAAQAAAAIAAAAxAAAAMgAAAA0AAAANAAAADQAAAA0AAAAAAAAADQAAAA0AAAANAAAAHwAAACAAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAArAAAALAAAAC0AAAABAAAAAgAAAAwAAAANAAAADQAAAA0AAAANAAAADQAAAA4AAAABAAAAAgAAAB4AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAnAAAAKAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAACsAAAAsAAAALQAAAAEAAAACAAAADAAAAA0AAAANAAAADQAAAA0AAAANAAAADgAAAAEAAAACAAAAJgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAC8AAAAwAAAADQAAAA0AAAANAAAADQAAABsAAAAcAAAAHAAAABwAAAAdAAAAAQAAAAIAAAAMAAAADQAAAA0AAAANAAAADQAAAA0AAAAOAAAAAQAAAAIAAAAZAAAAGgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAIwAAACMAAAAjAAAAJAAAACUAAAABAAAAAgAAAAwAAAANAAAADQAAAA0AAAANAAAADQAAAA4AAAABAAAAAgAAACEAAAAiAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAArAAAAIwAAACsAAAAsAAAALQAAAAEAAAACAAAADAAAAA0AAAANAAAADQAAAA0AAAANAAAADgAAAAEAAAACAAAAKQAAACoAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAADMAAAA0AAAAMwAAADQAAAA1AAAAAQAAAAIAAAAUAAAAFQAAABUAAAAVAAAAFQAAABUAAAAWAAAAAQAAAAIAAAAxAAAAMgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAAJAAAACgAAAAsAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAAJAAAACgAAAAsAAAALAAAACwAAAAsAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAABMAAAATAAAAEwAAABMAAAATAAAAEwAAABEAAAASAAAAEwAAABMAAAATAAAAEwAAABMAAAATAAAAEwAAABEAAAASAAAAEwAAABMAAAATAAAAEwAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAAQAAAAIAAAAZAAAAGgAAAA0AAAAfAAAAIAAAAA0AAAA4AAAAAQAAAAIAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAfAAAAIAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAABAAAAAgAAACEAAAAiAAAADQAAACcAAAAoAAAADQAAAEAAAAABAAAAAgAAADcAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAACcAAAAoAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAAEAAAACAAAAKQAAACoAAAAfAAAAIAAAAB8AAAAgAAAAOAAAAAEAAAACAAAAPwAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAALwAAADAAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAAQAAAAIAAAAxAAAAMgAAACcAAAAoAAAAJwAAACgAAABAAAAAAQAAAAIAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAABAAAAAgAAAA0AAAANAAAALwAAADAAAAAvAAAAMAAAAA0AAAABAAAAAgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAHAAAACAAAAA0AAAANAAAABwAAAAgAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA8AAAAQAAAABwAAAAgAAAAPAAAAEAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAFwAAABgAAAAPAAAAEAAAABcAAAAYAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAABwAAAAgAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAABcAAAAYAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAPAAAAEAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAABcAAAAYAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAfAAAAIAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAABwAAAAgAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAACcAAAAoAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAPAAAAEAAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAALwAAADAAAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAABcAAAAYAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAIgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAACIAAAAiAAAAIgAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAAiAAAAIgAAAA==", "encoding":"base64", "height":32, "id":1, diff --git a/src/config/credits.json b/src/config/credits.json index 85f1aa9..a4d5f6f 100644 --- a/src/config/credits.json +++ b/src/config/credits.json @@ -1,6 +1,6 @@ { -"GameName":"Beagle Rescue", -"Developers": "Alan Youngblood, Simon Zaleski, Daniel Rinaldi", +"GameName":"Kaiju Save Earth", +"Developers": "Alan Youngblood", "LibraryDevelopers": "Sam Lantinga, Dave Gamble, Carl Birch, Job Vranish, David Lafreniere, Bayle Jonathan, Robin Berg Pettersen", "SpecialThanks":"Nic Allen, Brian Lhota, Rodrigo Monteiro" } diff --git a/src/ecs/TileMapComponent.h b/src/ecs/TileMapComponent.h index 86ab1b0..faf9612 100644 --- a/src/ecs/TileMapComponent.h +++ b/src/ecs/TileMapComponent.h @@ -52,14 +52,14 @@ public: if(map->getStatus() == tson::ParseStatus::OK) { tson::Tileset *tileset = map->getTileset(tsName); - std::cout << "tsName: " << tsName << std::endl; + //std::cout << "tsName: " << tsName << std::endl; std::string fullPath = tileset->getImage(); - std::cout << "fullPath: " << fullPath << std::endl; + //std::cout << "fullPath: " << fullPath << std::endl; //size_t charPos = fullPath.find("assets"); //fullPath.erase(0,charPos); std::string prependPath = std::string("assets/maps/"); std::string wholePath = prependPath + fullPath; - std::cout << "fullPath: " << wholePath << std::endl; + //std::cout << "fullPath: " << wholePath << std::endl; tson::Layer *tileLayer = map->getLayer(tileLayerName); //This is a Layer std::string texName = tileLayer->getName(); Game::assets->AddTexture(texName, wholePath.c_str()); @@ -123,12 +123,12 @@ public: int tid = myTile->getId()-1; //std::cout << myLayer->getTileData(1,1)->getId() << std::endl; // TextureManager::Draw(texture, tileSet[tid], destRects[elem], SDL_FLIP_NONE); - std::cout << "c,r: " << c << ", " << r << std::endl; + //std::cout << "c,r: " << c << ", " << r << std::endl; if(!tid){ - printf("got nullptr\n"); + //printf("got nullptr\n"); // printf("found valid tid\n"); } else { - std::cout << "tid: " << tid << std::endl; + //std::cout << "tid: " << tid << std::endl; } //std::cout << " elem: " << elem << std::endl; //std::cout << "i" << i << std::endl; @@ -136,7 +136,7 @@ public: } // tson::Tile *testTile = myLayer->getTileData(0,4); // int myTid = testTile->getId()-1; - printf("Completed tilemap init\n"); + //printf("Completed tilemap init\n"); //std::cout << "destRects.size " << destRects.size() << std::endl; } else { printf("Failed to load Tileson map\n"); @@ -167,16 +167,20 @@ public: int i = r*map->getSize().x+c; int elem = c+r*map->getSize().x; tson::Tile *myTile = myLayer->getTileData(c,r); - if(myTile){ + if(!myTile){ + // Found a nullptr, nothing to do or see here, move along + } else { int tid = myTile->getId()-1; int tileToDraw = tid; TextureManager::Draw(texture, tileSet[tileToDraw], destRects[elem], SDL_FLIP_NONE); } if (Game::debugMenu){ - // if (collisionLayer->getTileData(c,r)) { - // SDL_SetRenderDrawColor(Game::renderer,255,0,255,134); - // SDL_RenderDrawRect(Game::renderer, &destRects[elem]); - // } + if (!collisionLayer->getTileData(c,r)) { + // Nothing to see here, just returning a nullptr, move along... + } else { + SDL_SetRenderDrawColor(Game::renderer,255,0,255,134); + SDL_RenderDrawRect(Game::renderer, &destRects[elem]); + } } } } diff --git a/src/game/Game.cpp b/src/game/Game.cpp index 3266a13..fecd431 100644 --- a/src/game/Game.cpp +++ b/src/game/Game.cpp @@ -246,7 +246,7 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g // puppy.addComponent(1024*globalScale,210*globalScale,36,30,globalScale); // puppy.addComponent("puppy", SpriteComponent::spriteObject); // puppy.addGroup(groupObjects); - printf("Init Completed\n"); + //printf("Init Completed\n"); } else { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't Initialize SDL: %s", SDL_GetError()); isRunning = false;