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

Add cutscene_gui.[ch]pp to build system (and sort arenas_screen.[ch]pp).

Browse Source 
Also fix their EOLs (mixed!?) and set the property to avoid that in future.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11335 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
mbjornstk
2012-06-24 22:42:10 +00:00
parent 137600a5f0
commit 772d9df1d6
3 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.am
View File

@@ -346,8 +346,12 @@ supertuxkart_SOURCES = \
replay/replay_play.hpp \
replay/replay_recorder.cpp \
replay/replay_recorder.hpp \
states_screens/arenas_screen.cpp \
states_screens/arenas_screen.hpp \
states_screens/credits.cpp \
states_screens/credits.hpp \
states_screens/cutscene_gui.cpp \
states_screens/cutscene_gui.hpp \
states_screens/dialogs/add_device_dialog.cpp \
states_screens/dialogs/add_device_dialog.hpp \
states_screens/dialogs/confirm_resolution_dialog.cpp \
@@ -376,8 +380,6 @@ supertuxkart_SOURCES = \
states_screens/dialogs/track_info_dialog.hpp \
states_screens/dialogs/addons_loading.cpp \
states_screens/dialogs/addons_loading.hpp \
states_screens/arenas_screen.cpp \
states_screens/arenas_screen.hpp \
states_screens/feature_unlocked.cpp \
states_screens/feature_unlocked.hpp \
states_screens/grand_prix_lose.cpp \

40
src/states_screens/cutscene_gui.cpp
View File

@@ -1,19 +1,19 @@
//
// SuperTuxKart - a fun racing game with go-kart
// Copyright (C) 2012 Marianne Gagnon
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 3
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
//
// SuperTuxKart - a fun racing game with go-kart
// Copyright (C) 2012 Marianne Gagnon
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 3
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "guiengine/engine.hpp"
@@ -29,14 +29,14 @@ CutsceneGUI::CutsceneGUI()
}
// -----------------------------------------------------------------------------
CutsceneGUI::~CutsceneGUI()
{
}
}
// -----------------------------------------------------------------------------
void CutsceneGUI::renderGlobal(float dt)
{
if (m_fade_level > 0.0f)
@@ -54,7 +54,7 @@ void CutsceneGUI::renderGlobal(float dt)
GUIEngine::getFont()->draw(m_subtitle, r,
video::SColor(255,255,255,255), true, true, NULL);
}
}
}
// -----------------------------------------------------------------------------

130
src/states_screens/cutscene_gui.hpp
View File

@@ -1,65 +1,65 @@
//
// SuperTuxKart - a fun racing game with go-kart
// Copyright (C) 2012 Marianne Gagnon
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 3
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef HEADER_RACE_GUI_HPP
#define HEADER_RACE_GUI_HPP
#include <string>
#include <vector>
#include <irrString.h>
using namespace irr;
#include "config/player.hpp"
#include "states_screens/race_gui_base.hpp"
#include "utils/cpp2011.h"
class AbstractKart;
class InputMap;
class Material;
class RaceSetup;
/**
* \brief Handles the overlay for cutscenes
* \ingroup states_screens
*/
class CutsceneGUI : public RaceGUIBase
{
private:
float m_fade_level;
core::stringw m_subtitle;
public:
CutsceneGUI();
~CutsceneGUI();
void setFadeLevel(float level) { m_fade_level = level; }
void setSubtitle(const core::stringw& subtitle) { m_subtitle = subtitle; }
virtual void renderGlobal(float dt);
virtual void renderPlayerView(const AbstractKart *kart);
virtual const core::dimension2du getMiniMapSize() const OVERRIDE
{
return core::dimension2du(1,1);
}
}; // RaceGUI
#endif
//
// SuperTuxKart - a fun racing game with go-kart
// Copyright (C) 2012 Marianne Gagnon
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 3
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef HEADER_RACE_GUI_HPP
#define HEADER_RACE_GUI_HPP
#include <string>
#include <vector>
#include <irrString.h>
using namespace irr;
#include "config/player.hpp"
#include "states_screens/race_gui_base.hpp"
#include "utils/cpp2011.h"
class AbstractKart;
class InputMap;
class Material;
class RaceSetup;
/**
* \brief Handles the overlay for cutscenes
* \ingroup states_screens
*/
class CutsceneGUI : public RaceGUIBase
{
private:
float m_fade_level;
core::stringw m_subtitle;
public:
CutsceneGUI();
~CutsceneGUI();
void setFadeLevel(float level) { m_fade_level = level; }
void setSubtitle(const core::stringw& subtitle) { m_subtitle = subtitle; }
virtual void renderGlobal(float dt);
virtual void renderPlayerView(const AbstractKart *kart);
virtual const core::dimension2du getMiniMapSize() const OVERRIDE
{
return core::dimension2du(1,1);
}
}; // RaceGUI
#endif