diff options
| author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-15 20:39:07 +0100 | 
|---|---|---|
| committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-11-15 20:39:07 +0100 | 
| commit | e8cd950b8ebd152d76d588d4fedc7f4c239b0835 (patch) | |
| tree | 7919d13a79d52f1365bc19bf1b435a6264ee5512 /mwe/gameloop/include | |
| parent | 5bee4515c1089ce3499bc3b74780db94f0c02306 (diff) | |
| parent | 9f6475e7b0698c414138e2a8140b47f01ce9c5d1 (diff) | |
merge `master` into `loek/cleanup`
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; |