diff options
| author | Paul Gilbert | 2011-04-30 20:38:41 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2011-04-30 20:38:41 +1000 |
| commit | d673fbc6a84358840d5f91774aea9fe48b4477f6 (patch) | |
| tree | 8ca461cbd9a3aa77d1127917013235cdf00dba4e | |
| parent | 9f37451e014e7f0312051f20196facd10a9e1ce6 (diff) | |
| download | scummvm-rg350-d673fbc6a84358840d5f91774aea9fe48b4477f6.tar.gz scummvm-rg350-d673fbc6a84358840d5f91774aea9fe48b4477f6.tar.bz2 scummvm-rg350-d673fbc6a84358840d5f91774aea9fe48b4477f6.zip | |
TSAGE: Silenced compiler warnings
| -rw-r--r-- | engines/tsage/core.cpp | 1 | ||||
| -rw-r--r-- | engines/tsage/dialogs.cpp | 2 | ||||
| -rw-r--r-- | engines/tsage/resources.cpp | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index 2144dd1cb4..3196499fa1 100644 --- a/engines/tsage/core.cpp +++ b/engines/tsage/core.cpp @@ -557,7 +557,6 @@ void PlayerMover::pathfind(Common::Point *routeList, Common::Point srcPos, Commo } while (routeRegions[++idx] != destRegion); tempList[idx] = 1; - idx = 0; for (int listIndex = 1; listIndex <= endIndex; ++listIndex) { int var10 = tempList[listIndex]; int var12 = tempList[listIndex + 1]; diff --git a/engines/tsage/dialogs.cpp b/engines/tsage/dialogs.cpp index 7be1c8840a..b9ad7b025f 100644 --- a/engines/tsage/dialogs.cpp +++ b/engines/tsage/dialogs.cpp @@ -487,7 +487,7 @@ void InventoryDialog::execute() { if (!event.handled && event.eventType == EVENT_KEYPRESS) { if ((event.kbd.keycode == Common::KEYCODE_RETURN) || (event.kbd.keycode == Common::KEYCODE_ESCAPE)) { // Exit the dialog - hiliteObj = &_btnOk; + //hiliteObj = &_btnOk; break; } } diff --git a/engines/tsage/resources.cpp b/engines/tsage/resources.cpp index 5320a573b2..4a188c12f7 100644 --- a/engines/tsage/resources.cpp +++ b/engines/tsage/resources.cpp @@ -239,6 +239,9 @@ byte *TLib::getResource(uint16 id, bool suppressErrors) { uint16 word_48050 = 0, currentToken = 0, word_48054 =0; byte byte_49068 = 0, byte_49069 = 0; DecodeReference table[0x1000]; + for (int i = 0; i < 0x1000; ++i) { + table[i].vByte = table[i].vWord = 0; + } Common::Stack<uint16> tokenList; for (;;) { |