diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-10-13 08:51:49 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-10-13 08:51:49 -0400 |
| commit | 5adabb82443b9b10b25cdd8b4db3cfe890e36fa1 (patch) | |
| tree | 698e88e97b0fd0c526bec844f345e9aa4ef24321 /include/entities.h | |
| parent | 3d375c17982f9f459c82364117687d145540fe75 (diff) | |
| parent | 58716d5e4f20eb5a30025c88fe5119a0e40c4187 (diff) | |
Added rabbit, and player health
Diffstat (limited to 'include/entities.h')
| -rw-r--r-- | include/entities.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/entities.h b/include/entities.h index 2a9a62b..fc2f35c 100644 --- a/include/entities.h +++ b/include/entities.h @@ -54,7 +54,7 @@ public: private: }; -class Player : public Entity{ +class Player : public Entity { public: QuestHandler qh; Player(); @@ -97,5 +97,10 @@ ENTITY TYPES |->1 Merchant | 2 MOBS +<<<<<<< HEAD |->1 Rabbit -**/
\ No newline at end of file +**/ +======= +|->1 Skirl +**/ +>>>>>>> 58716d5e4f20eb5a30025c88fe5119a0e40c4187 |