aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/common.hpp1
-rw-r--r--include/entities.hpp5
2 files changed, 6 insertions, 0 deletions
diff --git a/include/common.hpp b/include/common.hpp
index 2442f5c..240cd01 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -229,6 +229,7 @@ extern GLuint worldShader;
extern GLint worldShader_attribute_coord;
extern GLint worldShader_attribute_tex;
extern GLint worldShader_uniform_texture;
+extern GLint worldShader_uniform_color;
/**
* Prints a formatted debug message to the console, along with the callee's file and line
diff --git a/include/entities.hpp b/include/entities.hpp
index 7487bbe..1c3b6ff 100644
--- a/include/entities.hpp
+++ b/include/entities.hpp
@@ -181,6 +181,11 @@ protected:
// TODO
float targetx;
+ // the cooldown display (red overlay)
+ float hitDuration;
+
+ // the max cooldown display
+ float maxHitDuration;
public:
// contains the entity's coordinates, in pixels
vec2 loc;