diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-01-21 09:09:52 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-01-21 09:09:52 -0500 |
| commit | 9b6173fb47e5d7bbcded9e3ef1cb735690be4c84 (patch) | |
| tree | 9a1929de2b5289d2706d53246877fbb3b5ba2831 /include/entities.h | |
| parent | 57cdcfac12bccee661085a00424f015fc071666f (diff) | |
| parent | d6469d0cafc03c468c5977ec345d08b3ccb6fd0a (diff) | |
Player Sprite
Diffstat (limited to 'include/entities.h')
| -rw-r--r-- | include/entities.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/include/entities.h b/include/entities.h index 7925bb9..d894c21 100644 --- a/include/entities.h +++ b/include/entities.h @@ -65,15 +65,13 @@ public: bool gravity; bool behind; Particles(float x, float y, float w, float h, float vx, float vy, Color c, float d){ - loc.x = (x); - loc.y = (y); - width = (w); - height = (h); + loc.x = x; + loc.y = y; + width = w; + height = h; velx = vx; vely = vy; - color.red = (c.red); - color.green = (c.green); - color.blue = (c.blue); + color = c; duration = d; fountain = false; gravity = true; @@ -186,7 +184,7 @@ public: class NPC : public Entity{ public: std::vector<int (*)(NPC *)>aiFunc; - unsigned int dialogIndex; + int dialogIndex; NPC(); ~NPC(); @@ -200,7 +198,6 @@ class Structures : public Entity{ public: BUILD_SUB bsubtype; char *inside; - //char *outside; Structures(); ~Structures(); |