small changes

diff --git a/src/Moving_object.h b/src/Moving_object.h
index e20995ec4277f6f6b72393d7d6925cc21f186975..959a195c5cbbde17c777d31539e57268dc961554 100644 (file)
--- a/src/Moving_object.h
+++ b/src/Moving_object.h
@@ -6,6 +6,8 @@
 class Moving_object : public Object
 {
 public:
+    Moving_object() = default;
+    ~Moving_object() = default;
 protected:
 private:
 };

diff --git a/src/Object.h b/src/Object.h
index 2fe6023ddd787a78fdb61e5e37b0ac50ec4953c9..80f1400ffc932d08754add57fe8af923b273b852 100644 (file)
--- a/src/Object.h
+++ b/src/Object.h
@@ -7,21 +7,19 @@
 class Object
 {
 public:
-    Object() : x_pos(0), y_pos(0), sprite(), texture() {};
-    
+    Object() : x_pos{0}, y_pos{0}, sprite{}, texture{} {};
+    virtual ~Object() = default;
+
     virtual bool collides(Object& other) = 0;
     virtual void collision(Object& other) = 0;
     virtual void update() = 0;
     virtual void render(sf::RenderWindow& window) = 0;
-
-    virtual ~Object() = default;
-
+  
+protected:
     double x_pos;
     double y_pos;
     sf::Sprite sprite;
     sf::Texture texture;
-
-protected:
 private:
 };
 

diff --git a/src/Player.cc b/src/Player.cc
index bee611c0216fa96655f2ba6ce29eb42fe0a39a4d..ee8a77cfaf724c59205ed450cc41b126e1fb4fa9 100644 (file)
--- a/src/Player.cc
+++ b/src/Player.cc
@@ -1,6 +1,6 @@
 #include "Player.h"
 
-Player::Player() : Object(), collected(0)
+Player::Player() : collected{0}
 {
     texture.loadFromFile("assets/4V_figur.png");
     sprite.setTexture(texture);

diff --git a/src/Player.h b/src/Player.h
index b4d8c20f701ec48f3b92ad5fbb2c096daaa919d4..05bb5cad9b493e22fc826e5b6307edb8b0f0dae8 100644 (file)
--- a/src/Player.h
+++ b/src/Player.h
@@ -2,11 +2,10 @@
 #include <SFML/Graphics.hpp>
 
 #include "Moving_object.h"
-#include "Object.h"
 #include "constants.h"
 
 
-class Player : public Object
+class Player : public Moving_object
 {
 public:
     Player();

diff --git a/src/_main.cc b/src/_main.cc
index 4c81edee1c82d6397513dfc4f640faf2f990e147..c248dd55bb39de0b50a283f43be52a654c6849c0 100644 (file)
--- a/src/_main.cc
+++ b/src/_main.cc
@@ -4,9 +4,9 @@
  * All spelkod bör köras från denna fil och denna fil enbart.
 */
 
-#include <SFML/Graphics.hpp> // includes most things in SFML
-#include "constants.h"
+#include <SFML/Graphics.hpp>
 
+#include "constants.h"
 #include "Player.h"
 
 int main ()