From eb41fb3f3830de25cc5656c05f32c0657da5581a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=B2sweg?= Date: Fri, 1 Nov 2019 16:37:01 +0100 Subject: [PATCH] update .gitignore Pretty easy to understand from the title lmao (I'm really just testing git comments on commits) --- .gitignore | 30 +++++++++++++++++++----------- src/.maps.cpp.swp | Bin 16384 -> 0 bytes src/entity/player.cpp | 3 +++ src/entity/player.h | 2 +- 4 files changed, 23 insertions(+), 12 deletions(-) delete mode 100644 src/.maps.cpp.swp diff --git a/.gitignore b/.gitignore index 0f018bf..ebc0c42 100644 --- a/.gitignore +++ b/.gitignore @@ -32,18 +32,26 @@ reated by https://www.gitignore.io/api/vim,c++,linux *.out *.app -### CodeBlocks ### -# specific to CodeBlocks IDE -*.cbp -*.layout -*.depend - # generated directories bin/ obj/ -### My files ### -*.project.cpp -source/collisions.cpp -source/collisions.h -*.psd +### Vim ### +# Swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session +Session.vim +Sessionx.vim + +# Temporary +.netrwhist +*~ +# Auto-generated tag files +tags +# Persistent undo +[._]*.un~ diff --git a/src/.maps.cpp.swp b/src/.maps.cpp.swp deleted file mode 100644 index 4e4d604111f53b715f63bb2da1220f1080a92d3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 diff --git a/src/entity/player.cpp b/src/entity/player.cpp index 112f57f..6672a22 100644 --- a/src/entity/player.cpp +++ b/src/entity/player.cpp @@ -155,11 +155,14 @@ void Player::move(){ if(run!=1) ifRunning = true; + //Get the position and update the velY with gravity velocityY -= gravity * dt; float x = velocityX * dt * run; float y = velocityY * dt; + std::cout << velocityY << " " << posY << " " << y << std::endl; + //Convert and set new int position posX += static_cast(x); posY -= static_cast(y+0.5); diff --git a/src/entity/player.h b/src/entity/player.h index 75b026e..0693fbd 100644 --- a/src/entity/player.h +++ b/src/entity/player.h @@ -1,4 +1,4 @@ -//Player class header< +//Player class header #ifndef __PLAYER_H_INCLUDED__ #define __PLAYER_H_INCLUDED__