From 4f9d0428777f2dbdb83e37cbac186baffc5d8f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=B2sweg?= Date: Sun, 30 Apr 2017 12:26:31 +0200 Subject: [PATCH] Cleaning up a bit things --- .gitignore | 2 ++ Makefile | 2 +- bin/main | Bin 0 -> 17688 bytes block.cpp | 2 -- main.cpp | 31 ------------------------------- player.cpp | 11 +++++++---- player.h | 4 ---- 7 files changed, 10 insertions(+), 42 deletions(-) create mode 100644 .gitignore create mode 100755 bin/main diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..75b1567 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.swp +*.o diff --git a/Makefile b/Makefile index 03c5c1c..6b770fb 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ COMPILER_FLAGS = -w LINKER_FLAGS = -lSDL2 -std=gnu++11 -OBJ_NAME = main.exe +OBJ_NAME = bin/main all: $(OBJS) diff --git a/bin/main b/bin/main new file mode 100755 index 0000000000000000000000000000000000000000..a7aec385b2a699844aadf9cdd890d96d62d3cde0 GIT binary patch literal 17688 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 bX and aX < b2X){ - if(aY > bY and aY < b2Y) collision += 1; - if(a2Y > bY and a2Y < b2Y) collision += 2; - } - - if(a2X > bX and a2X < b2X){ - if(aY > bY and aY < b2Y) collision += 4; - if(a2Y > bY and a2Y < b2Y) collision += 8; - } - - //std::cout< speed) velocityX = speed; @@ -69,7 +71,7 @@ void Player::move(){ } else if(velocityX <= 1 or velocityX >= -1) velocityX = 0; - //Jump and gravity key logic + //Jump and gravity logic if(ground){ isRunning = false; if(currentKeyStates[SDL_SCANCODE_SPACE] and !topCollision){ @@ -83,6 +85,7 @@ void Player::move(){ if(isRunning == false) run = 1; } + //Get the position and update the velY with gravity velocityY -= gravity * dt; float x = velocityX * dt * run; float y = velocityY * dt; diff --git a/player.h b/player.h index 738a67a..8bfc399 100644 --- a/player.h +++ b/player.h @@ -13,7 +13,6 @@ class Entity; class Player: public Entity{ public: - //Player(/*int* collision*/); void print(); int check(SDL_Rect rectB); void init(int x, int y,int w, int h,SDL_Renderer** render); @@ -27,13 +26,10 @@ class Player: public Entity{ bool ground; bool topCollision; //int posX, posY; - //int cVelocity, oldVelX, oldVelY, newVelX, newVelY; float velocityX = 0; float velocityY = 0; bool isRunning = false; int oldPosX, oldPosY; - //int szW = 40; - //int szH = 40; }; #endif