Author: grumbel Date: 2008-07-04 07:25:49 +0200 (Fri, 04 Jul 2008) New Revision: 3659
Removed: trunk/pingus/src/actions/teleported.cpp trunk/pingus/src/actions/teleported.hpp Modified: trunk/pingus/SConstruct trunk/pingus/src/pingu_action_factory.cpp Log: More cruft removal Modified: trunk/pingus/SConstruct =================================================================== --- trunk/pingus/SConstruct 2008-07-04 05:24:12 UTC (rev 3658) +++ trunk/pingus/SConstruct 2008-07-04 05:25:49 UTC (rev 3659) @@ -49,7 +49,6 @@ 'src/actions/smashed.cpp', 'src/actions/splashed.cpp', 'src/actions/superman.cpp', -'src/actions/teleported.cpp', 'src/actions/waiter.cpp', 'src/actions/walker.cpp', 'src/addon_menu.cpp', Deleted: trunk/pingus/src/actions/teleported.cpp =================================================================== --- trunk/pingus/src/actions/teleported.cpp 2008-07-04 05:24:12 UTC (rev 3658) +++ trunk/pingus/src/actions/teleported.cpp 2008-07-04 05:25:49 UTC (rev 3659) @@ -1,49 +0,0 @@ -// Pingus - A free Lemmings clone -// Copyright (C) 1999 Ingo Ruhnke <[EMAIL PROTECTED]> -// -// 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 3 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, see <http://www.gnu.org/licenses/>. - -#include "../display/scene_context.hpp" -#include "../pingu.hpp" -#include "../sprite.hpp" -#include "teleported.hpp" - -namespace Actions { - -Teleported::Teleported(Pingu* p) - : PinguAction(p), - sound_played(false) -{ - sprite = Sprite("pingus/player" + pingu->get_owner_str() + "/bomber"); -} - - -void -Teleported::draw (SceneContext& gc) -{ - gc.color().draw(sprite, pingu->get_pos ()); -} - - -void -Teleported::update() -{ - pingu->set_pos((float)x_target, (float)y_target); - pingu->set_status(PS_ALIVE); - pingu->set_action(Actions::Walker); -} - -} // namespace Actions - -/* EOF */ Deleted: trunk/pingus/src/actions/teleported.hpp =================================================================== --- trunk/pingus/src/actions/teleported.hpp 2008-07-04 05:24:12 UTC (rev 3658) +++ trunk/pingus/src/actions/teleported.hpp 2008-07-04 05:25:49 UTC (rev 3659) @@ -1,52 +0,0 @@ -// Pingus - A free Lemmings clone -// Copyright (C) 1999 Ingo Ruhnke <[EMAIL PROTECTED]> -// -// 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 3 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, see <http://www.gnu.org/licenses/>. - -#ifndef HEADER_PINGUS_ACTIONS_TELEPORTED_HPP -#define HEADER_PINGUS_ACTIONS_TELEPORTED_HPP - -#include "../pingu_action.hpp" - -namespace Actions { - -class Teleported : public PinguAction -{ -private: - //bool particle_thrown; - bool sound_played; - Sprite sprite; - -public: - Teleported (Pingu*); - - ActionName get_type() const { return Actions::Teleported; } - - void draw (SceneContext& gc); - void update(); - - bool catchable () { return false; } - - int x_target, y_target; // <- FIXME: Ugly! - -private: - Teleported (const Teleported&); - Teleported& operator= (const Teleported&); -}; - -} // namespace Actions - -#endif - -/* EOF */ Modified: trunk/pingus/src/pingu_action_factory.cpp =================================================================== --- trunk/pingus/src/pingu_action_factory.cpp 2008-07-04 05:24:12 UTC (rev 3658) +++ trunk/pingus/src/pingu_action_factory.cpp 2008-07-04 05:25:49 UTC (rev 3659) @@ -31,7 +31,6 @@ #include "actions/miner.hpp" #include "actions/jumper.hpp" #include "actions/slider.hpp" -#include "actions/teleported.hpp" #include "actions/exiter.hpp" #include "actions/smashed.hpp" #include "actions/laser_kill.hpp" @@ -146,7 +145,6 @@ new PinguActionFactoryImpl<class Smashed> (Smashed); new PinguActionFactoryImpl<class Splashed> (Splashed); new PinguActionFactoryImpl<class Superman> (Superman); - new PinguActionFactoryImpl<class Teleported> (Teleported); new PinguActionFactoryImpl<class Waiter> (Waiter); new PinguActionFactoryImpl<class Walker> (Walker); } _______________________________________________ pingus-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/pingus-cvs
