From ccb92ebfee9829ff85deeacbe4f8c01e476fd2e8 Mon Sep 17 00:00:00 2001 From: Sven Hesse Date: Sat, 13 Jun 2009 22:10:55 +0000 Subject: [PATCH] Making TotTextData's item's offsets unsigned. This could fix the crash in the Polish Woodruff version (bug #2804962) svn-id: r41497 --- engines/gob/draw_v2.cpp | 2 +- engines/gob/game.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/gob/draw_v2.cpp b/engines/gob/draw_v2.cpp index 4bb8120e3ab..40ae45a1f85 100644 --- a/engines/gob/draw_v2.cpp +++ b/engines/gob/draw_v2.cpp @@ -207,7 +207,7 @@ void Draw_v2::printTotText(int16 id) { if (!_vm->_game->_totTextData || !_vm->_game->_totTextData->dataPtr || (id >= _vm->_game->_totTextData->itemsCount) || - (_vm->_game->_totTextData->items[id].offset == -1) || + (_vm->_game->_totTextData->items[id].offset == 0xFFFF) || (_vm->_game->_totTextData->items[id].size == 0)) return; diff --git a/engines/gob/game.h b/engines/gob/game.h index 3264288a324..6e87d8cdd0f 100644 --- a/engines/gob/game.h +++ b/engines/gob/game.h @@ -51,7 +51,7 @@ public: #define szGame_TotTextItem (2 + 2) struct TotTextItem { - int16 offset; + uint16 offset; int16 size; } PACKED_STRUCT;