aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-11-29 18:36:05 -0500
committerClyne Sullivan <tullivan99@gmail.com>2016-11-29 18:36:05 -0500
commit6edf0a92b8f3db43bedf901e992903ab1b0f4dca (patch)
tree0a67cc66b407537d9f1a79f6b2eb01eea5bab245 /include
parentc155b43e5189e838c9988a464ca930efb242ee90 (diff)
uhh... more fixes
Diffstat (limited to 'include')
-rw-r--r--include/common.hpp4
-rw-r--r--include/world.hpp1
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.