[Supertuxkart-commit] SF.net SVN: supertuxkart:[5943] main/trunk/src/states_screens/ kart_selection.cpp

[<hik...@us...>]

Revision: 5943
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=5943&view=rev
Author:   hikerstk
Date:     2010-09-09 03:24:34 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
Improved handling if default (i.e. previously selected) kart
can not be found. Now stk will only abort if no kart at all
can be found, otherwise use the first kart in the kart 
properties list.

Modified Paths:
--------------
    main/trunk/src/states_screens/kart_selection.cpp

Modified: main/trunk/src/states_screens/kart_selection.cpp
===================================================================
--- main/trunk/src/states_screens/kart_selection.cpp	2010-09-09 01:46:05 UTC (rev 5942)
+++ main/trunk/src/states_screens/kart_selection.cpp	2010-09-09 03:24:34 UTC (rev 5943)
@@ -301,8 +301,18 @@
         const KartProperties* props = kart_properties_manager->getKart(default_kart);
         if(!props)
         {
-            fprintf(stderr, "Can't find default kart '%s' - aborting.\n", 
-                    default_kart.c_str());
+            // If the default kart can't be found (e.g. previously a addon 
+            // kart was used, but the addon package was removed, use the
+            // first kart as a default. This way we don't have to hardcode
+            // any kart names.
+            props = kart_properties_manager->getKartById(0);
+            if(!props)
+            {
+                fprintf(stderr, 
+                        "Can't find default kart '%s' nor any other kart.\n",
+                        default_kart.c_str());
+                exit(-1);
+            }
         }
 
         KartModel* kartModel = props->getKartModel();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.