diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-30 21:08:39 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-30 21:08:39 -0400 |
| commit | d9796041ca5876f88280ccb54560653e65e8da8a (patch) | |
| tree | 81ad290bffe543ef39bc5bba741d9c322e8ce593 /include/world.hpp | |
| parent | bf3a781ab8ea7c00bf18c960bcb23e72da99bc7b (diff) | |
added TextureIterator
Diffstat (limited to 'include/world.hpp')
| -rw-r--r-- | include/world.hpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/world.hpp b/include/world.hpp index daf8ae4..0aea879 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -66,16 +66,18 @@ extern int worldShade; extern std::string currentXML; // defines how many game ticks it takes for a day to elapse -extern const unsigned int DAY_CYCLE; +constexpr const unsigned int DAY_CYCLE = 12000; // velocity of player when moved by user -extern const float PLAYER_SPEED_CONSTANT; +constexpr const float PLAYER_SPEED_CONSTANT = 0.15f; // maximum pull of gravity in one game tick -extern const float GRAVITY_CONSTANT; +constexpr const float GRAVITY_CONSTANT = 0.001f; // height of the floor in an indoor world -extern const unsigned int INDOOR_FLOOR_HEIGHT; +constexpr const unsigned int INDOOR_FLOOR_THICKNESS = 50; +constexpr const unsigned int INDOOR_FLOOR_HEIGHTT = 400; +constexpr const unsigned int INDOOR_FLOOR_HEIGHT = (INDOOR_FLOOR_HEIGHTT + INDOOR_FLOOR_THICKNESS); /* ---------------------------------------------------------------------------- ** Classes / function prototypes section @@ -110,7 +112,7 @@ protected: int worldStart; // holds / handles textures for background elements - Texturec *bgTex; + TextureIterator bgTex; // defines what type of background is being used WorldBGType bgType; |