diff --git a/Unuk-QT/Unuk-QT b/Unuk-QT/Unuk-QT index 3ef4aad..2b2cd64 100755 Binary files a/Unuk-QT/Unuk-QT and b/Unuk-QT/Unuk-QT differ diff --git a/src/Unuk/Player.cpp b/src/Unuk/Player.cpp index 36bd2e5..2e40485 100644 --- a/src/Unuk/Player.cpp +++ b/src/Unuk/Player.cpp @@ -64,7 +64,7 @@ void Player::Update(void) { AddSpeachBubble("Woot, My name is Allanis, welcome to my home. Just testing some more text to see if this works.."); // For now The camera will be static. - SetCamera(); + //SetCamera(); } void Player::SetName(string nameArg) { diff --git a/src/libUnuk/Character.cpp b/src/libUnuk/Character.cpp index d335772..07271fe 100644 --- a/src/libUnuk/Character.cpp +++ b/src/libUnuk/Character.cpp @@ -139,7 +139,7 @@ void Character::Move(void) { tileY = (int)(((y + (h / 2)) / TILE_HEIGHT)); // Check collisions. - if((x < 0) || (x + w) > levelWidth) x -= xVel; + if((x < 0) || (x + w) > levelWidth || (x + w) > SCREEN_WIDTH) x -= xVel; if(CheckTileCollisions()) x -= xVel; if(CheckEntityCollisions()) x -= xVel; if(CheckCharacterCollisions()) x -= xVel; @@ -148,7 +148,7 @@ void Character::Move(void) { tileX = (int)(((x + (w / 2)) / TILE_WIDTH)); tileY = (int)(((y + (h / 2)) / TILE_HEIGHT)); - if((y < 0) || (y + h) > levelHeight) y -= yVel; + if((y < 0) || (y + h) > levelHeight || (y + h) > SCREEN_HEIGHT) y -= yVel; if(CheckTileCollisions()) y -= yVel; if(CheckEntityCollisions()) y -= yVel; if(CheckCharacterCollisions()) y -= yVel;