Fixed bug that would prevent player from continuing to move after dying, and also refactored collisions and dying a bit

5 files changed, 62 insertions, 53 deletions

@@ -157,6 +157,11 @@ void PlayerSpriteComponent::render(Game&, Entity& entity, Texture& buffer)
 
 void PlayerSpriteComponent::receive(Game&, Entity&, const Message& msg)
 {
+  if (msg.type == Message::Type::stopDying)
+  {
+    dying = false;
+  }
+  
   if (dying)
   {
     return;
@@ -216,7 +221,10 @@ void PlayerPhysicsComponent::receive(Game&, Entity& entity, const Message& msg)
     velocity.second = 0.0;
   } else if (msg.type == Message::Type::jump)
   {
-    playSound("../res/Randomize87.wav", 0.25);
+    if (!frozen)
+    {
+      playSound("../res/Randomize87.wav", 0.25);
+    }
     
     velocity.second = jump_velocity;
     accel.second = jump_gravity;
@@ -241,6 +249,9 @@ void PlayerPhysicsComponent::receive(Game&, Entity& entity, const Message& msg)
   } else if (msg.type == Message::Type::die)
   {
     frozen = true;
+  } else if (msg.type == Message::Type::stopDying)
+  {
+    frozen = false;
   }
 }
 
@@ -331,8 +342,8 @@ void MapRenderComponent::render(Game&, Entity&, Texture& buffer)
 
 MapCollisionComponent::MapCollisionComponent(const Map& map) : map(map)
 {
-  addCollision(-6, 0, GAME_WIDTH, Direction::left, (map.getLeftMap() == nullptr) ? 1 : 2);
-  addCollision(GAME_WIDTH+6, 0, GAME_WIDTH, Direction::right, (map.getRightMap() == nullptr) ? 3 : 2);
+  addCollision(-6, 0, GAME_WIDTH, Direction::left, (map.getLeftMap() == nullptr) ? Collision::Type::wrap : Collision::Type::teleport);
+  addCollision(GAME_WIDTH+6, 0, GAME_WIDTH, Direction::right, (map.getRightMap() == nullptr) ? Collision::Type::reverse : Collision::Type::teleport);
   
   for (int i=0; i<MAP_WIDTH*(MAP_HEIGHT-1); i++)
   {
@@ -342,21 +353,21 @@ MapCollisionComponent::MapCollisionComponent(const Map& map) : map(map)
     
     if ((tile > 0) && (tile < 28) && (!((tile >= 5) && (tile <= 7))))
     {
-      addCollision(x*TILE_WIDTH, y*TILE_HEIGHT, (y+1)*TILE_HEIGHT, Direction::right, 0);
-      addCollision((x+1)*TILE_WIDTH, y*TILE_HEIGHT, (y+1)*TILE_HEIGHT, Direction::left, 0);
-      addCollision(y*TILE_HEIGHT, x*TILE_WIDTH, (x+1)*TILE_WIDTH, Direction::down, 0);
-      addCollision((y+1)*TILE_HEIGHT, x*TILE_WIDTH, (x+1)*TILE_WIDTH, Direction::up, 0);
+      addCollision(x*TILE_WIDTH, y*TILE_HEIGHT, (y+1)*TILE_HEIGHT, Direction::right, Collision::Type::wall);
+      addCollision((x+1)*TILE_WIDTH, y*TILE_HEIGHT, (y+1)*TILE_HEIGHT, Direction::left, Collision::Type::wall);
+      addCollision(y*TILE_HEIGHT, x*TILE_WIDTH, (x+1)*TILE_WIDTH, Direction::down, Collision::Type::wall);
+      addCollision((y+1)*TILE_HEIGHT, x*TILE_WIDTH, (x+1)*TILE_WIDTH, Direction::up, Collision::Type::wall);
     } else if ((tile >= 5) && (tile <= 7))
     {
-      addCollision(y*TILE_HEIGHT, x*TILE_WIDTH, (x+1)*TILE_WIDTH, Direction::down, 4);
+      addCollision(y*TILE_HEIGHT, x*TILE_WIDTH, (x+1)*TILE_WIDTH, Direction::down, Collision::Type::platform);
     } else if (tile == 42)
     {
-      addCollision(y*TILE_HEIGHT, x*TILE_WIDTH, (x+1)*TILE_WIDTH, Direction::down, 5);
+      addCollision(y*TILE_HEIGHT, x*TILE_WIDTH, (x+1)*TILE_WIDTH, Direction::down, Collision::Type::danger);
     }
   }
 }
 
-void MapCollisionComponent::addCollision(int axis, int lower, int upper, Direction dir, int type)
+void MapCollisionComponent::addCollision(int axis, int lower, int upper, Direction dir, Collision::Type type)
 {
   std::list<Collision>::iterator it;
   
@@ -498,7 +509,7 @@ void MapCollisionComponent::detectCollision(Game& game, Entity&, Entity& collide
 
 bool MapCollisionComponent::processCollision(Game& game, Entity& collider, Collision collision, Direction dir)
 {
-  if (collision.type == 0)
+  if (collision.type == Collision::Type::wall)
   {
     if (dir == Direction::left)
     {
@@ -525,7 +536,7 @@ bool MapCollisionComponent::processCollision(Game& game, Entity& collider, Colli
       Message msg(Message::Type::stopMovingVertically);
       collider.send(game, msg);
     }
-  } else if (collision.type == 1)
+  } else if (collision.type == Collision::Type::wrap)
   {
     if (dir == Direction::left)
     {
@@ -540,7 +551,7 @@ bool MapCollisionComponent::processCollision(Game& game, Entity& collider, Colli
     {
       collider.position.second = -collider.size.second/2;
     }
-  } else if (collision.type == 2)
+  } else if (collision.type == Collision::Type::teleport)
   {
     if (dir == Direction::left)
     {
@@ -553,7 +564,7 @@ bool MapCollisionComponent::processCollision(Game& game, Entity& collider, Colli
     }
     
     return true;
-  } else if (collision.type == 3)
+  } else if (collision.type == Collision::Type::reverse)
   {
     if (dir == Direction::right)
     {
@@ -562,22 +573,15 @@ bool MapCollisionComponent::processCollision(Game& game, Entity& collider, Colli
       Message msg(Message::Type::walkLeft);
       collider.send(game, msg);
     }
-  } else if (collision.type == 4)
+  } else if (collision.type == Collision::Type::platform)
   {
     Message msg(Message::Type::drop);
     msg.dropAxis = collision.axis;
 
     collider.send(game, msg);
-  } else if (collision.type == 5)
+  } else if (collision.type == Collision::Type::danger)
   {
-    Message msg(Message::Type::die);
-    collider.send(game, msg);
-    
-    playSound("../res/Hit_Hurt5.wav", 0.25);
-    
-    game.schedule(FRAMES_PER_SECOND * 0.75, [&] () {
-      game.loadGame(map);
-    });
+    game.playerDie(collider, map);
   }
   
   return false;
@@ -77,13 +77,22 @@ class MapCollisionComponent : public Component {
     };
 
     struct Collision {
+      enum class Type {
+        wall,
+        wrap,
+        teleport,
+        reverse,
+        platform,
+        danger
+      };
+      
       int axis;
       int lower;
       int upper;
-      int type;
+      Type type;
     };
     
-    void addCollision(int axis, int lower, int upper, Direction dir, int type);
+    void addCollision(int axis, int lower, int upper, Direction dir, Collision::Type type);
     bool processCollision(Game& game, Entity& collider, Collision collision, Direction dir);
     
     std::list<Collision> left_collisions;
@@ -22,7 +22,8 @@ class Message {
       drop,
       canDrop,
       cantDrop,
-      die
+      die,
+      stopDying
     };
     
     Message(Type type) : type(type) {}
@@ -1,6 +1,7 @@
 #include "game.h"
 #include "renderer.h"
 #include "components.h"
+#include "muxer.h"
 
 Game::Game()
 { 
@@ -132,33 +133,27 @@ void Game::saveGame(const Map& map, std::pair<double, double> position)
   save = {&map, position};
 }
 
-void Game::loadGame(const Map& curMap)
+void Game::schedule(int frames, std::function<void ()>&& callback)
 {
-  if (&curMap == save.map)
-  {
-    entities.remove(player);
-  }
-  
-  player = std::make_shared<Entity>();
-  player->position = save.position;
-  player->size = std::make_pair(10.0,12.0);
-  
-  auto player_input = std::make_shared<UserMovementComponent>();
-  player->addComponent(player_input);
-  
-  auto player_physics = std::make_shared<PlayerPhysicsComponent>();
-  player->addComponent(player_physics);
-  
-  auto player_anim = std::make_shared<PlayerSpriteComponent>();
-  player->addComponent(player_anim);
-  
-  if (&curMap != save.map)
-  {
-    loadMap(*(save.map));
-  }
+  scheduled.emplace_front(frames, callback);
 }
 
-void Game::schedule(int frames, std::function<void ()>&& callback)
+void Game::playerDie(Entity& player, const Map& curMap)
 {
-  scheduled.emplace_front(frames, callback);
+  Message msg(Message::Type::die);
+  player.send(*this, msg);
+  
+  playSound("../res/Hit_Hurt5.wav", 0.25);
+  
+  schedule(FRAMES_PER_SECOND * 0.75, [&] () {
+    if (&curMap != save.map)
+    {
+      loadMap(*(save.map));
+    }
+    
+    player.position = save.position;
+    
+    Message msg2(Message::Type::stopDying);
+    player.send(*this, msg2);
+  });
 }
@@ -30,8 +30,8 @@ class Game {
     void loadMap(const Map& map);
     void detectCollision(Entity& collider, std::pair<double, double> old_position);
     void saveGame(const Map& map, std::pair<double, double> position);
-    void loadGame(const Map& curMap);
     void schedule(int frames, std::function<void ()>&& callback);
+    void playerDie(Entity& player, const Map& curMap);
     
   private:
     friend void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods);