diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-04 08:48:27 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-04 08:48:27 -0500 |
| commit | 65addfa212a2aef2f2d6de3cb49edc99a8f02f59 (patch) | |
| tree | e47017d9f57b8447ce138fe059bdd7f5e559dacd /include | |
| parent | 272a152b54a198a84f122ab8bedb1019708b7008 (diff) | |
save/load tests
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui.h | 2 | ||||
| -rw-r--r-- | include/world.h | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/ui.h b/include/ui.h index 6a81dab..b769bbf 100644 --- a/include/ui.h +++ b/include/ui.h @@ -33,6 +33,8 @@ namespace ui { extern unsigned char dialogOptChosen; extern bool dialogImportant; + extern unsigned int textWrapLimit; + /* * Initializes the FreeType system. */ diff --git a/include/world.h b/include/world.h index 98ca54a..cdcea3c 100644 --- a/include/world.h +++ b/include/world.h @@ -8,6 +8,9 @@ #ifndef WORLD_H #define WORLD_H +#include <ostream> +#include <istream> + #include <common.h> #include <entities.h> @@ -128,6 +131,7 @@ protected: */ Texturec *bgTex; + WORLD_BG_TYPE bgType; /** * The Mix_Music object that holds the background soundtrack for the world. @@ -167,7 +171,7 @@ public: std::vector<Particles *> particles; void addStructure(_TYPE t,BUILD_SUB sub,float x,float y,World *inside); - void addVillage(int bCount, int npcMin, int npcMax,_TYPE t,float x,float y,World *outside); + void addVillage(int bCount, int npcMin, int npcMax,_TYPE t,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); @@ -262,8 +266,8 @@ public: int getTheWidth(void); - void save(FILE *); - void load(FILE *); + void save(std::ofstream *); + void load(std::ifstream *); }; /* |