1 files changed, 94 insertions, 27 deletions

@@ -1,5 +1,6 @@
 #include "party.h"
 #include "consts.h"
+#include <iostream>
 
 void Party::addMember(Game& game, int spriteId) {
   int index = members_.size();
@@ -93,41 +94,84 @@ void Party::move(Game& game, const Input& keystate) {
 
   pLoc += (unitVecInDirection(dir) * speed);
 
-  game.moveSprite(members_[0].spriteId, pLoc);
+  // Check collision.
+  const Map& map = game.getMap();
+  bool blocked = false;
+
+  const vec2i UL_COL_BOX = { 8, 8 };
+  const vec2i DR_COL_BOX = { 4, 0 };
+  vec2i oldColPosUL = (p1.loc() - UL_COL_BOX) / map.getTileSize();
+  vec2i newColPosUL = (pLoc - UL_COL_BOX) / map.getTileSize();
+  vec2i oldColPosDR = (p1.loc() + DR_COL_BOX) / map.getTileSize();
+  vec2i newColPosDR = (pLoc + DR_COL_BOX) / map.getTileSize();
+
+  if (dirHasDir(dir, Direction::right) &&
+      newColPosDR.x() > oldColPosDR.x()) {
+    for (int y = newColPosUL.y(); y <= newColPosDR.y(); y++) {
+      if (map.isBlocked(newColPosDR.x(), y)) {
+        blocked = true;
+        pLoc.x() = p1.loc().x();//(newColPosDR * map.getTileSize() - (collisionBox / 2)).x() - 1;
+        break;
+      }
+    }
+  }
 
-  for (int i = 1; i < members_.size(); i++) {
-    const Sprite& pNext = game.getSprite(members_[i].spriteId);
-    const Movement& posdir = members_[i].movement.front();
-    game.moveSprite(members_[i].spriteId, posdir.pos);
-    game.setSpriteDirection(members_[i].spriteId, posdir.dir);
+  if (dirHasDir(dir, Direction::left) &&
+      newColPosUL.x() < oldColPosUL.x()) {
+    for (int y = newColPosUL.y(); y <= newColPosDR.y(); y++) {
+      if (map.isBlocked(newColPosUL.x(), y)) {
+        blocked = true;
+        pLoc.x() = p1.loc().x();//(newColPosDR * map.getTileSize() - (collisionBox / 2)).x() - 1;
+        break;
+      }
+    }
+  }
 
-    members_[i].movement.pop_front();
-    members_[i].movement.push_back({.pos = pLoc, .dir = dir});
+  if (dirHasDir(dir, Direction::down) &&
+      newColPosDR.y() > oldColPosDR.y()) {
+    for (int x = newColPosUL.x(); x <= newColPosDR.x(); x++) {
+      if (map.isBlocked(x, newColPosDR.y())) {
+        blocked = true;
+        pLoc.y() = p1.loc().y();//(newColPosDR * map.getTileSize() - (collisionBox / 2)).x() - 1;
+        break;
+      }
+    }
   }
-}
 
-void Party::beginCrouch(Game& game) {
-  if (state_ == State::Running) {
-    state_ = State::Normal;
+  if (dirHasDir(dir, Direction::up) &&
+      newColPosUL.y() < oldColPosUL.y()) {
+    for (int x = newColPosUL.x(); x <= newColPosDR.x(); x++) {
+      if (map.isBlocked(x, newColPosUL.y())) {
+        blocked = true;
+        pLoc.y() = p1.loc().y();//(newColPosDR * map.getTileSize() - (collisionBox / 2)).x() - 1;
+        break;
+      }
+    }
+  }
+
+  if (blocked && state_ == State::Running) {
+    stopRunning(game);
+  }
+
+  // Move everything
+  if (pLoc != p1.loc()) {
+    game.moveSprite(members_[0].spriteId, pLoc);
 
-    // Double the movement buffer for the followers.
     for (int i = 1; i < members_.size(); i++) {
-      std::deque<Movement> newMove;
-      vec2i lastPos = game.getSprite(members_[i].spriteId).loc();
-
-      while (!members_[i].movement.empty()) {
-        Movement m1 = members_[i].movement.front();
-        Movement m2 = m1;
-        m1.pos = (m1.pos + lastPos) / 2;
-        lastPos = m2.pos;
-
-        newMove.push_back(m1);
-        newMove.push_back(m2);
-        members_[i].movement.pop_front();
-      }
+      const Sprite& pNext = game.getSprite(members_[i].spriteId);
+      const Movement& posdir = members_[i].movement.front();
+      game.moveSprite(members_[i].spriteId, posdir.pos);
+      game.setSpriteDirection(members_[i].spriteId, posdir.dir);
 
-      members_[i].movement = std::move(newMove);
+      members_[i].movement.pop_front();
+      members_[i].movement.push_back({.pos = pLoc, .dir = dir});
     }
+  }
+}
+
+void Party::beginCrouch(Game& game) {
+  if (state_ == State::Running) {
+    stopRunning(game);
   } else {
     state_ = State::Crouching;
 
@@ -159,3 +203,26 @@ void Party::endCrouch(Game& game) {
     }
   }
 }
+
+void Party::stopRunning(Game& game) {
+  state_ = State::Normal;
+
+  // Double the movement buffer for the followers.
+  for (int i = 1; i < members_.size(); i++) {
+    std::deque<Movement> newMove;
+    vec2i lastPos = game.getSprite(members_[i].spriteId).loc();
+
+    while (!members_[i].movement.empty()) {
+      Movement m1 = members_[i].movement.front();
+      Movement m2 = m1;
+      m1.pos = (m1.pos + lastPos) / 2;
+      lastPos = m2.pos;
+
+      newMove.push_back(m1);
+      newMove.push_back(m2);
+      members_[i].movement.pop_front();
+    }
+
+    members_[i].movement = std::move(newMove);
+  }
+}