From 46257f7bb47938e02382d4ddc2670ed6904e7914 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sat, 20 Dec 2008 14:24:14 +0000 Subject: TOLTECS: Silenced MSVC warnings --- engines/toltecs/palette.cpp | 2 +- engines/toltecs/screen.cpp | 4 ++-- engines/toltecs/script.cpp | 2 +- engines/toltecs/segmap.cpp | 2 +- engines/toltecs/sprite.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'engines/toltecs') diff --git a/engines/toltecs/palette.cpp b/engines/toltecs/palette.cpp index 4d0f13f404..23ce3d8dd3 100644 --- a/engines/toltecs/palette.cpp +++ b/engines/toltecs/palette.cpp @@ -157,7 +157,7 @@ void Palette::buildColorTransTable(byte limit, char deltaValue, byte mask) { // TODO - byte r, g, b; + byte r = 0, g = 0, b = 0; mask &= 7; diff --git a/engines/toltecs/screen.cpp b/engines/toltecs/screen.cpp index 363a6f20d4..47c852dcfc 100644 --- a/engines/toltecs/screen.cpp +++ b/engines/toltecs/screen.cpp @@ -293,7 +293,7 @@ void Screen::updateVerbLine(int16 slotIndex, int16 slotOffset) { } GuiTextWrapState wrapState; - int16 len; + int16 len = 0; wrapState.width = 0; wrapState.destString = wrapState.textBuffer; wrapState.len1 = 0; @@ -310,7 +310,7 @@ void Screen::updateVerbLine(int16 slotIndex, int16 slotOffset) { } if (_verbLineCount != 1) { - int16 charWidth; + int16 charWidth = 0; if (*wrapState.sourceString < 0xF0) { while (*wrapState.sourceString > 0x20 && *wrapState.sourceString < 0xF0 && len > 0) { byte ch = *wrapState.sourceString--; diff --git a/engines/toltecs/script.cpp b/engines/toltecs/script.cpp index a278ad53a7..2433a1a554 100644 --- a/engines/toltecs/script.cpp +++ b/engines/toltecs/script.cpp @@ -433,7 +433,7 @@ void ScriptInterpreter::execKernelOpcode(uint16 kernelOpcode) { { debug(0, "o2_setGameVar(%d, %d)", arg16(3), arg16(5)); VarType varType = getGameVarType(arg16(3)); - int16 value; + int16 value = 0; if (varType == vtByte) value = arg8(5); else if (varType == vtWord) diff --git a/engines/toltecs/segmap.cpp b/engines/toltecs/segmap.cpp index ec9d021260..4647f79388 100644 --- a/engines/toltecs/segmap.cpp +++ b/engines/toltecs/segmap.cpp @@ -158,7 +158,7 @@ void SegmentMap::adjustPathPoint(int16 &x, int16 &y) { return; uint32 minDistance = 0xFFFFFFFF, distance; - int16 adjustedX, adjustedY, x2, y2; + int16 adjustedX = 0, adjustedY = 0, x2, y2; for (int16 rectIndex = 0; rectIndex < (int16)_pathRects.size(); rectIndex++) { diff --git a/engines/toltecs/sprite.cpp b/engines/toltecs/sprite.cpp index 4e5af5f293..264216daf2 100644 --- a/engines/toltecs/sprite.cpp +++ b/engines/toltecs/sprite.cpp @@ -103,7 +103,7 @@ public: _scalerStatus = 0; } SpriteReaderStatus readPacket(PixelPacket &packet) { - SpriteReaderStatus status; + SpriteReaderStatus status = kSrsPixelsLeft; if (_scalerStatus == 0) { _xerror = _sprite->xdelta; _yerror -= 100; -- cgit v1.2.3