diff --git a/FirstTest/main.cpp b/FirstTest/main.cpp index fb787e1..9a78071 100644 --- a/FirstTest/main.cpp +++ b/FirstTest/main.cpp @@ -1,7 +1,7 @@ #include #include // std::ostringstream #include -#include +#include #include "Player.hpp" #define WindowSize sf::VideoMode(960, 540) diff --git a/Force/.vscode/settings.json b/Force/.vscode/settings.json deleted file mode 100644 index 5fab886..0000000 --- a/Force/.vscode/settings.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "files.associations": { - "vector": "cpp", - "ios": "cpp", - "ostream": "cpp", - "sstream": "cpp", - "deque": "cpp", - "exception": "cpp", - "fstream": "cpp", - "istream": "cpp", - "iterator": "cpp", - "map": "cpp", - "memory": "cpp", - "set": "cpp", - "streambuf": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "utility": "cpp", - "xlocale": "cpp", - "xlocinfo": "cpp", - "xstring": "cpp", - "xtree": "cpp", - "xutility": "cpp", - "iostream": "cpp", - "cmath": "cpp", - "iosfwd": "cpp" - } -} \ No newline at end of file diff --git a/Force/Entity.h b/Force/Entity.h index 7a2961a..b4ee421 100644 --- a/Force/Entity.h +++ b/Force/Entity.h @@ -1,6 +1,6 @@ #include #include -#include +#include class Entity; @@ -34,9 +34,9 @@ class Entity public: Entity(); void ApplyForce(sf::Vector2f, float); + void ApplyDrag(float, float); void ApplyGravity(float); void ApplyVelocity(float); - void ApplyDrag(float, float); void SetPosition(float, float, bool = true); void SetVelocity(float, float, bool = true); sf::Vertex &GetVertex();