diff options
| author | Filippos Karapetis | 2011-10-09 19:56:17 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2011-10-09 19:56:51 +0300 |
| commit | 90a11586e21d06c150f98842a62f2a5ae7857bb5 (patch) | |
| tree | e128ecdf8436d67dfd680254fff0052cc750d0d1 /engines/sci/graphics/text32.cpp | |
| parent | d8da625e5ed4fb8c3ec7de32541181c032963072 (diff) | |
| download | scummvm-rg350-90a11586e21d06c150f98842a62f2a5ae7857bb5.tar.gz scummvm-rg350-90a11586e21d06c150f98842a62f2a5ae7857bb5.tar.bz2 scummvm-rg350-90a11586e21d06c150f98842a62f2a5ae7857bb5.zip | |
SCI: CreateTextBitmap should return a pointer. Also, silenced a warning
Diffstat (limited to 'engines/sci/graphics/text32.cpp')
| -rw-r--r-- | engines/sci/graphics/text32.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp index 6ec1261a88..7be3874ed0 100644 --- a/engines/sci/graphics/text32.cpp +++ b/engines/sci/graphics/text32.cpp @@ -56,7 +56,7 @@ void GfxText32::purgeCache() { _textCache.clear(); } -void GfxText32::createTextBitmap(reg_t textObject, uint16 maxWidth, uint16 maxHeight) { +reg_t GfxText32::createTextBitmap(reg_t textObject, uint16 maxWidth, uint16 maxHeight) { if (_textCache.size() >= MAX_CACHED_TEXTS) purgeCache(); @@ -71,6 +71,9 @@ void GfxText32::createTextBitmap(reg_t textObject, uint16 maxWidth, uint16 maxHe } _textCache[textId] = createTextEntry(textObject, maxWidth, maxHeight); + + // TODO: Create a new hunk pointer with the created surface + return NULL_REG; } // TODO: Finish this! @@ -176,7 +179,7 @@ TextEntry *GfxText32::createTextEntry(reg_t textObject, uint16 maxWidth, uint16 memset(newEntry->surface, 0, newEntry->width * newEntry->height); newEntry->text = _segMan->getString(stringObject); - int16 maxTextWidth = 0, charCount = 0; + int16 /*maxTextWidth = 0,*/ charCount = 0; uint16 curX = 0, curY = 0; while (*text) { |