Diff: Entity/Entity.h

Revision:

23:5a8f75e93508

Parent:

22:7abf4581bc9b

Child:

24:26369d92a06a

diff -r 7abf4581bc9b -r 5a8f75e93508 Entity/Entity.h
--- a/Entity/Entity.h	Thu Apr 25 05:53:30 2019 +0000
+++ b/Entity/Entity.h	Thu Apr 25 23:15:44 2019 +0000
@@ -36,6 +36,7 @@
     };
     FrameCount frame;
     int hp;
+    int attack;
     int face;
     float velocity;
 
@@ -43,11 +44,11 @@
     // Function
     virtual void move(float, float) = 0; // movement control and miscellaneous updates
     virtual int * get_frame() = 0;
+    virtual void take_damage(int) = 0;
     bool matrix_collision_test(float, float, int);
     void undo_move_x(bool);
     void undo_move_y(bool);
     void update_prev_pos();
-    void take_damage(int);
     bool death_check();
 
     // Mutator
@@ -65,6 +66,8 @@
     int get_pos_y();
     int get_prev_pos_x();
     int get_prev_pos_y();
+    int get_attack();
+    int get_hp();
 
 };