From 102a6011925b8d942a1aa7b9275647d1a2935a7e Mon Sep 17 00:00:00 2001 From: hikerstk Date: Tue, 2 Jun 2009 11:51:26 +0000 Subject: [PATCH] Minor code cleanup. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3569 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/items/cake.cpp | 4 ---- src/items/cake.hpp | 8 -------- 2 files changed, 12 deletions(-) diff --git a/src/items/cake.cpp b/src/items/cake.cpp index 76dcf92e7..caa4d62bd 100644 --- a/src/items/cake.cpp +++ b/src/items/cake.cpp @@ -107,11 +107,7 @@ Cake::Cake (Kart *kart) : Flyable(kart, POWERUP_CAKE) } // Cake // ----------------------------------------------------------------------------- -#ifdef HAVE_IRRLICHT void Cake::init(const lisp::Lisp* lisp, scene::IMesh *cake_model) -#else -void Cake::init(const lisp::Lisp* lisp, ssgEntity *cake_model) -#endif { Flyable::init(lisp, cake_model, POWERUP_CAKE); m_st_max_distance = 80.0f; diff --git a/src/items/cake.hpp b/src/items/cake.hpp index 720665696..46091cc61 100644 --- a/src/items/cake.hpp +++ b/src/items/cake.hpp @@ -20,10 +20,8 @@ #ifndef HEADER_CAKE_HPP #define HEADER_CAKE_HPP -#ifdef HAVE_IRRLICHT #include "irrlicht.h" using namespace irr; -#endif #include "flyable.hpp" @@ -34,17 +32,11 @@ private: static float m_st_max_distance_squared; btVector3 m_initial_velocity; - //float steerTowards(btTransform& trans, btVector3& target); - Kart* m_target; // which kart is targeted by this // projectile (NULL if none) public: Cake (Kart *kart); -#ifdef HAVE_IRRLICHT static void init (const lisp::Lisp* lisp, scene::IMesh *cake_model); -#else - static void init (const lisp::Lisp* lisp, ssgEntity* cake_model); -#endif virtual void update (float dt); virtual void hitTrack () { hit(NULL); } // Kinematic objects are not allowed to have a velocity (assertion in