aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/entities.h15
-rw-r--r--include/world.h4
2 files changed, 10 insertions, 9 deletions
diff --git a/include/entities.h b/include/entities.h
index f26863e..d7ad2c0 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -37,12 +37,13 @@ enum MOB_SUB {
};
enum BUILD_SUB{
- TOWN_HALL = 1,
- HOUSE,
- HOUSE2,
- HOUSE3,
- HOUSE4,
- FOUNTAIN
+ TOWN_HALL = 0,
+ HOUSE = 1,
+ HOUSE2 = 2,
+ HOUSE3 = 3,
+ HOUSE4 = 4,
+ FOUNTAIN = 5,
+ LAMP_POST = 6
};
typedef struct {
@@ -211,7 +212,7 @@ public:
Structures();
~Structures();
- unsigned int spawn(_TYPE, BUILD_SUB, float, float, World *);
+ unsigned int spawn(BUILD_SUB, float, float, World *);
char *save(void);
void load(char *s);
diff --git a/include/world.h b/include/world.h
index 0e85462..7eb8c02 100644
--- a/include/world.h
+++ b/include/world.h
@@ -176,8 +176,8 @@ public:
std::vector<Particles *> particles;
std::vector<Light > light;
- void addStructure(_TYPE t,BUILD_SUB sub,float x,float y,World *inside);
- void addVillage(int bCount, int npcMin, int npcMax,_TYPE t,World *inside);
+ void addStructure(BUILD_SUB sub,float x,float y,World *inside);
+ void addVillage(int bCount, int npcMin, int npcMax,World *inside);
void addMob(int t,float x,float y);
void addMob(int t,float x,float y,void (*hey)(Mob *));
void addNPC(float x,float y);