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

removing unnecessary codes and compiler warnings

Browse Source
This commit is contained in:
konstin
2014-07-23 21:25:31 +02:00
parent e4f7b6041c
commit b6d7834c85
3 changed files with 15 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/states_screens/grand_prix_lose.cpp
View File

@@ -49,7 +49,6 @@
#include <ICameraSceneNode.h>
#include <ILightSceneNode.h>
#include <IMeshSceneNode.h>
//#include <iostream>
using namespace irr::core;
using namespace irr::gui;
@@ -86,7 +85,6 @@ DEFINE_SCREEN_SINGLETON( GrandPrixLose );
void GrandPrixLose::onCutsceneEnd()
{
TrackObjectManager* tobjman = World::getWorld()->getTrack()->getTrackObjectManager();
if (m_kart_node[0] != NULL)
m_kart_node[0]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
if (m_kart_node[1] != NULL)
@@ -121,9 +119,7 @@ void GrandPrixLose::loadedFromFile()
void GrandPrixLose::init()
{
std::vector<std::string> parts;
parts.push_back("gplose");
((CutsceneWorld*)World::getWorld())->setParts(parts);
((CutsceneWorld*)World::getWorld())->setParts({"gplose"});
CutsceneWorld::setUseDuration(false);
Screen::init();

61
src/states_screens/grand_prix_win.cpp
View File

@@ -70,24 +70,15 @@ DEFINE_SCREEN_SINGLETON( GrandPrixWin );
GrandPrixWin::GrandPrixWin() : GrandPrixCutscene("grand_prix_win.stkgui")
{
m_kart_node[0] = NULL;
m_kart_node[1] = NULL;
m_kart_node[2] = NULL;
m_podium_steps[0] = NULL;
m_podium_steps[1] = NULL;
m_podium_steps[2] = NULL;
for (int i = 0; i < 3; i++)
{
m_kart_node[i] = NULL;
m_podium_steps[i] = NULL;
}
} // GrandPrixWin
// -------------------------------------------------------------------------------------
GrandPrixWin::~GrandPrixWin()
{
}
// -------------------------------------------------------------------------------------
void GrandPrixWin::onCutsceneEnd()
{
for (unsigned int i = 0; i<m_all_kart_models.size(); i++)
@@ -101,30 +92,20 @@ void GrandPrixWin::onCutsceneEnd()
m_unlocked_label = NULL;
}
TrackObjectManager* tobjman = World::getWorld()->getTrack()->getTrackObjectManager();
if (m_kart_node[0] != NULL)
m_kart_node[0]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
if (m_kart_node[1] != NULL)
m_kart_node[1]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
if (m_kart_node[2] != NULL)
m_kart_node[2]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
m_kart_node[0] = NULL;
m_kart_node[1] = NULL;
m_kart_node[2] = NULL;
m_podium_steps[0] = NULL;
m_podium_steps[1] = NULL;
m_podium_steps[2] = NULL;
for (int i = 0; i < 3; i++)
{
if (m_kart_node[i] != NULL)
m_kart_node[i]->getPresentation<TrackObjectPresentationSceneNode>()->getNode()->remove();
m_kart_node[i] = NULL;
m_podium_steps[i] = NULL;
}
}
// -------------------------------------------------------------------------------------
void GrandPrixWin::init()
{
std::vector<std::string> parts;
parts.push_back("gpwin");
((CutsceneWorld*)World::getWorld())->setParts(parts);
((CutsceneWorld*)World::getWorld())->setParts({"gpwin"});
CutsceneWorld::setUseDuration(false);
Screen::init();
@@ -181,7 +162,6 @@ void GrandPrixWin::init()
else
{
m_unlocked_label = NULL;
saveGPButton();
}
@@ -211,17 +191,11 @@ void GrandPrixWin::onUpdate(float dt)
if (fabsf(m_kart_z[k] - KARTS_DEST_Z) > dt)
{
if (m_kart_z[k] < KARTS_DEST_Z - dt)
{
m_kart_z[k] += dt;
}
else if (m_kart_z[k] > KARTS_DEST_Z + dt)
{
m_kart_z[k] -= dt;
}
else
{
m_kart_z[k] = KARTS_DEST_Z;
}
karts_not_yet_done++;
}
@@ -233,9 +207,7 @@ void GrandPrixWin::onUpdate(float dt)
} // end for
if (karts_not_yet_done == 0)
{
m_phase = 2;
}
}
// ---- Karts Rotate
@@ -291,7 +263,6 @@ void GrandPrixWin::onUpdate(float dt)
}
}
} // end for
}
@@ -357,17 +328,11 @@ void GrandPrixWin::setKarts(const std::string idents_arg[3])
if (meshPresentation != NULL)
{
if (meshPresentation->getModelFile() == "gpwin_podium1.b3d")
{
m_podium_steps[0] = currObj;
}
else if (meshPresentation->getModelFile() == "gpwin_podium2.b3d")
{
m_podium_steps[1] = currObj;
}
else if (meshPresentation->getModelFile() == "gpwin_podium3.b3d")
{
m_podium_steps[2] = currObj;
}
}
}

2
src/states_screens/grand_prix_win.hpp
View File

@@ -41,7 +41,7 @@ class GrandPrixWin :
GrandPrixWin();
virtual ~GrandPrixWin();
virtual ~GrandPrixWin() {};
/** Global evolution of time */
double m_global_time;