From 9650fda582e9a066b15816f96b44236286e7eac7 Mon Sep 17 00:00:00 2001 From: Tamir Atias Date: Wed, 8 Feb 2012 22:02:56 +0200 Subject: [PATCH] [Change] Collision is now only done with the lower quarter of the player's height. --- src/libUnuk/LevelGen/LevelGen.cpp | 6 +++--- src/libUnuk/LevelGen/LevelGen.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libUnuk/LevelGen/LevelGen.cpp b/src/libUnuk/LevelGen/LevelGen.cpp index bd2048a..ad0a737 100644 --- a/src/libUnuk/LevelGen/LevelGen.cpp +++ b/src/libUnuk/LevelGen/LevelGen.cpp @@ -12,7 +12,7 @@ LevelGen::~LevelGen(void) { } -void LevelGen::Load(const string filename) { +void LevelGen::Load(const string& filename) { Unload(); _currentMap = filename; string fullMapPath = "../Data/Media/Maps/" + filename; @@ -310,9 +310,9 @@ void LevelGen::MoveIfPossible(Character* character, float xVel, float yVel, bool SDL_Rect charRect; charRect.x = targetX; - charRect.y = targetY + (character->GetHeight() / 2); + charRect.y = targetY + (character->GetHeight() / 4) * 3; charRect.w = character->GetWidth(); - charRect.h = character->GetHeight() / 2; + charRect.h = character->GetHeight() / 4; for(int x = 0; x < BOUNDARIES_X; x++) { for(int y = 0; y < BOUNDARIES_Y; y++) { diff --git a/src/libUnuk/LevelGen/LevelGen.h b/src/libUnuk/LevelGen/LevelGen.h index 9b1ec6e..f414d0a 100644 --- a/src/libUnuk/LevelGen/LevelGen.h +++ b/src/libUnuk/LevelGen/LevelGen.h @@ -24,7 +24,7 @@ public: LevelGen(void); ~LevelGen(void); - void Load(const string filename); + void Load(const string& filename); void Update(void); void Render(void);