From a7bbe5cc18fe5b24f5d97d4acce164998d8d5517 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Mon, 4 Apr 2016 14:54:21 -0400 Subject: physics, removed extra couts --- include/world.hpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'include/world.hpp') diff --git a/include/world.hpp b/include/world.hpp index d086687..40e4a38 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -17,12 +17,16 @@ #define GROUND_HILLINESS 10 +#define PLAYER_SPEED_CONSTANT 0.15f + /** * Defines how many game ticks it takes for a day to elapse. */ #define DAY_CYCLE 12000 +#define Indoorp(x) ((IndoorWorld *)x) + /** * The background type enum. * This enum contains all different possibilities for world backgrounds; used @@ -485,6 +489,7 @@ class IndoorWorld : public World { private: std::vector> floor; + std::vector fstart; void singleDetect( Entity *e ); @@ -493,6 +498,11 @@ public: ~IndoorWorld(void); void addFloor( unsigned int width ); + void addFloor( unsigned int width, unsigned int start ); + bool moveToFloor( Entity *e, unsigned int _floor ); + + bool isFloorAbove( Entity *e ); + bool isFloorBelow( Entity *e ); void draw(Player *p); // Draws the world (ignores layers) }; @@ -537,6 +547,9 @@ public: World *exitArena( Player *p ); }; +bool isCurrentWorldIndoors( void ); +float getIndoorWorldFloorHeight( void ); + std::string getWorldWeatherStr( WorldWeather ww ); /** -- cgit v1.2.3