aboutsummaryrefslogtreecommitdiffstats
path: root/src/entities.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-09-28 08:50:24 -0400
committerClyne Sullivan <tullivan99@gmail.com>2015-09-28 08:50:24 -0400
commit7125200e83a9255b8da6745b4a457996705bf263 (patch)
tree52d51815c7112f5195326620ef81907f0147c743 /src/entities.cpp
parent82727d2d50d6a71cd5e9d5a7c00fa41888a39eb7 (diff)
parent113bb97e4ce7db5bc275e0dccf7c790c86cda5d7 (diff)
improvements ;)
Diffstat (limited to 'src/entities.cpp')
-rw-r--r--src/entities.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/entities.cpp b/src/entities.cpp
index 9808086..c341dba 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -36,7 +36,7 @@ Player::Player(){
width = HLINE * 8;
height = HLINE * 12;
speed = 1;
- type = 0;
+ type = PLAYERT;
subtype = 5;
alive = true;
ground = false;
@@ -50,7 +50,7 @@ NPC::NPC(){
width = HLINE * 8;
height = HLINE * 12;
speed = 1;
- type = 1;
+ type = NPCT;
subtype = 0;
alive = true;
canMove = true;
@@ -61,18 +61,18 @@ void NPC::interact(){
}
Structures::Structures(){
- type = -1;
+ type = STRUCTURET;
speed = 0;
alive = true;
}
-unsigned int Structures::spawn(int t, float x, float y){
+unsigned int Structures::spawn(_TYPE t, float x, float y){
loc.x = x;
loc.y = y;
type = t;
/*VILLAGE*/
- if(type == -1){
+ if(type == STRUCTURET){
loc.y=100;
width = 20 * HLINE;
height = 16 * HLINE;