1 files changed, 27 insertions, 4 deletions

@@ -72,7 +72,7 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
     enclosureZone = &map.getZone(sprite.enclosureZone);
   }
 
-  if (dirHasDir(sprite.dir, Direction::right)) {
+  if (dirHasDir(dir, Direction::right)) {
     if (newTileDR.x() > oldTileDR.x() &&
         newColDR.x() < mapBounds.w()) {
       for (int y = newTileUL.y(); y <= newTileDR.y(); y++) {
@@ -113,7 +113,7 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
     }
   }
 
-  if (dirHasDir(sprite.dir, Direction::left)) {
+  if (dirHasDir(dir, Direction::left)) {
     if (newTileUL.x() < oldTileUL.x() &&
         newColUL.x() >= 0) {
       for (int y = newTileUL.y(); y <= newTileDR.y(); y++) {
@@ -154,7 +154,7 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
     }
   }
 
-  if (dirHasDir(sprite.dir, Direction::down)) {
+  if (dirHasDir(dir, Direction::down)) {
     if (newTileDR.y() > oldTileDR.y() &&
         newColDR.y() < mapBounds.h()) {
       for (int x = newTileUL.x(); x <= newTileDR.x(); x++) {
@@ -195,7 +195,7 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
     }
   }
 
-  if (dirHasDir(sprite.dir, Direction::up)) {
+  if (dirHasDir(dir, Direction::up)) {
     if (newTileUL.y() < oldTileUL.y() &&
         newColUL.y() >= 0) {
       for (int x = newTileUL.x(); x <= newTileDR.x(); x++) {
@@ -239,6 +239,29 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
   return result;
 }
 
+CharacterMedium TransformSystem::getMediumAtPosition(int spriteId, vec2i newLoc) {
+  Sprite& sprite = game_.getSprite(spriteId);
+
+  const Map& map = game_.getMap();
+
+  vec2i newColUL = newLoc + sprite.collisionOffset;
+  vec2i newColDR = newColUL + sprite.collisionSize;
+  vec2i newTileUL = newColUL / map.getTileSize();
+  vec2i newTileDR = newColDR / map.getTileSize();
+
+  CharacterMedium result = CharacterMedium::Normal;
+  for (int y=newTileUL.y(); y<=newTileDR.y(); y++) {
+    for (int x=newTileUL.x(); x<=newTileDR.x(); x++) {
+      CharacterMedium tileMedium = map.getMedium(x, y);
+      if (tileMedium > result) {
+        result = tileMedium;
+      }
+    }
+  }
+
+  return result;
+}
+
 void TransformSystem::addCollidable(int spriteId) {
   Sprite& sprite = game_.getSprite(spriteId);