Diff: Entity/Player/Player.h

Revision:

32:fe6359ef9916

Parent:

30:ec915d24d3e9

Child:

33:4f3948dcd2f7

--- a/Entity/Player/Player.h	Sun May 05 18:37:23 2019 +0000
+++ b/Entity/Player/Player.h	Mon May 06 08:56:48 2019 +0000
@@ -2,7 +2,6 @@
 #define PLAYER_H
 #include "Entity.h"
 #include "Bullets.h"
-#include "N5110.h"
 
 const int bullets_max = 20;
 
@@ -18,9 +17,12 @@
     int invulnerability_counter;
     
     // Private Functions
+    void move_player(float mapped_x, float mapped_y, int * map, bool * doorways);
     void move_bullets();
-    void move_player(float mapped_x, float mapped_y, int * map, bool * doorways);
     void increment_frames(float mapped_x, float mapped_y);
+    int * get_frame();
+    void draw_player(N5110 &lcd);
+    void draw_bullets(N5110 &lcd);
     
 public:
     // Constructors
@@ -30,7 +32,6 @@
 
     // Accessors
     int get_bullet_speed();
-    
     int get_hearts_width();
     int get_hearts_height();
     int * get_hearts_sprite();
@@ -38,11 +39,8 @@
     // Functions
     virtual void move(float, float, int * map, bool * doorways);
     virtual void take_damage(int damage);
-    virtual int * get_frame();
+    virtual void draw(N5110 &lcd);
     bool update_bullets(int * map, bool * doorways);
-    void draw(N5110 &lcd);
-    void draw_player(N5110 &lcd);
-    void draw_bullets(N5110 &lcd);
     void delete_bullets();
     void buttons(bool button_A, bool button_B, bool button_Y, bool button_X);