Diff: Entity/Entity.h

Revision:

51:4d0cd75e7ed3

Parent:

37:a404860171a9

Child:

57:1c12361b6e3d

diff -r 2c5cb92a5361 -r 4d0cd75e7ed3 Entity/Entity.h
--- a/Entity/Entity.h	Thu May 09 06:33:28 2019 +0000
+++ b/Entity/Entity.h	Thu May 09 07:39:49 2019 +0000
@@ -7,7 +7,6 @@
 class Entity
 {
 protected:
-    bool moving;
     struct Hitbox {
         int width;
         int height;
@@ -47,18 +46,17 @@
     virtual void move(float, float, char * map, bool * doorways) = 0; // movement control and miscellaneous updates
     virtual void take_damage(int) = 0;
     virtual void draw(N5110 &lcd) = 0;
-    void undo_move_x(bool);
-    void undo_move_y(bool);
+    void undo_move_x(bool condition);
+    void undo_move_y(bool condition);
     void update_prev_pos();
-    bool entity_to_map_collision_test(float pos_x, float pos_y, char * map, bool * doorways);
+    bool entity_to_map_collision_test(float pos_x, float pos_y, char * two_d_map, bool * doorways);
 
     // Mutator
     void set_position(float x, float y);
-    void position_add_x(float);
-    void position_add_y(float);
+    void position_add_x(float change_x);
+    void position_add_y(float change_y);
     
     // Accessors
-    bool get_moving();
     int get_hp_drop_chance();
     int get_hitbox_width();
     int get_hitbox_height();