diff options
| author | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-11-18 14:08:36 +0100 |
|---|---|---|
| committer | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-11-18 14:08:36 +0100 |
| commit | 20fc8401083e23e414feae2a9a4d217b228b8f15 (patch) | |
| tree | 08c9e9c4ddcde5438eb54f6b051895c0896f935b /mwe/gameloop/include | |
| parent | 60669b60e63532bc264ecd6d106bd15f0688a5b6 (diff) | |
| parent | 121b64b1cb6cfead5814070c8b0185d3d7308095 (diff) | |
Merge remote-tracking branch 'origin/master' into niels/rendering_color
Diffstat (limited to 'mwe/gameloop/include')
| -rw-r--r-- | mwe/gameloop/include/gameObject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mwe/gameloop/include/gameObject.h b/mwe/gameloop/include/gameObject.h index abdc9b0..2764215 100644 --- a/mwe/gameloop/include/gameObject.h +++ b/mwe/gameloop/include/gameObject.h @@ -3,8 +3,8 @@ class GameObject { public: GameObject(); - GameObject(std::string name, float x, float y, float width, float height, - float velX, float velY); + GameObject(std::string name, float x, float y, float width, float height, float velX, + float velY); std::string getName() const; float getX() const; float getY() const; |