SDL: handle DOS mode settings.txt

Author: chrisws

src/platform/sdl/settings.cpp

@@ -76,7 +76,9 @@ FILE *openConfig(const char *flags, bool debug) {
 int nextInteger(FILE *fp, int def) {
   int result = 0;
   for (int c = fgetc(fp); c != EOF && c != ',' && c != '\n'; c = fgetc(fp)) {
-    result = (result * 10) + (c - '0');
+    if (c != '\r') {
+      result = (result * 10) + (c - '0');
+    }
   }
   if (!result) {
     result = def;
@@ -90,8 +92,10 @@ int nextInteger(FILE *fp, int def) {
 int nextHex(FILE *fp, int def) {
   int result = 0;
   for (int c = fgetc(fp); c != EOF && c != ',' && c != '\n'; c = fgetc(fp)) {
-    int val = (c >= 'a') ? (10 + (c - 'a')) : (c - '0');
-    result = (result * 16) + val;
+    if (c != '\r') {
+      int val = (c >= 'a') ? (10 + (c - 'a')) : (c - '0');
+      result = (result * 16) + val;
+    }
   }
   if (!result) {
     result = def;
@@ -106,7 +110,7 @@ int nextString(FILE *fp) {
   int pos = ftell(fp);
   int len = 0;
   for (int c = fgetc(fp); c != EOF; c = fgetc(fp)) {
-    if (c == '\n') {
+    if (c == '\n' || c == '\r') {
       if (len > 0) {
         // string terminator
         break;

src/ui/textedit.cpp

@@ -40,7 +40,7 @@
 #define strcasestr StrStrI
 #endif
 
-int g_themeId = 0;
+unsigned g_themeId = 0;
 int g_lineMarker[MAX_MARKERS] = {
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
 };
@@ -136,6 +136,9 @@ int compareIntegers(const void *p1, const void *p2) {
 // EditTheme
 //
 EditTheme::EditTheme() {
+  if (g_themeId >= (sizeof(themes) / sizeof(themes[0]))) {
+    g_themeId = 0;
+  }
   selectTheme(themes[g_themeId]);
 }
 

src/ui/textedit.h

@@ -23,7 +23,7 @@
 #include "common/smbas.h"
 #include "common/keymap.h"
 
-extern int g_themeId;
+extern unsigned g_themeId;
 extern int g_user_theme[];
 #define THEME_COLOURS 17