diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-05-13 12:48:11 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-05-13 12:48:11 -0400 |
| commit | 23f3b1471b2bbfe92252456f32c9ae55a9d1f213 (patch) | |
| tree | 97f520b944aaa699854b745e182911615ce10c02 /include | |
| parent | 0e24afb4cd060701348398b16f2b1d89b8935b81 (diff) | |
Things flash red when hit
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.hpp | 1 | ||||
| -rw-r--r-- | include/entities.hpp | 5 |
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; |