Ticket #8897: r33084-cine-bss_size_reduction.patch

engines/cine/cine.h

@@ -94 +94 @@
 
         Common::StringList _volumeResourceFiles;
         StringPtrHashMap _volumeEntriesMap;
+        TextHandler _textHandler;
 
 private:
         void initialize(void);

engines/cine/texte.h

@@ -34 +34 @@
 typedef char CommandeType[20];
 
 extern byte *textDataPtr;
-extern byte textTable[256][2][16 * 8];
 
+struct TextHandler {
+        byte textTable[256][2][16 * 8];
+};
+
 extern const char **failureMessages;
 extern const CommandeType *defaultActionCommand;
 extern const CommandeType *systemMenu;

engines/cine/gfx.cpp

@@ -337 +337 @@
                 x += 5;
         } else if ((width = fontParamTable[(unsigned char)character].characterWidth)) {
                 idx = fontParamTable[(unsigned char)character].characterIdx;
-                drawSpriteRaw(textTable[idx][0], textTable[idx][1], 16, 8, _backBuffer, x, y);
+                drawSpriteRaw(g_cine->_textHandler.textTable[idx][0], g_cine->_textHandler.textTable[idx][1], 16, 8, _backBuffer, x, y);
                 x += width + 1;
         }
 
@@ -938 +938 @@
                 x += 5;
         } else if ((width = fontParamTable[(unsigned char)character].characterWidth)) {
                 idx = fontParamTable[(unsigned char)character].characterIdx;
-                drawSpriteRaw2(textTable[idx][0], 0, 16, 8, _backBuffer, x, y);
+                drawSpriteRaw2(g_cine->_textHandler.textTable[idx][0], 0, 16, 8, _backBuffer, x, y);
                 x += width + 1;
         }
 

engines/cine/texte.cpp

@@ -31 +31 @@
 
 byte *textDataPtr;
 
-byte textTable[256][2][16 * 8];
-
 const char **failureMessages;
 const CommandeType *defaultActionCommand;
 const CommandeType *systemMenu;
@@ -77 +75 @@
                 loadRelatedPalette(pFileName);
 
                 for (i = 0; i < numCharacters; i++) {
-                        gfxConvertSpriteToRaw(textTable[i][0], tempBuffer, 16, 8);
-                        generateMask(textTable[i][0], textTable[i][1], 16 * 8, 0);
+                        gfxConvertSpriteToRaw(g_cine->_textHandler.textTable[i][0], tempBuffer, 16, 8);
+                        generateMask(g_cine->_textHandler.textTable[i][0], g_cine->_textHandler.textTable[i][1], 16 * 8, 0);
                         tempBuffer += dataSize;
                 }
         } else {
                 for (i = 0; i < 90; i++) {
-                        gfxConvertSpriteToRaw(textTable[i][0], tempBuffer, 8, 8);
-                        generateMask(textTable[i][0], textTable[i][1], 8 * 8, 0);
+                        gfxConvertSpriteToRaw(g_cine->_textHandler.textTable[i][0], tempBuffer, 8, 8);
+                        generateMask(g_cine->_textHandler.textTable[i][0], g_cine->_textHandler.textTable[i][1], 8 * 8, 0);
                         tempBuffer += 0x40;
                 }
         }