Merge branch 'master' of https://github.com/tcsullivan/gamedev

2 files changed, 5 insertions, 0 deletions

diff --git a/include/common.hpp b/include/common.hpp
index d13e397..249b9eb 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -105,6 +105,10 @@ struct vec2 {
 		return vec2 (x + n, y + n);
 	}
 
+	const vec2 operator+(const vec2 &v) {
+		return vec2 (x + v.x, y + v.y);
+	}
+
 	template<typename T>
 	const vec2 operator*(const T &n) {
 		return vec2 (x * n, y * n);
diff --git a/include/world.hpp b/include/world.hpp
index b8a80a4..5c021bf 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -146,6 +146,7 @@ private:
 	 * SDL's object for handling the background music.
 	 */
 	Mix_Music *bgmObj;
+	std::string bgmCurrent;
 
 	/**
 	 * Paths of files to get stylized textures from.