ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor code cleanup.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3569 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-06-02 11:51:26 +00:00
parent 7d8d053157
commit 102a601192
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/items/cake.cpp
View File

@ -107,11 +107,7 @@ Cake::Cake (Kart *kart) : Flyable(kart, POWERUP_CAKE)
} // Cake } // Cake
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
#ifdef HAVE_IRRLICHT
void Cake::init(const lisp::Lisp* lisp, scene::IMesh *cake_model) 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); Flyable::init(lisp, cake_model, POWERUP_CAKE);
m_st_max_distance = 80.0f; m_st_max_distance = 80.0f;

8
src/items/cake.hpp
View File

@ -20,10 +20,8 @@
#ifndef HEADER_CAKE_HPP #ifndef HEADER_CAKE_HPP
#define HEADER_CAKE_HPP #define HEADER_CAKE_HPP
#ifdef HAVE_IRRLICHT
#include "irrlicht.h" #include "irrlicht.h"
using namespace irr; using namespace irr;
#endif
#include "flyable.hpp" #include "flyable.hpp"
@ -34,17 +32,11 @@ private:
static float m_st_max_distance_squared; static float m_st_max_distance_squared;
btVector3 m_initial_velocity; btVector3 m_initial_velocity;
//float steerTowards(btTransform& trans, btVector3& target);
Kart* m_target; // which kart is targeted by this Kart* m_target; // which kart is targeted by this
// projectile (NULL if none) // projectile (NULL if none)
public: public:
Cake (Kart *kart); Cake (Kart *kart);
#ifdef HAVE_IRRLICHT
static void init (const lisp::Lisp* lisp, scene::IMesh *cake_model); 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 update (float dt);
virtual void hitTrack () { hit(NULL); } virtual void hitTrack () { hit(NULL); }
// Kinematic objects are not allowed to have a velocity (assertion in // Kinematic objects are not allowed to have a velocity (assertion in