More minor code cleanup.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1424 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/highscore_manager.cpp

@@ -87,6 +87,7 @@ void HighscoreManager::Load()
     }
     catch(std::exception& err)
     {
+        (void)err;   // remove warning about unused variable
         Save();
         if(m_can_write)
         {

src/moving_physics.hpp

@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifdef BULLET
 #ifndef HEADER_MOVING_PHYSICS_H
 #define HEADER_MOVING_PHYSICS_H
 #include <plib/ssg.h>
@@ -45,7 +44,6 @@ public:
     const char  *getTypeName()          {return "moving physics";}
 };  // MovingPhysics
 
-#endif
 #endif
 /* EOF */
 

src/scene.cpp

@@ -24,14 +24,11 @@
 #include "world.hpp"
 #include "user_config.hpp"
 
-
+#include "btBulletDynamicsCommon.h"
-#ifdef BULLET
+#ifdef __APPLE__
-#  include "btBulletDynamicsCommon.h"
-#  ifdef __APPLE__
 #  include <GLUT/glut.h>
-#  else
+#else
 #  include <GL/glut.h>
-#  endif
 #endif
 
 #include "scene.hpp"
@@ -132,12 +129,9 @@ void Scene::draw(float dt)
         (*i)->update(dt);
         (*i) -> apply () ;
 
-#ifdef BULLET
         if(!user_config->m_bullet_debug)
         {
-#endif
             ssgCullAndDraw ( m_scenegraph );
-#ifdef BULLET
         }
         else
         {
@@ -187,7 +181,6 @@ void Scene::draw(float dt)
             }
             world->getPhysics()->draw();
         }   //  bullet_debug
-#endif
     }   // for cameras
 
     if (TRACK->useFog())

src/world.hpp

@@ -70,11 +70,6 @@ public:
 
                 World(const RaceSetup& raceSetup);
     virtual    ~World();
-#ifndef BULLET
-    float GetHOT(sgVec3 start, sgVec3 end, ssgLeaf** leaf, sgVec4** nrm)
-          {return m_track->GetHOT(start, end, leaf, nrm);}
-    int   Collision(sgSphere* s, AllHits *a) const {return m_track->Collision(s,a); }
-#endif
     void        update(float delta);
     void        restartRace();
     void        disableRace(); // Put race into limbo phase