diff options
| author | Max Horn | 2009-12-08 20:44:57 +0000 |
|---|---|---|
| committer | Max Horn | 2009-12-08 20:44:57 +0000 |
| commit | 5f178e86500b93d6d0c5fb65ce2908522319e703 (patch) | |
| tree | da02f7959a15224fc94849bff02935b74c69f1fd /engines | |
| parent | 923cbff625f91c5afc6163813852e9a58ed43912 (diff) | |
| download | scummvm-rg350-5f178e86500b93d6d0c5fb65ce2908522319e703.tar.gz scummvm-rg350-5f178e86500b93d6d0c5fb65ce2908522319e703.tar.bz2 scummvm-rg350-5f178e86500b93d6d0c5fb65ce2908522319e703.zip | |
Fix some MSVC warnings (part of patch #2909981)
svn-id: r46291
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/gob/draw.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/hotspots.cpp | 4 | ||||
| -rw-r--r-- | engines/groovie/cell.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gui/gui_text.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/resource.cpp | 5 |
5 files changed, 8 insertions, 8 deletions
diff --git a/engines/gob/draw.cpp b/engines/gob/draw.cpp index 2e86608e62..deadd5c682 100644 --- a/engines/gob/draw.cpp +++ b/engines/gob/draw.cpp @@ -815,7 +815,7 @@ void Draw::handleWinBorder(int16 id) { } int16 Draw::handleCurWin() { - int8 matchNum; + int8 matchNum = 0; int16 bestMatch = -1; warning("handleCurWin"); diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp index 896e10c259..004661244f 100644 --- a/engines/gob/hotspots.cpp +++ b/engines/gob/hotspots.cpp @@ -1606,8 +1606,8 @@ void Hotspots::evaluate() { int16 Hotspots::findCursor(uint16 x, uint16 y) const { int16 cursor = 0; - int16 deltax; - int16 deltay; + int16 deltax = 0; + int16 deltay = 0; if ( _vm->getGameType() == kGameTypeFascination ) { cursor = curWindow(deltax, deltay); diff --git a/engines/groovie/cell.cpp b/engines/groovie/cell.cpp index 57061c17de..270df480e4 100644 --- a/engines/groovie/cell.cpp +++ b/engines/groovie/cell.cpp @@ -749,7 +749,7 @@ int16 CellGame::doGame(int8 color, int depth) { const int8 depths[] = { 1, 1, 1, 2, 1, 1, 2, 2, 1, 2, 2, 2, 3, 2, 2, 3, 3, 2, 3, 3, 3 }; int16 CellGame::calcMove(int8 color, uint16 depth) { - int result; + int result = 0; _flag1 = false; ++_moveCount; diff --git a/engines/sci/gui/gui_text.cpp b/engines/sci/gui/gui_text.cpp index bfbf9f29d4..21e92f9617 100644 --- a/engines/sci/gui/gui_text.cpp +++ b/engines/sci/gui/gui_text.cpp @@ -355,7 +355,8 @@ void SciGuiText::Show(const char *text, int16 from, int16 len, GuiResourceId org // Draws a text in rect. void SciGuiText::Box(const char *text, int16 bshow, const Common::Rect &rect, GuiTextAlignment alignment, GuiResourceId fontId) { - int16 textWidth, textHeight, charCount, offset; + int16 textWidth, textHeight, charCount; + int16 offset = 0; int16 hline = 0; GuiResourceId orgFontId = GetFontId(); int16 orgPenColor = _gfx->_curPort->penClr; diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 493c56560a..f610252f27 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -955,10 +955,9 @@ void ResourceManager::readResourcePatches(ResourceSource *source) { Common::String mask, name; Common::ArchiveMemberList files; - int number; + int number = -1; const char *szResType; ResourceSource *psrcPatch; - bool bAdd; for (int i = kResourceTypeView; i < kResourceTypeAudio36; i ++) { files.clear(); @@ -972,7 +971,7 @@ void ResourceManager::readResourcePatches(ResourceSource *source) { mask += resourceTypeSuffixes[i]; SearchMan.listMatchingMembers(files, mask); for (Common::ArchiveMemberList::const_iterator x = files.begin(); x != files.end(); x++) { - bAdd = false; + bool bAdd = false; name = (*x)->getName(); // SCI1 scheme if (isdigit(name[0])) { |