bricing, controls jumps and sprints

1 files changed, 8 insertions, 3 deletions

diff --git a/include/world.hpp b/include/world.hpp
index 2dd166a..5bfd9f2 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -105,6 +105,9 @@ protected:
 	// an array of all the world's ground data
 	std::vector<WorldData> worldData;
 
+	// the world's current weather
+	WorldWeather weather;
+
 	// the size of `worldData`
 	unsigned int lineCount;
 
@@ -175,7 +178,7 @@ public:
 	void detect(Player *p);
 
 	// updates entities, moving them and such
-	void update(Player *p, unsigned int delta);
+	void update(Player *p, unsigned int delta, unsigned int ticks);
 
 	// gets the world's width in TODO
 	int getTheWidth(void) const;
@@ -220,6 +223,10 @@ public:
 	// sets the folder to collect entity textures from
 	void setStyle(std::string pre);
 
+	// gets the string that represents the current weather
+	std::string getWeatherStr(void) const;
+	const WorldWeather& getWeatherId(void) const;
+
 	// 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);
@@ -332,8 +339,6 @@ public:
 	WorldSwitchInfo exitArena(Player *p);
 };
 
-std::string getWorldWeatherStr(WorldWeather ww);
-
 /**
  * Loads the player into the world created by the given XML file. If a world is
  * already loaded it will be saved before the transition is made.