[Tux4kids-commits] r1645 - tuxtype/trunk/src

[Matthew Trey]

Author: treymd-guest
Date: 2009-11-14 00:31:57 +0000 (Sat, 14 Nov 2009)
New Revision: 1645

Modified:
   tuxtype/trunk/src/setup.c
Log:
Turned on theme saving for now

Modified: tuxtype/trunk/src/setup.c
===================================================================
--- tuxtype/trunk/src/setup.c	2009-11-10 10:46:51 UTC (rev 1644)
+++ tuxtype/trunk/src/setup.c	2009-11-14 00:31:57 UTC (rev 1645)
@@ -248,20 +248,20 @@
 
     DEBUGCODE {fprintf(stderr, "%s = %s", setting, value );}
       //For now we are not reading or saving the language selection: 
-//    if (strncmp( setting, "lang", FNLEN ) == 0 )
-//    {
-//      DEBUGCODE {fprintf(stderr, "LoadSettings: Setting language to %s\n", value);}
-//      strncpy(settings.lang, value, FNLEN - 1);
-//      setting_found = 1;
-//      SetupPaths(value); /* Does this really belong here? */ 
-//    }
-//    else
-    if (strncmp( setting, "o_lives", FNLEN ) == 0 )
+      //MDTTEMP: uncommented the following 8 lines and joined the else to the if on line 259
+    if (strncmp( setting, "lang", FNLEN ) == 0 )
     {
+      DEBUGCODE {fprintf(stderr, "LoadSettings: Setting language to %s\n", value);}
+      strncpy(settings.lang, value, FNLEN - 1);
+      setting_found = 1;
+      SetupPaths(value); /* Does this really belong here? */ 
+    }
+    else if (strncmp( setting, "o_lives", FNLEN ) == 0 )
+    {
       DEBUGCODE {fprintf(stderr, "LoadSettings: Setting lives to %s\n", value);}
       settings.o_lives = atoi(value);
       setting_found = 1;
-   }
+    }
     else if (strncmp( setting, "mus_volume", FNLEN ) == 0 )
     {
       DEBUGCODE {fprintf(stderr, "LoadSettings: Setting music volume to %s\n", value);}
@@ -349,8 +349,9 @@
 	/* Save all the settings here! */
 //NOTE for now, don't save theme because things get screwed up if the language
 // doesn't match the LANG environmental variable - DSB
-//	if (strncmp(settings.theme_name, "", FNLEN) != 0)
-//		fprintf( settingsFile, "lang=%s\n", settings.theme_name );
+// MDTTEMP: uncommented the following 2 lines
+	if (strncmp(settings.theme_name, "", FNLEN) != 0)
+		fprintf( settingsFile, "lang=%s\n", settings.theme_name );
 	if (settings.o_lives > 9)
 		fprintf( settingsFile, "o_lives=%d\n", settings.o_lives );