Menu
▾
▴
[Supertuxkart-commit] SF.net SVN: supertuxkart:[5728] main/trunk
|
From: <au...@us...> - 2010-08-07 01:59:51
|
Revision: 5728
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=5728&view=rev
Author: auria
Date: 2010-08-07 01:59:44 +0000 (Sat, 07 Aug 2010)
Log Message:
-----------
Started implementing the 'max number of karts' track parameter as per the todo ticket in the tracker. The count is read but not yet enforced. The values I added in the track files are very approximative and not tested. Ideally the track exporter should generate this field
Modified Paths:
--------------
main/trunk/data/tracks/beach/track.xml
main/trunk/data/tracks/canyon/track.xml
main/trunk/data/tracks/cave/track.xml
main/trunk/data/tracks/jungle/track.xml
main/trunk/data/tracks/lighthouse/track.xml
main/trunk/data/tracks/mines/track.xml
main/trunk/data/tracks/sandtrack/track.xml
main/trunk/data/tracks/snowmountain/track.xml
main/trunk/data/tracks/snowtuxpeak/track.xml
main/trunk/data/tracks/startrack/track.xml
main/trunk/data/tracks/tuxtollway/track.xml
main/trunk/data/tracks/xr591/track.xml
main/trunk/src/tracks/track.cpp
main/trunk/src/tracks/track.hpp
Modified: main/trunk/data/tracks/beach/track.xml
===================================================================
--- main/trunk/data/tracks/beach/track.xml 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/data/tracks/beach/track.xml 2010-08-07 01:59:44 UTC (rev 5728)
@@ -6,5 +6,6 @@
designer = "Ingo Ruhnke & Marianne Gagnon"
music = "CaribbeanMusic.music"
screenshot = "sshot-beach.png"
+ maxKartCount = "10"
>
</track>
Modified: main/trunk/data/tracks/canyon/track.xml
===================================================================
--- main/trunk/data/tracks/canyon/track.xml 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/data/tracks/canyon/track.xml 2010-08-07 01:59:44 UTC (rev 5728)
@@ -6,5 +6,6 @@
designer = "Thomas Oppl"
music = "TheDeadRocks-EasyJob.music"
screenshot = "canyon_screenshot.png"
+ maxKartCount = "10"
>
</track>
Modified: main/trunk/data/tracks/cave/track.xml
===================================================================
--- main/trunk/data/tracks/cave/track.xml 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/data/tracks/cave/track.xml 2010-08-07 01:59:44 UTC (rev 5728)
@@ -7,5 +7,6 @@
music = "Penguin_Party.music"
arena = "yes"
screenshot = "sshot-cave.png"
+ maxKartCount = "6"
>
</track>
Modified: main/trunk/data/tracks/jungle/track.xml
===================================================================
--- main/trunk/data/tracks/jungle/track.xml 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/data/tracks/jungle/track.xml 2010-08-07 01:59:44 UTC (rev 5728)
@@ -6,5 +6,6 @@
designer = "Marianne Gagnon"
music = "amazon_jungle.music"
screenshot = "sshot-jungle.png"
+ maxKartCount = "10"
>
</track>
Modified: main/trunk/data/tracks/lighthouse/track.xml
===================================================================
--- main/trunk/data/tracks/lighthouse/track.xml 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/data/tracks/lighthouse/track.xml 2010-08-07 01:59:44 UTC (rev 5728)
@@ -6,5 +6,6 @@
designer = "Ingo Ruhnke & Marianne Gagnon & Stephen Dunn"
music = "ChillCarrier-Druckverlust.music"
screenshot = "sshot-lighthouse.png"
+ maxKartCount = "10"
>
</track>
Modified: main/trunk/data/tracks/mines/track.xml
===================================================================
--- main/trunk/data/tracks/mines/track.xml 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/data/tracks/mines/track.xml 2010-08-07 01:59:44 UTC (rev 5728)
@@ -6,5 +6,6 @@
designer = "Ivar ten Cate"
music = "West.music"
screenshot = "sshot-mines.png"
+ maxKartCount = "8"
>
</track>
Modified: main/trunk/data/tracks/sandtrack/track.xml
===================================================================
--- main/trunk/data/tracks/sandtrack/track.xml 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/data/tracks/sandtrack/track.xml 2010-08-07 01:59:44 UTC (rev 5728)
@@ -6,5 +6,6 @@
designer = "Marianne Gagnon"
music = "TheDeadRocks-GreenSecretFromAmazonia.music"
screenshot = "sshot-sandtrack.png"
+ maxKartCount = "10"
>
</track>
Modified: main/trunk/data/tracks/snowmountain/track.xml
===================================================================
--- main/trunk/data/tracks/snowmountain/track.xml 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/data/tracks/snowmountain/track.xml 2010-08-07 01:59:44 UTC (rev 5728)
@@ -6,5 +6,6 @@
designer = "Canis Lupus"
music = "Snowy.music"
screenshot = "sshot-snowmountain.png"
+ maxKartCount = "10"
>
</track>
Modified: main/trunk/data/tracks/snowtuxpeak/track.xml
===================================================================
--- main/trunk/data/tracks/snowtuxpeak/track.xml 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/data/tracks/snowtuxpeak/track.xml 2010-08-07 01:59:44 UTC (rev 5728)
@@ -7,5 +7,6 @@
music = "boom_boom_boom.music"
arena = "no"
screenshot = "sshot-snowtuxpeak.jpg"
+ maxKartCount = "10"
>
</track>
Modified: main/trunk/data/tracks/startrack/track.xml
===================================================================
--- main/trunk/data/tracks/startrack/track.xml 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/data/tracks/startrack/track.xml 2010-08-07 01:59:44 UTC (rev 5728)
@@ -6,5 +6,6 @@
designer = "Ingo Ruhnke, modified by A. Billing"
music = "Ethereal_spectrum.music"
screenshot = "screenshot-startrack.png"
+ maxKartCount = "8"
>
</track>
Modified: main/trunk/data/tracks/tuxtollway/track.xml
===================================================================
--- main/trunk/data/tracks/tuxtollway/track.xml 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/data/tracks/tuxtollway/track.xml 2010-08-07 01:59:44 UTC (rev 5728)
@@ -7,5 +7,6 @@
music = "kart_grand_prix.music"
arena = "no"
screenshot = "sshot-tuxtrack.png"
+ maxKartCount = "10"
>
</track>
Modified: main/trunk/data/tracks/xr591/track.xml
===================================================================
--- main/trunk/data/tracks/xr591/track.xml 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/data/tracks/xr591/track.xml 2010-08-07 01:59:44 UTC (rev 5728)
@@ -6,5 +6,6 @@
designer = "Canis Lupus (conversion by Ivar ten cate)"
music = "ChillCarrier-Druckverlust.music"
screenshot = "sshot-marstrack.jpg"
+ maxKartCount = "8"
>
</track>
Modified: main/trunk/src/tracks/track.cpp
===================================================================
--- main/trunk/src/tracks/track.cpp 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/src/tracks/track.cpp 2010-08-07 01:59:44 UTC (rev 5728)
@@ -81,6 +81,7 @@
m_start_angle = 0;
m_sky_dx = 0.05f;
m_sky_dy = 0.0f;
+ m_max_kart_count = 8;
m_start_transform.setIdentity();
loadTrackInfo();
} // Track
@@ -265,6 +266,9 @@
root->get("gravity", &m_gravity);
root->get("arena", &m_is_arena);
root->get("groups", &m_groups);
+
+ root->get("maxKartCount", &m_max_kart_count);
+
for(unsigned int i=0; i<root->getNumNodes(); i++)
{
const XMLNode *mode=root->getNode(i);
Modified: main/trunk/src/tracks/track.hpp
===================================================================
--- main/trunk/src/tracks/track.hpp 2010-08-06 13:59:03 UTC (rev 5727)
+++ main/trunk/src/tracks/track.hpp 2010-08-07 01:59:44 UTC (rev 5728)
@@ -155,6 +155,9 @@
/** List of all modes for a track. */
std::vector<TrackMode> m_all_modes;
+ /** Maximum number of karts that this track can sustain without them starting off-track */
+ int m_max_kart_count;
+
/** Name of the track to display. */
irr::core::stringw m_name;
bool m_use_fog;
@@ -294,6 +297,10 @@
const Vec3 &getStartPosition(unsigned int i) {return m_start_positions[i];}
/** Returns the heading of the i-th. start position. */
const float getStartHeading(unsigned int i) {return m_start_heading[i]; }
+
+ /** \return the maximum number of karts that this track can sustain without them starting off-track */
+ int getMaxKartCount() const { return m_max_kart_count; }
+
}; // class Track
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|