[Scummvm-git-logs] scummvm master -> df3c64a9ef6784fc14a1afd9f9123ccbe2b5e270

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
df3c64a9ef GLK: COMPREHEND: Properly offset the _strings2 array for OO-Topos


Commit: df3c64a9ef6784fc14a1afd9f9123ccbe2b5e270
    https://github.com/scummvm/scummvm/commit/df3c64a9ef6784fc14a1afd9f9123ccbe2b5e270
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-10-21T22:19:46-07:00

Commit Message:
GLK: COMPREHEND: Properly offset the _strings2 array for OO-Topos

Changed paths:
    engines/glk/comprehend/game_data.cpp


diff --git a/engines/glk/comprehend/game_data.cpp b/engines/glk/comprehend/game_data.cpp
index 9f2c4ed679..c8922859e0 100644
--- a/engines/glk/comprehend/game_data.cpp
+++ b/engines/glk/comprehend/game_data.cpp
@@ -668,7 +668,11 @@ void GameData::load_extra_string_file(const StringFile &stringFile) {
 
 void GameData::load_extra_string_files() {
 	_strings2.clear();
-	_strings2.reserve(STRING_FILE_COUNT * _stringFiles.size());
+	_strings2.reserve(STRING_FILE_COUNT * _stringFiles.size() + 1);
+
+	// TODO: Is this needed for other than OO-Topos?
+	if (_comprehendVersion == 2)
+		_strings2.push_back("");
 
 	for (uint i = 0; i < _stringFiles.size(); i++)
 		load_extra_string_file(_stringFiles[i]);