diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/entities.h | 4 | ||||
| -rw-r--r-- | include/world.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/common.h b/include/common.h index 22ecb22..be32019 100644 --- a/include/common.h +++ b/include/common.h @@ -203,4 +203,6 @@ unsigned int millis(void); int getdir(const char *dir, std::vector<std::string> &files); void strVectorSortAlpha(std::vector<std::string> *v); +extern void *NULLPTR; + #endif // COMMON_H diff --git a/include/entities.h b/include/entities.h index d7ad2c0..1e6d316 100644 --- a/include/entities.h +++ b/include/entities.h @@ -198,15 +198,13 @@ public: typedef struct { EntitySavePacket esp; - World *inWorld; - World *inside; BUILD_SUB bsubtype; } __attribute__ ((packed)) StructuresSavePacket; class Structures : public Entity{ public: World *inWorld; - World *inside; + World **inside; BUILD_SUB bsubtype; Structures(); diff --git a/include/world.h b/include/world.h index ef37365..27936f7 100644 --- a/include/world.h +++ b/include/world.h @@ -176,8 +176,8 @@ public: std::vector<Particles *> particles; std::vector<Light > light; - void addStructure(BUILD_SUB sub,float x,float y,World *inside); - void addVillage(int bCount, int npcMin, int npcMax,World *inside); + void addStructure(BUILD_SUB sub,float x,float y,World **inside);//,World **outside); + 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); |