1 files changed, 17 insertions, 6 deletions
diff --git a/engines/agi/words.cpp b/engines/agi/words.cpp
index 9c5b3d349a..f423995de8 100644
--- a/engines/agi/words.cpp
+++ b/engines/agi/words.cpp
@@ -93,14 +93,25 @@ int AgiEngine::loadWords(const char *fname) {
 			} while (!(c & 0x80) && k < (int)sizeof(str) - 1);
 			str[k] = 0;
 
-			// And store it in our internal dictionary
-			AgiWord *w = new AgiWord;
-			w->word = myStrndup(str, k);
-			w->id = fp.readUint16BE();
-			_game.words[i].push_back(w);
+			// WORKAROUND:
+			// The SQ0 fan game stores words starting with numbers (like '7up')
+			// in its dictionary under the 'a' entry. We skip these.
+			// See bug #3615061
+			if (str[0] == 'a' + i) {
+				// And store it in our internal dictionary
+				AgiWord *w = new AgiWord;
+				w->word = myStrndup(str, k);
+				w->id = fp.readUint16BE();
+				_game.words[i].push_back(w);
+			}
+
+			k = fp.readByte();
 
 			// Are there more words with an already known prefix?
-			if (!(k = fp.readByte()))
+			// WORKAROUND: We only break after already seeing words with the
+			// right prefix, for the SQ0 words starting with digits filed under
+			// 'a'. See above comment and bug #3615061.
+			if (k == 0 && str[0] >= 'a' + i)
 				break;
 		}
 	}