diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/entities.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/entities.h b/include/entities.h index 537ed49..fc2f35c 100644 --- a/include/entities.h +++ b/include/entities.h @@ -20,6 +20,9 @@ public: float width; //width and height of the player float height; float speed; //speed of the play + + int health; + int maxHealth; int subtype; _TYPE type; @@ -94,5 +97,10 @@ ENTITY TYPES |->1 Merchant | 2 MOBS +<<<<<<< HEAD +|->1 Rabbit +**/ +======= |->1 Skirl **/ +>>>>>>> 58716d5e4f20eb5a30025c88fe5119a0e40c4187 |