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

deriving GPWIn

Browse Source
This commit is contained in:
konstin 2014-07-23 15:33:09 +02:00
parent 02d21053fc
commit 1d8b4c352d
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/states_screens/grand_prix_win.cpp
View File

@ -68,7 +68,7 @@ DEFINE_SCREEN_SINGLETON( GrandPrixWin );
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
GrandPrixWin::GrandPrixWin() : CutsceneScreen("grand_prix_win.stkgui") GrandPrixWin::GrandPrixWin() : GrandPrixCutscene("grand_prix_win.stkgui")
{ {
m_kart_node[0] = NULL; m_kart_node[0] = NULL;
m_kart_node[1] = NULL; m_kart_node[1] = NULL;
@ -120,12 +120,6 @@ void GrandPrixWin::onCutsceneEnd()
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
void GrandPrixWin::loadedFromFile()
{
} // loadedFromFile
// -------------------------------------------------------------------------------------
void GrandPrixWin::init() void GrandPrixWin::init()
{ {
std::vector<std::string> parts; std::vector<std::string> parts;

8
src/states_screens/grand_prix_win.hpp
View File

@ -34,7 +34,7 @@ class TrackObject;
* \ingroup states_screens * \ingroup states_screens
*/ */
class GrandPrixWin : class GrandPrixWin :
public GUIEngine::CutsceneScreen, public GrandPrixCutscene,
public GUIEngine::ScreenSingleton<GrandPrixWin> public GUIEngine::ScreenSingleton<GrandPrixWin>
{ {
friend class GUIEngine::ScreenSingleton<GrandPrixWin>; friend class GUIEngine::ScreenSingleton<GrandPrixWin>;
@ -50,9 +50,6 @@ class GrandPrixWin :
TrackObject* m_kart_node[3]; TrackObject* m_kart_node[3];
//irr::scene::IMeshSceneNode* m_podium_step[3];
//irr::scene::ISceneNode* m_kart_node[3];
/** A copy of the kart model for each kart used. */ /** A copy of the kart model for each kart used. */
std::vector<KartModel*> m_all_kart_models; std::vector<KartModel*> m_all_kart_models;
@ -61,7 +58,6 @@ class GrandPrixWin :
int m_phase; int m_phase;
float m_kart_x[3], m_kart_y[3], m_kart_z[3]; float m_kart_x[3], m_kart_y[3], m_kart_z[3];
//float m_podium_x[3], m_podium_z[3];
float m_kart_rotation[3]; float m_kart_rotation[3];
public: public:
@ -71,7 +67,7 @@ public:
virtual bool onEscapePressed() OVERRIDE; virtual bool onEscapePressed() OVERRIDE;
/** \brief implement callback from parent class GUIEngine::Screen */ /** \brief implement callback from parent class GUIEngine::Screen */
virtual void loadedFromFile() OVERRIDE; virtual void loadedFromFile() OVERRIDE {};
/** \brief implement optional callback from parent class GUIEngine::Screen */ /** \brief implement optional callback from parent class GUIEngine::Screen */
void onUpdate(float dt) OVERRIDE; void onUpdate(float dt) OVERRIDE;