Moved supertuxkart branches to new directory.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/0.6.1a@3233 178a84e3-b1eb-0310-8ba1-8eac791a3b58

ChangeLog

@@ -1,3 +1,7 @@
+SuperTuxKart 0.6.1a (February 2009)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bugfix: battle mode would not display track groups.
+
 SuperTuxKart 0.6.1 (February 2009)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 * Added new kart ("Puffy"), new battle map ("Cave"), and new music

NEWS

@@ -1,3 +1,16 @@
+SuperTuxkart 0.6.1a (Feburary 2008)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bugfix: battle mode would not display track groups.
+
+SuperTuxkart 0.6.1 (Feburary 2008)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added new kart ("Puffy"), new battle map ("Cave"), and new music
+  for Snow Mountain.
+* Added slow-down for karts driving backwards.
+* Somewhat reduced 'shaking' of AI driven karts.
+* Fixed several bugs, including incorrect rescues, and track
+  and kart selection issues.
+
 SuperTuxKart 0.5 (May 2008)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 * Six new tracks and one improved track: Fort Magma, SnowTux Peak, Amazonian Journey, City, 

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autogen.sh to produce a configure script.
 
-AC_INIT(supertuxkart, 0.6.1)
+AC_INIT(supertuxkart, 0.6.1a)
 AC_CONFIG_SRCDIR([src/main.cpp])
 
 AC_PREREQ(2.61)

data/CREDITS

@@ -1,5 +1,5 @@
-Super TuxKart - 0.6.1
+Super TuxKart - 0.6.1a
-=====================
+======================
 Visit us at http://supertuxkart.sourceforge.net
 
 

src/bullet/Demos/OpenGL/GLDebugDrawer.cpp

@@ -48,7 +48,7 @@ void	GLDebugDrawer::draw3dText(const btVector3& location,const char* textString)
 
 void	GLDebugDrawer::reportErrorWarning(const char* warningString)
 {
-	printf(warningString);
+        printf("%s", warningString);
 }
 
 void	GLDebugDrawer::drawContactPoint(const btVector3& pointOnB,const btVector3& normalOnB,btScalar distance,int lifeTime,const btVector3& color)

src/grand_prix_data.cpp

@@ -52,7 +52,7 @@ GrandPrixData::GrandPrixData(const std::string filename)
     catch(std::exception& err)
     {
         fprintf(stderr, "Error while reading grandprix file '%s'\n", filename.c_str());
-        fprintf(stderr, err.what());
+        fprintf(stderr, "%s", err.what());
         fprintf(stderr, "\n");
     }
 

src/gui/track_sel.cpp

@@ -166,17 +166,16 @@ void TrackSel::updateScrollPosition()
 void TrackSel::switchGroup()
 {
     m_index_avail_tracks.clear();
-    bool group_available = 
+    bool is_battle_mode = RaceManager::isBattleMode(race_manager->getMinorMode());
-        (RaceManager::isBattleMode( race_manager->getMinorMode() ) 
+    bool group_available = is_battle_mode
-         ? track_manager->getArenasInGroup(user_config->m_track_group) 
+         ? track_manager->getArenasInGroup(user_config->m_track_group).size()>0 
-         : track_manager->getTracksInGroup(user_config->m_track_group)).size()>0;
+         : track_manager->getTracksInGroup(user_config->m_track_group).size()>0;
     if(!group_available)
         user_config->m_track_group = "standard";
 
-    const std::vector<int> &tracks = 
+    const std::vector<int> &tracks = is_battle_mode
-        RaceManager::isBattleMode( race_manager->getMinorMode() ) ?
+        ? track_manager->getArenasInGroup(user_config->m_track_group) 
-                            track_manager->getArenasInGroup(user_config->m_track_group) :
+        : track_manager->getTracksInGroup(user_config->m_track_group);
-                            track_manager->getTracksInGroup(user_config->m_track_group);
 
     for(unsigned int i=0; i<tracks.size(); i++)
     {
@@ -197,7 +196,9 @@ void TrackSel::switchGroup()
 
         // Check if there are any tracks available in this group - i.e. not only locked
         // tracks, and not only non-arena if arena mode (and vice versa).
-        const std::vector<int> &tracks_in_group = track_manager->getTracksInGroup(groups[i]);
+        const std::vector<int> &tracks_in_group = is_battle_mode
+            ? track_manager->getArenasInGroup(groups[i])
+            : track_manager->getTracksInGroup(groups[i]);
         bool ignore_group=true;
         for(unsigned int j=0; j<tracks_in_group.size(); j++)
         {
@@ -205,8 +206,7 @@ void TrackSel::switchGroup()
             // Locked tracks are not available
             if(unlock_manager->isLocked(track->getIdent())) continue;
             // Tracks of a different type are not available
-            ignore_group = RaceManager::isBattleMode(race_manager->getMinorMode()) !=
+            ignore_group = is_battle_mode != track->isArena();
-                           track->isArena();
             if(!ignore_group) break;
         }
 

src/highscore_manager.cpp

@@ -150,7 +150,7 @@ void HighscoreManager::Load()
     {
         fprintf(stderr, "Error while parsing highscore file '%s':\n", 
                 m_filename.c_str());
-        fprintf(stderr, err.what());
+        fprintf(stderr, "%s", err.what());
         fprintf(stderr, "\n");
         fprintf(stderr, "No old highscores will be available.\n");
     }
@@ -188,8 +188,7 @@ void HighscoreManager::Save()
     {
         printf("Problems saving highscores in '%s'\n",
                m_filename.c_str());
-        printf(e.what());
+        puts(e.what());
-        printf("\n");
         m_can_write=false;
     }
 }   // Save

src/ide/vc9/supertuxkart.vcproj

@@ -517,7 +517,7 @@
 				Optimization="0"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="../../../src;../../../src/bullet/src;"$(STK_INCLUDE)";../../../src/enet/include"
-				PreprocessorDefinitions="BT_NO_PROFILE;HAVE_OPENAL;HAVE_OGGVORBIS;_DEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"0.6.1\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;PACKAGE=\"supertuxkart\";HAVE_GETTEXT;ENABLE_NLS;HAVE_GLUT"
+				PreprocessorDefinitions="BT_NO_PROFILE;HAVE_OPENAL;HAVE_OGGVORBIS;_DEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"0.6.1a\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;PACKAGE=\"supertuxkart\";HAVE_GETTEXT;ENABLE_NLS;HAVE_GLUT"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -605,7 +605,7 @@
 				Name="VCCLCompilerTool"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../../../src;../../../src/bullet/src;"$(STK_INCLUDE)";../../../src/enet/include"
-				PreprocessorDefinitions="HAVE_OPENAL;HAVE_OGGVORBIS;NDEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"0.6.1\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;BT_NO_PROFILE;PACKAGE=\"supertuxkart\";HAVE_GETTEXT;ENABLE_NLS;HAVE_GLUT"
+				PreprocessorDefinitions="HAVE_OPENAL;HAVE_OGGVORBIS;NDEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"0.6.1a\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;BT_NO_PROFILE;PACKAGE=\"supertuxkart\";HAVE_GETTEXT;ENABLE_NLS;HAVE_GLUT"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

src/karts/kart_properties.cpp

@@ -117,8 +117,7 @@ void KartProperties::load(const std::string &filename, const std::string &node,
     {
         fprintf(stderr, "Error while parsing KartProperties '%s':\n", 
                 filename.c_str());
-        fprintf(stderr, err.what());
+        fprintf(stderr, "%s\n", err.what());
-        fprintf(stderr, "\n");
     }
     delete root;
 

src/main.cpp

@@ -622,7 +622,7 @@ int main(int argc, char *argv[] )
     }  // try
     catch (std::exception &e)
     {
-        fprintf(stderr,e.what());
+        fprintf(stderr,"%s",e.what());
         fprintf(stderr,"\nAborting SuperTuxKart\n");
     }
 

src/stk_config.cpp

@@ -58,7 +58,7 @@ void STKConfig::load(const std::string &filename)
     {
         fprintf(stderr, "Error while parsing KartProperties '%s':\n", 
                 filename.c_str());
-        fprintf(stderr, err.what());
+        fprintf(stderr, "%s", err.what());
         fprintf(stderr, "\n");
     }
     delete root;

src/user_config.cpp

@@ -514,7 +514,7 @@ void UserConfig::loadConfig(const std::string& filename)
     catch(std::exception& e)
     {
         fprintf(stderr, "Error while parsing config '%s':\n", filename.c_str());
-        fprintf(stderr,  e.what());
+        fprintf(stderr, "%s", e.what());
         fprintf(stderr, "\n");
     }
 
@@ -786,7 +786,7 @@ void UserConfig::saveConfig(const std::string& filename)
     catch(std::exception& e)
     {
         fprintf(stderr, "Couldn't write config: ");
-        fprintf(stderr, e.what());
+        fprintf(stderr, "%s",e.what());
         fprintf(stderr, "\n");
     }