From 076c984c438bea2b34f8dd3a62bb31ebd2eb5282 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Fri, 10 Jun 2016 15:33:02 -0400 Subject: actual game making --- include/mob.hpp | 2 ++ include/world.hpp | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/mob.hpp b/include/mob.hpp index 0dd50ac..7ef4ff9 100644 --- a/include/mob.hpp +++ b/include/mob.hpp @@ -115,6 +115,8 @@ private: std::string id; bool triggered; public: + bool notext; + Trigger(void); void act(void); diff --git a/include/world.hpp b/include/world.hpp index fa8e4d8..e240973 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -27,8 +27,7 @@ enum class WorldBGType : unsigned int { * Weather is set by the world somewhere. */ enum class WorldWeather : unsigned char { - Sunny = 0, /**< Sunny/daytime */ - Dark, /**< Nighttime */ + None = 0, /**< None (sunny) */ Rain, /**< Rain */ Snowy /**< Snow */ }; @@ -265,6 +264,7 @@ protected: * @see addStructure() * @see getStructurePos() */ + std::vector build; /** * A vector of all villages in the world. @@ -291,7 +291,6 @@ protected: public: - std::vector build; /** * A vector of pointers to all entities from the other vectors. * This is used to mass-manage entities, or operate on entities @@ -349,7 +348,7 @@ public: /** * Updates entity positions, time of day, and music. */ - void update(Player *p, unsigned int delta, unsigned int ticks); + void update(Player *p, unsigned int delta); /** * Gets the width of the world, presumably in pixels. @@ -417,6 +416,9 @@ public: std::string getWeatherStr(void) const; const WorldWeather& getWeatherId(void) const; + // sets the weatherrrr + void setWeather(const std::string& w); + // sets / gets pathnames of XML files for worlds to the left and right std::string setToLeft(std::string file); std::string setToRight(std::string file); -- cgit v1.2.3