thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some MSVC warnings (part of patch #2909981)

Browse source 
svn-id: r46291
This commit is contained in:
Max Horn 2009-12-08 20:44:57 +00:00
parent 923cbff625
commit 5f178e8650
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/gob/draw.cpp
View file

@ -815,7 +815,7 @@ void Draw::handleWinBorder(int16 id) {
} }
int16 Draw::handleCurWin() { int16 Draw::handleCurWin() {
int8 matchNum; int8 matchNum = 0;
int16 bestMatch = -1; int16 bestMatch = -1;
warning("handleCurWin"); warning("handleCurWin");

4
engines/gob/hotspots.cpp
View file

@ -1606,8 +1606,8 @@ void Hotspots::evaluate() {
int16 Hotspots::findCursor(uint16 x, uint16 y) const { int16 Hotspots::findCursor(uint16 x, uint16 y) const {
int16 cursor = 0; int16 cursor = 0;
int16 deltax; int16 deltax = 0;
int16 deltay; int16 deltay = 0;
if ( _vm->getGameType() == kGameTypeFascination ) { if ( _vm->getGameType() == kGameTypeFascination ) {
cursor = curWindow(deltax, deltay); cursor = curWindow(deltax, deltay);

2
engines/groovie/cell.cpp
View file

@ -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 }; 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) { int16 CellGame::calcMove(int8 color, uint16 depth) {
int result; int result = 0;
_flag1 = false; _flag1 = false;
++_moveCount; ++_moveCount;

3
engines/sci/gui/gui_text.cpp
View file

@ -355,7 +355,8 @@ void SciGuiText::Show(const char *text, int16 from, int16 len, GuiResourceId org
// Draws a text in rect. // Draws a text in rect.
void SciGuiText::Box(const char *text, int16 bshow, const Common::Rect &rect, GuiTextAlignment alignment, GuiResourceId fontId) { 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; int16 hline = 0;
GuiResourceId orgFontId = GetFontId(); GuiResourceId orgFontId = GetFontId();
int16 orgPenColor = _gfx->_curPort->penClr; int16 orgPenColor = _gfx->_curPort->penClr;

5
engines/sci/resource.cpp
View file

@ -955,10 +955,9 @@ void ResourceManager::readResourcePatches(ResourceSource *source) {
Common::String mask, name; Common::String mask, name;
Common::ArchiveMemberList files; Common::ArchiveMemberList files;
int number; int number = -1;
const char *szResType; const char *szResType;
ResourceSource *psrcPatch; ResourceSource *psrcPatch;
bool bAdd;
for (int i = kResourceTypeView; i < kResourceTypeAudio36; i ++) { for (int i = kResourceTypeView; i < kResourceTypeAudio36; i ++) {
files.clear(); files.clear();
@ -972,7 +971,7 @@ void ResourceManager::readResourcePatches(ResourceSource *source) {
mask += resourceTypeSuffixes[i]; mask += resourceTypeSuffixes[i];
SearchMan.listMatchingMembers(files, mask); SearchMan.listMatchingMembers(files, mask);
for (Common::ArchiveMemberList::const_iterator x = files.begin(); x != files.end(); x++) { for (Common::ArchiveMemberList::const_iterator x = files.begin(); x != files.end(); x++) {
bAdd = false; bool bAdd = false;
name = (*x)->getName(); name = (*x)->getName();
// SCI1 scheme // SCI1 scheme
if (isdigit(name[0])) { if (isdigit(name[0])) {