From e80ffba71dffb1c5a98abb1ffb2014d6bf703263 Mon Sep 17 00:00:00 2001 From: Marek Moeckel Date: Sun, 9 Jan 2005 17:31:16 +0000 Subject: [PATCH] fixed setup.cpp not finding correct data path removed some old debug output SVN-Revision: 2274 --- lib/app/setup.cpp | 2 +- src/badguy/badguy.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/app/setup.cpp b/lib/app/setup.cpp index 7f3917b5e..af33a9804 100644 --- a/lib/app/setup.cpp +++ b/lib/app/setup.cpp @@ -303,7 +303,7 @@ void Setup::directories() // try current directory as datadir if(datadir.empty()) { - if(FileSystem::faccessible("./data/intro.txt")) + if(FileSystem::faccessible("./data/credits.txt")) datadir = "./data/"; } diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp index 0b80172d1..690e97aa5 100644 --- a/src/badguy/badguy.cpp +++ b/src/badguy/badguy.cpp @@ -136,7 +136,6 @@ BadGuy::collision_player(Player& player, const CollisionHit& hit) // give badguys some invincible time (prevent them from being hit multiple times) // use hitpoints also when hit by fireball or invincible tux hitpoints--; - std::cout << "Hitpoints: " << hitpoints << std::endl; if(collision_squished(player)) return ABORT_MOVE; else if (hitpoints <= 0) { -- 2.11.0