diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.hpp | 4 | ||||
| -rw-r--r-- | include/config.hpp | 14 | ||||
| -rw-r--r-- | include/inventory.hpp | 2 | ||||
| -rw-r--r-- | include/world.hpp | 13 |
4 files changed, 22 insertions, 11 deletions
diff --git a/include/common.hpp b/include/common.hpp index d69fc91..5159c88 100644 --- a/include/common.hpp +++ b/include/common.hpp @@ -40,7 +40,6 @@ typedef unsigned int uint; */ #define SHADERS -#define C(x) std::cout << x << std::endl template<typename N> N abso(N v){ @@ -118,7 +117,7 @@ typedef col Color; * Define the game's name (displayed in the window title). */ -#define GAME_NAME "Independent Study v.0.6 alpha - NOW WITH more c++" +#define GAME_NAME "Independent Study v0.7 alpha - NOW WITH lights and snow and stuff" /** * The desired width of the game window. @@ -177,6 +176,7 @@ extern float VOLUME_SFX; */ #define DEBUG_printf( message, ...) DEBUG_prints(__FILE__, __LINE__, message, __VA_ARGS__ ) +#define C(x) std::cout << x << std::endl; /** * Defines pi for calculations that need it. diff --git a/include/config.hpp b/include/config.hpp index 4d56d9c..d003c66 100644 --- a/include/config.hpp +++ b/include/config.hpp @@ -2,13 +2,17 @@ #define CONFIG_H #include <iostream> + #include <SDL2/SDL_mixer.h> -#include <tinyxml2.h> -void readConfig(void); +#include <tinyxml2.h> +#include <ui.hpp> -void updateConfig(void); -void saveConfig(); +namespace config { + void read( void ); + void update( void ); + void save( void ); +} -#endif //CONFIG_H
\ No newline at end of file +#endif //CONFIG_H diff --git a/include/inventory.hpp b/include/inventory.hpp index cbce9d9..5336cee 100644 --- a/include/inventory.hpp +++ b/include/inventory.hpp @@ -4,7 +4,7 @@ #include <common.hpp> #include <string.h> -#include <Texture.hpp> +#include <texture.hpp> #define DEBUG diff --git a/include/world.hpp b/include/world.hpp index c7b0a65..d086687 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -165,7 +165,7 @@ protected: * World::detect(), which is why it is declared private. */ - void singleDetect( Entity *e ); + virtual void singleDetect( Entity *e ); /** * Empties all entity vectors. @@ -386,7 +386,7 @@ public: * half-width to positive half-width. */ - virtual void generate(unsigned int width); + void generate(unsigned int width); /** * Sets the background theme, collecting the required textures into a @@ -482,11 +482,18 @@ public: */ class IndoorWorld : public World { +private: + + std::vector<std::vector<float>> floor; + + void singleDetect( Entity *e ); + public: IndoorWorld(void); ~IndoorWorld(void); - void generate(unsigned int width); // Generates a flat world of width 'width' + void addFloor( unsigned int width ); + void draw(Player *p); // Draws the world (ignores layers) }; |