Fixing map and collisions.

hecrj · Nov 2, 2014 · 14443f9 · 14443f9
1 parent e5bc476
commit 14443f9
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 73 deletions.
diff --git a/res/level/overworld.tmx b/res/level/overworld.tmx
diff --git a/src/entity/mob.cpp b/src/entity/mob.cpp
@@ -117,7 +117,7 @@ void Mob::MeleeAttack(Hitbox* hitbox) {
     level_->DynamicCollidablesFor(hitbox, candidates);
 
     for(Rectangle* candidate : candidates) {
-        if(candidate->CanCollideWith(this) && hitbox->CollidesWith(candidate)) {
+        if(candidate->CanCollideWith(this) and candidate->CanReceiveDamageFrom(this) and hitbox->CollidesWith(candidate)) {
             if(candidate->IsEntity() && ((Entity*) candidate)->IsVulnerable()) {
                 Collision c = hitbox->CollisionType(candidate);
 
@@ -308,3 +308,7 @@ sf::SoundBuffer* Mob::attack_sound() const {
 float Mob::speed() const {
     return speed_;
 }
+
+bool Mob::CanCollideWith(Rectangle* rectangle) const {
+    return not rectangle->IsEntity() or ((Entity*)rectangle)->type() != type_;
+}
diff --git a/src/entity/mob.hpp b/src/entity/mob.hpp
@@ -27,6 +27,7 @@ class Mob : public Entity {
     Entity* SeekEnemy() const ;
     Path* FindPath(Entity* to);
     bool FollowPath(Path* path, double delta);
+    bool CanCollideWith(Rectangle* rectangle) const;
     float speed() const;
 
     sf::SoundBuffer* attack_sound() const;

diff --git a/src/entity/object/plant.cpp b/src/entity/object/plant.cpp
@@ -15,3 +15,7 @@ Plant::Plant(Sprite* sprite, float x, float y) :
     type_ = PLANT;
     die_sound_ = CUT_SOUND;
 }
+
+bool Plant::CanReceiveDamageFrom(Rectangle const* rectangle) const {
+    return rectangle->IsEntity() and ((Entity*) rectangle)->type() == PLAYER;
+}
diff --git a/src/entity/object/plant.hpp b/src/entity/object/plant.hpp
@@ -10,4 +10,6 @@ class Plant : public Object {
     static void Load();
 
     Plant(Sprite* sprite, float x, float y);
+
+    bool CanReceiveDamageFrom(Rectangle const * rectangle) const;
 };
diff --git a/src/math/rectangle.cpp b/src/math/rectangle.cpp
@@ -112,3 +112,7 @@ void Rectangle::Update(double delta) {
 float Rectangle::Distance(const Rectangle* rectangle) const {
     return center().dist(rectangle->center());
 }
+
+bool Rectangle::CanReceiveDamageFrom(Rectangle const* rectangle) const {
+    return true;
+}
diff --git a/src/math/rectangle.hpp b/src/math/rectangle.hpp
@@ -23,6 +23,7 @@ class Rectangle : public Drawable {
 
     virtual bool CanCollideWith(Rectangle* rectangle) const;
     virtual bool CollidesWith(Rectangle const * rectangle) const;
+    virtual bool CanReceiveDamageFrom(Rectangle const * rectangle) const;
     virtual bool HandleCollisionWith(Mob* mob);
     virtual Collision CollisionType(Rectangle* rectangle) const;