finished t3

gustavo-tomas · Jun 30, 2022 · 516d57f · 516d57f
1 parent c76c559
commit 516d57f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/header/TileMap.h b/header/TileMap.h
@@ -16,6 +16,7 @@ class TileMap : public Component {
         bool Is(const char* type);
         void Render();
         void RenderLayer(int layer, int cameraX = 0, int cameraY = 0);
+        ~TileMap();
         int GetWidth();
         int GetHeight();
         int GetDepth();

diff --git a/src/Face.cpp b/src/Face.cpp
@@ -18,7 +18,7 @@ void Face::Damage(int damage)
     cout << "HP is " << hitpoints << endl;
 }
 
-// @TODO: como face e uma classe temporaria, o request delete foi
+// Como face e uma classe temporaria, o request delete foi
 // movido de damage para update para melhorar o funcionamento do jogo.
 void Face::Update(float dt)
 {

diff --git a/src/Resources.cpp b/src/Resources.cpp
@@ -21,8 +21,7 @@ SDL_Texture* Resources::GetImage(const char* file)
 
     else
     {
-        imageTable.insert(make_pair(file, texture));
-        // imageTable[file] = texture; // @TODO: possible solution?
+        imageTable[file] = texture;
         cout << "\nTexture " << file << " loaded successfully!" << endl;
         return imageTable[file];
     }
@@ -44,7 +43,7 @@ Mix_Music* Resources::GetMusic(const char* file)
 
     else
     {
-        musicTable.insert(make_pair(file, music));
+        musicTable[file] = music;
         cout << "\nMusic " << file << " loaded successfully!" << endl;
         return musicTable[file];
     }
@@ -66,7 +65,7 @@ Mix_Chunk* Resources::GetSound(const char* file)
 
     else
     {
-        soundTable.insert(make_pair(file, chunk));
+        soundTable[file] = chunk;
         cout << "\nSound " << file << " loaded successfully!" << endl;
         return soundTable[file];
     }

diff --git a/src/State.cpp b/src/State.cpp
@@ -11,7 +11,7 @@ State::State() :
 {
     // Tileset & Tilemap
     GameObject* tileGo = new GameObject();
-    TileSet* tileSet = new TileSet(64, 64, "./assets/image/tileset.png"); // @TODO: delete tileset when finished
+    TileSet* tileSet = new TileSet(64, 64, "./assets/image/tileset.png");
     TileMap* tileMap = new TileMap(*tileGo, "./assets/map/tileMap.txt", tileSet);
 
     tileGo->box.x = 0;

diff --git a/src/TileMap.cpp b/src/TileMap.cpp
@@ -64,13 +64,11 @@ void TileMap::SetTileSet(TileSet* tileSet)
 
 int& TileMap::At(int x, int y, int z)
 {
-    // @TODO: check
     // Index = (W * H * Z) + (W * Y) + X
     unsigned index = x + (mapWidth * y) + (mapWidth * mapHeight * z);
     return tileMatrix[index];
 }
 
-// @TODO: check
 void TileMap::RenderLayer(int layer, int cameraX, int cameraY)
 {
     unsigned startPos = mapWidth * mapHeight * layer;
@@ -91,8 +89,6 @@ void TileMap::RenderLayer(int layer, int cameraX, int cameraY)
     }
 }
 
-// @TODO: why use the box?
-// RenderLayer(i, associated.box.x, associated.box.y);
 void TileMap::Render()
 {
     for (auto i = 0; i < mapDepth; i++)
@@ -110,6 +106,13 @@ bool TileMap::Is(const char* type)
     return (str_type == "TileMap");
 }
 
+// @TODO: needs to be changed when using multiple tilemaps for the same tileset!
+TileMap::~TileMap()
+{
+    delete tileSet;
+    cout << "TileSet deleted successfully!" << endl;
+}
+
 int TileMap::GetWidth()
 {
     return mapWidth;