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

Fixed typo.

Browse Source
This commit is contained in:
hiker
2014-03-03 09:17:45 +11:00
parent 9f83b1ab76
commit 38bdca2038
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/animations/three_d_animation.cpp
View File

@@ -47,7 +47,7 @@ ThreeDAnimation::ThreeDAnimation(const XMLNode &node, TrackObject* object) : Ani
node.get("explode", &m_explode_kart);
node.get("flatten", &m_flatten_kart);
m_important_animation = (World::getWorld()->getIdent() == IDENT_CUSTSCENE);
m_important_animation = (World::getWorld()->getIdent() == IDENT_CUTSCENE);
node.get("important", &m_important_animation);
/** Save the initial position and rotation in the base animation object. */

2
src/modes/cutscene_world.cpp
View File

@@ -168,7 +168,7 @@ CutsceneWorld::~CutsceneWorld()
*/
const std::string& CutsceneWorld::getIdent() const
{
return IDENT_CUSTSCENE;
return IDENT_CUTSCENE;
} // getIdent
//-----------------------------------------------------------------------------

6
src/race/race_manager.hpp
View File

@@ -42,10 +42,10 @@ static const std::string IDENT_STD ("STANDARD" );
static const std::string IDENT_TTRIAL ("STD_TIMETRIAL" );
static const std::string IDENT_FTL ("FOLLOW_LEADER" );
static const std::string IDENT_STRIKES ("BATTLE_3_STRIKES");
static const std::string IDENT_EASTER ("EASTER_EGG_HUNT");
static const std::string IDENT_EASTER ("EASTER_EGG_HUNT" );
static const std::string IDENT_SOCCER ("SOCCER" );
static const std::string IDENT_OVERWORLD("OVERWORLD" );
static const std::string IDENT_CUSTSCENE("CUTSCENE" );
static const std::string IDENT_OVERWORLD("OVERWORLD" );
static const std::string IDENT_CUTSCENE ("CUTSCENE" );
/**
* The race manager has two functions:

6
src/tracks/track_object_presentation.cpp
View File

@@ -187,7 +187,7 @@ TrackObjectPresentationMesh::TrackObjectPresentationMesh(const XMLNode& xml_node
// World::getWorld()->getTrack()->getTrackFile(model_name);
bool animated = skeletal_animation && (UserConfigParams::m_graphical_effects ||
World::getWorld()->getIdent() == IDENT_CUSTSCENE);
World::getWorld()->getIdent() == IDENT_CUTSCENE);
bool displacing = false;
xml_node.get("displacing", &displacing);
animated &= !displacing;
@@ -226,7 +226,7 @@ TrackObjectPresentationMesh::TrackObjectPresentationMesh(
m_node = NULL;
bool animated = (UserConfigParams::m_graphical_effects ||
World::getWorld()->getIdent() == IDENT_CUSTSCENE);
World::getWorld()->getIdent() == IDENT_CUTSCENE);
if (file_manager->fileExists(model_file))
{
@@ -254,7 +254,7 @@ void TrackObjectPresentationMesh::init(const XMLNode* xml_node, scene::ISceneNod
xml_node->get("skeletal-animation", &skeletal_animation);
bool animated = skeletal_animation && (UserConfigParams::m_graphical_effects ||
World::getWorld()->getIdent() == IDENT_CUSTSCENE);
World::getWorld()->getIdent() == IDENT_CUTSCENE);
bool displacing = false;
xml_node->get("displacing", &displacing);
animated &= !displacing;