[Scummvm-cvs-logs] scummvm master -> 4007a6973a63ad5a8510b1f5c3f28a5dc868ca81

sev- sev at scummvm.org
Wed Apr 20 08:10:21 CEST 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4007a6973a WAGE: Fix warnings


Commit: 4007a6973a63ad5a8510b1f5c3f28a5dc868ca81
    https://github.com/scummvm/scummvm/commit/4007a6973a63ad5a8510b1f5c3f28a5dc868ca81
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-20T08:10:00+02:00

Commit Message:
WAGE: Fix warnings

Changed paths:
    engines/wage/debugger.cpp
    engines/wage/macwindow.cpp
    engines/wage/macwindowmanager.cpp
    engines/wage/wage.cpp



diff --git a/engines/wage/debugger.cpp b/engines/wage/debugger.cpp
index 7d01b0b..d34aca7 100644
--- a/engines/wage/debugger.cpp
+++ b/engines/wage/debugger.cpp
@@ -56,7 +56,7 @@ static int strToInt(const char *s) {
 }
 
 bool Debugger::Cmd_ListScenes(int argc, const char **argv) {
-	int currentScene;
+	int currentScene = 0;
 
 	for (uint i = 1; i < _engine->_world->_orderedScenes.size(); i++) { // #0 is STORAGE@
 		if (_engine->_world->_player->_currentScene == _engine->_world->_orderedScenes[i])
diff --git a/engines/wage/macwindow.cpp b/engines/wage/macwindow.cpp
index 1b869fa..f629e3e 100644
--- a/engines/wage/macwindow.cpp
+++ b/engines/wage/macwindow.cpp
@@ -57,6 +57,7 @@ namespace Wage {
 MacWindow::MacWindow(int id, bool scrollable) : _scrollable(scrollable), _id(id) {
 	_active = false;
 	_borderIsDirty = true;
+	_contentIsDirty = true;
 
 	_highlightedPart = kBorderNone;
 
diff --git a/engines/wage/macwindowmanager.cpp b/engines/wage/macwindowmanager.cpp
index 3fbd156..8ce39b2 100644
--- a/engines/wage/macwindowmanager.cpp
+++ b/engines/wage/macwindowmanager.cpp
@@ -62,6 +62,8 @@ MacWindowManager::MacWindowManager() {
     _screen = 0;
     _lastId = 0;
     _activeWindow = -1;
+
+	_fullRefresh = true;
 }
 
 MacWindowManager::~MacWindowManager() {
diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index 73794f7..278badd 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -86,6 +86,7 @@ WageEngine::WageEngine(OSystem *syst, const ADGameDescription *desc) : Engine(sy
 	_offer = NULL;
 
 	_resManager = NULL;
+	_debugger = NULL;
 
 	debug("WageEngine::WageEngine()");
 }






More information about the Scummvm-git-logs mailing list