bricing, controls jumps and sprints

4 files changed, 22 insertions, 41 deletions

diff --git a/include/brice.hpp b/include/brice.hpp
index 60fcec8..5f82fec 100644
--- a/include/brice.hpp
+++ b/include/brice.hpp
@@ -1,48 +1,20 @@
 #ifndef BRICE_H_
 #define BRICE_H_
 
-#include <unordered_map>
 #include <string>
-#include <istream>
-#include <fstream>
 
-#include <common.hpp>
+namespace game {
+	extern bool canJump;
+	extern bool canSprint;
 
-class Brice {
-private:
-	std::unordered_map<std::string, std::string> ice;
-public:
-	Brice(void){}
-	~Brice(void){}
+	std::string getValue(const std::string& id);
+	
+	bool setValue(const std::string& id, const std::string& value);
 
-	std::string getValue(const std::string& id) const {
-		auto item = ice.find(id);
-		return (item == std::end(ice)) ? "" : item->second;
-	}
+	void briceSave(void);
+	void briceLoad(void);
 
-	void addValue(const std::string &id, const std::string& value) {
-		ice.emplace(std::make_pair(id, value));
-	}
-
-	void save(void) const {
-		std::ofstream out ("brice.dat", std::ios::out | std::ios::binary);
-		std::string data = std::to_string(ice.size()) + '\n';
-
-		if (!out.is_open())
-			UserError("Cannot open brice data file");
-
-		for (const auto& i : ice) {
-			data.append(i.first  + ',' );
-			data.append(i.second + '\n');
-		}
-
-		out.write(data.data(), data.size());
-		out.close();
-	}
-
-	void load(void) {
-		const std::string data = readFile("brice.dat");
-	}
-};
+	void briceUpdate(void);
+}
 
 #endif // BRICE_H_
diff --git a/include/common.hpp b/include/common.hpp
index b9e0e71..92318d9 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -138,6 +138,9 @@ extern vec2 offset;
 // the shader program created in main.cpp
 extern GLuint shaderProgram;
 
+// splits a string into tokens
+std::vector<std::string> StringTokenizer(const std::string& str, char delim);
+
 /**
  *	Prints a formatted debug message to the console, along with the callee's file and line
  *	number.
diff --git a/include/mob.hpp b/include/mob.hpp
index adaecb4..00cd396 100644
--- a/include/mob.hpp
+++ b/include/mob.hpp
@@ -39,6 +39,7 @@ constexpr Mob *Mobp(Entity *e) {
 
 class Page : public Mob {
 private:
+	std::string cId, cValue;
     std::string pageTexPath;
     GLuint pageTexture;
 public:
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.