diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-02-12 08:48:50 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-02-12 08:48:50 -0500 |
| commit | 51b0b214967ca4770b1674431cffa15777b0ec06 (patch) | |
| tree | 2165f359d803bbc1944f5bcc10a377b06f6676e7 /include/world.h | |
| parent | ba7df965e73e121820f20e3a0e57631d078c11db (diff) | |
| parent | 2a4a514b654ef0e08134a116c658d49a8f16cfe7 (diff) | |
mergge
Diffstat (limited to 'include/world.h')
| -rw-r--r-- | include/world.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/include/world.h b/include/world.h index 0e26ed9..48ab409 100644 --- a/include/world.h +++ b/include/world.h @@ -145,7 +145,7 @@ protected: */ Texturec *bgTex; - + /** * Defines the set of background images that should be used for this world. */ @@ -163,6 +163,8 @@ protected: */ char *bgm; + std::vector<std::string>bgFiles; + std::vector<std::string>bgFilesIndoors; public: @@ -234,7 +236,14 @@ public: * A vector of all light elements in this world. */ - std::vector<Light > light; + std::vector<Light > light; + + /** + * Vector of all building textures for the current world style + */ + + std::vector<std::string > sTexLoc; + /** * NULLifies pointers and allocates necessary memory. This should be @@ -257,7 +266,7 @@ public: * the structure. */ - void addStructure(BUILD_SUB subtype,float x,float y,const char *inside); + void addStructure(BUILD_SUB subtype,float x,float y, char* tex, const char *inside); //void addVillage(int buildingCount, int npcMin, int npcMax,const char *inside); /** @@ -343,6 +352,12 @@ public: */ void setBGM(std::string path); + + /** + * Sets the worlds style folder + */ + + void setStyle(const char* pre); /** * Plays/stops this world's BGM. If `prev` is not NULL, that world's BGM |