no more getSystem

8 files changed, 57 insertions, 107 deletions

diff --git a/include/components.hpp b/include/components.hpp
index 87d4293..fe8e7a6 100644
--- a/include/components.hpp
+++ b/include/components.hpp
@@ -655,14 +655,15 @@ public:
 
 class RenderSystem : public entityx::System<RenderSystem> {
 private:
-	std::string loadTexString;
-	Texture loadTexResult;
+	static std::string loadTexString;
+	static Texture loadTexResult;
 
 public:
-	Texture loadTexture(const std::string& file);
+	static Texture loadTexture(const std::string& file);
+	static void render(void);
+
 	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override
 	{ (void)en; (void)ev; (void)dt; }
-	void render(void);
 };
 
 class DialogSystem : public entityx::System<DialogSystem>, public entityx::Receiver<DialogSystem> {
diff --git a/include/inventory.hpp b/include/inventory.hpp
index adf16f1..8329d72 100644
--- a/include/inventory.hpp
+++ b/include/inventory.hpp
@@ -99,41 +99,35 @@ private:
 	constexpr static float inventoryZ = -5.0f;
 	constexpr static unsigned int rowSize = 8;
 
-	/**
-	 * A 'database' of all existing items.
-	 */
-	std::unordered_map<std::string, Item> itemList;
+	static std::unordered_map<std::string, Item> itemList;
+	static std::vector<InventoryEntry> items;
 
-	/**
-	 * A vector for the player's inventory slots.
-	 */
-    std::vector<InventoryEntry> items;
+	static vec2 hotStart;
+	static vec2 hotEnd;
+	static vec2 fullStart;
+	static vec2 fullEnd;
 
+	static int movingItem;
+	static bool fullInventory;
 
-	vec2 hotStart, hotEnd;
-	vec2 fullStart, fullEnd;
-
-	int movingItem = -1;
-	bool fullInventory = false;
-
-	void loadItems(void);
+	static void loadItems(void);
 public:
-    InventorySystem(int size = 20);
+	InventorySystem(int size = 20);
 
-    void configure(entityx::EventManager &ev);
-    void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
-    void receive(const KeyDownEvent &kde);
+	void configure(entityx::EventManager &ev);
+	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
+	void receive(const KeyDownEvent &kde);
 	void receive(const MouseClickEvent &mce);
 	void receive(const MouseReleaseEvent &mce);
 
-	void render(void);
+	static void render(void);
 
 	/**
 	 * Adds 'count' 'name's to the inventory.
 	 * @param name the name of the item
 	 * @param count the quantity of the item to give
 	 */
-	void add(const std::string& name, int count);
+	static void add(const std::string& name, int count);
 
 	/**
 	 * Takes 'count' 'name's from the inventory.
@@ -143,11 +137,10 @@ public:
 	 * @param count the quantity of the item to take
 	 * @return true if the operation could be completed
 	 */
-	bool take(const std::string& name, int count);
+	static bool take(const std::string& name, int count);
 
-	inline Item getItem(const std::string& s) {
-		return itemList[s];
-	}
+	static inline Item getItem(const std::string& s)
+	{ return itemList[s]; }
 };
 
 #endif // INVENTORY_HPP_
diff --git a/include/particle.hpp b/include/particle.hpp
index 822ac41..31825fc 100644
--- a/include/particle.hpp
+++ b/include/particle.hpp
@@ -29,21 +29,21 @@ struct Particle {
 
 class ParticleSystem : public entityx::System<ParticleSystem> {
 private:
-	std::vector<Particle> parts;
-	unsigned int maximum;
+	static std::vector<Particle> parts;
+	static unsigned int maximum;
 
 public:
 	ParticleSystem(unsigned int max = 2048);
 
-	void add(const vec2& pos, const ParticleType& type, const int& timeleft = 3000,
+	static void add(const vec2& pos, const ParticleType& type, const int& timeleft = 3000,
 		const unsigned char& color = 0);
-	void addMultiple(const int& count, const ParticleType& type, std::function<vec2(void)> f,
+	static void addMultiple(const int& count, const ParticleType& type, std::function<vec2(void)> f,
 		const int& timeleft = 3000, const unsigned char& color = 0);
 
-	void render(void);
+	static void render(void);
 	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
 
-	int getCount(void) const;
+	static int getCount(void);
 };
 
 #endif // PARTICLE_HPP_
diff --git a/include/player.hpp b/include/player.hpp
index efac984..17ce2c1 100644
--- a/include/player.hpp
+++ b/include/player.hpp
@@ -23,22 +23,21 @@ constexpr const float PLAYER_SPEED_CONSTANT = 0.03f;
  */
 class PlayerSystem : public entityx::System<PlayerSystem>, public entityx::Receiver<PlayerSystem> {
 private:
-    entityx::Entity player;
+	static entityx::Entity player;
 
-    bool moveLeft;
-    bool moveRight;
-
-    float speed;
+	static bool moveLeft;
+	static bool moveRight;
+	static float speed;
 
 public:
-    PlayerSystem(void)
-        : moveLeft(false), moveRight(false), speed(1.0f) {}
+	PlayerSystem(void);
 
 	/**
 	 * Creates the player, adding it to the entity system.
 	 */
-	void create(void);
-	inline auto getId(void) const { return player.id(); }
+	static void create(void);
+	static inline auto getId(void)
+	{ return player.id(); }
 
 	/**
 	 * Configures events for use with the entity system.
@@ -68,20 +67,20 @@ public:
 	 * Gets the player's position.
 	 * @return the player's position
 	 */
-    vec2 getPosition(void) const;
+	static vec2 getPosition(void);
 
 	/**
 	 * Sets the player's X coordinate.
 	 * @param x the x coordinate to give the player
 	 */
-	inline void setX(const float& x)
+	static inline void setX(const float& x)
 	{ player.component<Position>().get()->x = x; }
 
 	/**
 	 * Gets the width of the player.
 	 * @return the player's width, according to its sprite
 	 */
-    inline float getWidth(void) const
+    static inline float getWidth(void) 
     { return game::entities.component<Solid>(player.id())->width; }
 };
 
diff --git a/include/quest.hpp b/include/quest.hpp
index b74438d..be9755f 100644
--- a/include/quest.hpp
+++ b/include/quest.hpp
@@ -37,7 +37,7 @@ private:
 	/**
 	 * A list of all quests that are currently active.
 	 */
-	std::vector<Quest> current;
+	static std::vector<Quest> current;
 
 public:
 	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
@@ -49,28 +49,28 @@ public:
 	 * @param req retrieved from XML, list of what the quest wants
 	 * @return a possible error code
 	 */
-	int assign(std::string title, std::string desc, std::string req);
+	static int assign(std::string title, std::string desc, std::string req);
 
 	/**
 	 * Drops a quest through its title.
 	 * @param title the quest's title
 	 * @return a possible error code
 	 */
-	int drop(std::string title);
+	static int drop(std::string title);
 
 	/**
 	 * Finishes a quest through it's title.
 	 * @param title the quest's title
 	 * @return a possible error code
 	 */
-	int finish(std::string title);
+	static int finish(std::string title);
 
 	/**
 	 * Returns true if the system is currently taking the quest.
 	 * @param title the quest's title
 	 * @return if the quest is active.
 	 */
-	bool hasQuest(std::string title);
+	static bool hasQuest(std::string title);
 };
 
 #endif // QUEST_HPP_
diff --git a/include/weather.hpp b/include/weather.hpp
index 58a0cfa..c19a52d 100644
--- a/include/weather.hpp
+++ b/include/weather.hpp
@@ -5,8 +5,7 @@
 
 #include <entityx/entityx.h>
 
-#include <config.hpp>
-#include <particle.hpp>
+#include <vector2.hpp>
 
 extern vec2 offset;
 
@@ -22,60 +21,16 @@ enum class Weather : unsigned char {
 	count
 };
 
-constexpr const char *weatherStrings[] = {
-	"Sunny",
-	"Rainy",
-	"Snowy"
-};
-
 class WeatherSystem : public entityx::System<WeatherSystem> {
 private:
-	Weather weather;
+	static Weather weather;
 
 public:
-	WeatherSystem(Weather w = Weather::Sunny)
-		: weather(w) {}
-
-	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override {
-		(void)en;
-		(void)ev;
-		(void)dt;
-
-		static auto& partSystem = *game::engine.getSystem<ParticleSystem>();
-		static int newPartDelay = 0; // TODO no
+	WeatherSystem(Weather w = Weather::Sunny);
 
-		switch (weather) {
-		case Weather::Sunny:
-			break;
-		case Weather::Rainy:
-			if (newPartDelay++ == 4) {
-				newPartDelay = 0;
-				partSystem.add(vec2(offset.x - game::SCREEN_WIDTH / 2 + randGet() % game::SCREEN_WIDTH,
-					offset.y + game::SCREEN_HEIGHT / 2 + 100),
-					ParticleType::Drop, 3000, 3);
-			}
-			break;
-		case Weather::Snowy:
-			if (newPartDelay++ == 6) {
-				newPartDelay = 0;
-				partSystem.add(vec2(offset.x - game::SCREEN_WIDTH + randGet() % game::SCREEN_WIDTH * 2,
-					offset.y + game::SCREEN_HEIGHT / 2 + 50),
-					ParticleType::Confetti, 10000, 0);
-			}
-			break;
-		default:
-			break;
-		}
-	}
+	void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
 
-	inline void setWeather(const std::string& w) {
-		for (int i = 0; i < static_cast<int>(Weather::count); i++) {
-			if (w == weatherStrings[i]) {
-				weather = static_cast<Weather>(i);
-				return;
-			}
-		}
-	}
+	static void setWeather(const std::string& w);
 };
 
 #endif // WEATHER_HPP_
diff --git a/include/window.hpp b/include/window.hpp
index d53a2bf..36618e5 100644
--- a/include/window.hpp
+++ b/include/window.hpp
@@ -23,22 +23,24 @@ private:
 	/**
 	 * SDL's object for the window.
 	 */
-    SDL_Window *window;
+    static SDL_Window *window;
 
 	/**
 	 * An OpenGL context, created when OpenGL is set up for use.
 	 */
-    SDL_GLContext glContext;
+    static SDL_GLContext glContext;
 
 public:
 	WindowSystem(void);
 
-	void die(void);
+	static void die(void);
 
 	void configure(entityx::EventManager &ev);
     void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override
 	{ (void)en; (void)ev; (void)dt; }
-	void render(void);
+
+	static void render(void);
+
 	void receive(const WindowResizeEvent&);	
 	void receive(const ScreenshotEvent&);
 };
diff --git a/include/world.hpp b/include/world.hpp
index 2af4642..ac55b56 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -177,7 +177,7 @@ public:
 
 	void fight(entityx::Entity entity);
 
-	void die(void);
+	static void die(void);
 };
 
 #endif // WORLD_HPP_