X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrtree.cpp;h=73e2c63088f35b372242a462d75bbde3c98d7425;hb=e957829ea32995323524f3f73fa68ec117c8a171;hp=d944717900b547d1dbe1a2f2836be00dfce7f410;hpb=9599042661b468aae7bd34dca05441c0ebc93ad7;p=supertux.git diff --git a/src/badguy/mrtree.cpp b/src/badguy/mrtree.cpp index d94471790..73e2c6308 100644 --- a/src/badguy/mrtree.cpp +++ b/src/badguy/mrtree.cpp @@ -1,6 +1,26 @@ +// $Id$ +// +// SuperTux +// Copyright (C) 2005 Matthias Braun +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +// 02111-1307, USA. + #include -#include "mrtree.h" +#include "mrtree.hpp" static const float WALKSPEED = 50; static const float WALKSPEED_SMALL = 30; @@ -44,8 +64,7 @@ MrTree::collision_squished(Player& player) mystate = STATE_NORMAL; activate(); - SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(), - player.get_pos()); + sound_manager->play("sounds/squish.wav", get_pos()); player.bounce(*this); } else { sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");