Ticket #8048: diggui.diff

scummvm/gui/gui.cpp

@@ -29 +29 @@
 #include "config-file.h"
 
 #include <ctype.h>
+#include <string.h>
 
 #define hline(x, y, x2, color) line(x, y, x2, y, color);
 #define vline(x, y, y2, color) line(x, y, x, y2, color);
@@ -931 +932 @@
 
         result = (char *)_s->getStringAddress(string);
 
+        if (result && *result == '/') {
+                result = strchr(result + 1, '/');
+                if (result != NULL)
+                        result++;
+        }
+        
         if (!result) {                                                                  // Gracelessly degrade to english :)
-                if (_s->_features & GF_AFTER_V6)
+                if (_s->_features & GF_AFTER_V7)
+                        return string_map_table_v7[stringno - 1].string;
+                else if (_s->_features & GF_AFTER_V6)
                         return string_map_table_v6[stringno - 1].string;
                 else
                         return string_map_table_v5[stringno - 1].string;

scummvm/gui/newgui.cpp

@@ -26 +26 @@
 #include "guimaps.h"
 #include "dialog.h"
 
+#include <string.h>
+
 /*
  * TODO list
  * - implement the missing / incomplete dialogs
@@ -281 +283 @@
 
         result = (char *)_s->getStringAddress(string);
 
+        if (result && *result == '/') {
+                result = strchr(result + 1, '/');
+                if (result)
+                        result++;
+        }
+
         if (!result) {                                                          // Gracelessly degrade to english :)
-                if (_s->_features & GF_AFTER_V6)
+                if (_s->_features & GF_AFTER_V7)
+                        return string_map_table_v7[stringno - 1].string;
+                else if (_s->_features & GF_AFTER_V6)
                         return string_map_table_v6[stringno - 1].string;
                 else
                         return string_map_table_v5[stringno - 1].string;