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

More work on cutscenes

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11273 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2012-06-03 00:08:18 +00:00
parent 9ba0c7f137
commit b1a24a78a9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tracks/track.cpp
View File

@ -91,6 +91,7 @@ Track::Track(const std::string &filename)
m_all_nodes.clear(); m_all_nodes.clear();
m_all_cached_meshes.clear(); m_all_cached_meshes.clear();
m_is_arena = false; m_is_arena = false;
m_is_cutscene = false;
m_camera_far = 1000.0f; m_camera_far = 1000.0f;
m_mini_map = NULL; m_mini_map = NULL;
m_sky_particles = NULL; m_sky_particles = NULL;
@ -301,6 +302,7 @@ void Track::loadTrackInfo()
root->get("screenshot", &m_screenshot); root->get("screenshot", &m_screenshot);
root->get("gravity", &m_gravity); root->get("gravity", &m_gravity);
root->get("arena", &m_is_arena); root->get("arena", &m_is_arena);
root->get("cutscene", &m_is_cutscene);
root->get("groups", &m_groups); root->get("groups", &m_groups);
root->get("internal", &m_internal); root->get("internal", &m_internal);
root->get("reverse", &m_reverse_available); root->get("reverse", &m_reverse_available);
@ -1223,7 +1225,7 @@ void Track::loadTrackModel(World* parent, bool reverse_track,
// the race gui was created. The race gui is needed since it stores // the race gui was created. The race gui is needed since it stores
// the information about the size of the texture to render the mini // the information about the size of the texture to render the mini
// map to. // map to.
if (!m_is_arena) loadQuadGraph(mode_id, reverse_track); if (!m_is_arena && !m_is_cutscene) loadQuadGraph(mode_id, reverse_track);
// Set the default start positions. Node that later the default // Set the default start positions. Node that later the default
// positions can still be overwritten. // positions can still be overwritten.
@ -1240,7 +1242,7 @@ void Track::loadTrackModel(World* parent, bool reverse_track,
default_start->get("upwards-distance", &upwards_distance ); default_start->get("upwards-distance", &upwards_distance );
default_start->get("karts-per-row", &karts_per_row ); default_start->get("karts-per-row", &karts_per_row );
} }
if(!m_is_arena) if(!m_is_arena && !m_is_cutscene)
{ {
m_start_transforms.resize(race_manager->getNumberOfKarts()); m_start_transforms.resize(race_manager->getNumberOfKarts());
QuadGraph::get()->setDefaultStartPositions(&m_start_transforms, QuadGraph::get()->setDefaultStartPositions(&m_start_transforms,

3
src/tracks/track.hpp
View File

@ -201,6 +201,9 @@ private:
Vec3 m_aabb_max; Vec3 m_aabb_max;
/** True if this track is an arena. */ /** True if this track is an arena. */
bool m_is_arena; bool m_is_arena;
bool m_is_cutscene;
/** The version of this track. A certain STK version will only support /** The version of this track. A certain STK version will only support
* certain track versions. */ * certain track versions. */
int m_version; int m_version;