[Scummvm-cvs-logs] scummvm master -> 9cd4769c8a3f70ad17f210e4c9717693832db8c6

bluegr bluegr at gmail.com
Tue Feb 23 23:12:33 CET 2016


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

Summary:
a229edaea8 WAGE: Silence false positive MSVC warnings
9cd4769c8a WAGE: Fix compilation with MSVC


Commit: a229edaea82c69e6d476290edb3b31e6279bf7a3
    https://github.com/scummvm/scummvm/commit/a229edaea82c69e6d476290edb3b31e6279bf7a3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-02-24T00:10:48+02:00

Commit Message:
WAGE: Silence false positive MSVC warnings

Changed paths:
    engines/wage/gui.cpp



diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index 9c80435..26af5f6 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -311,7 +311,7 @@ const int arrowPixels[ARROW_H][ARROW_W] = {
 		{1,1,1,1,1,1,1,1,1,1,1,1}};
 
 void Gui::paintBorder(Graphics::Surface *g, Common::Rect &r, WindowType windowType) {
-	bool active, scrollable, closeable, closeBoxPressed, drawTitle;
+	bool active = false, scrollable = false, closeable = false, closeBoxPressed = false, drawTitle = false;
 	const int size = kBorderWidth;
 	int x = r.left - size;
 	int y = r.top - size;


Commit: 9cd4769c8a3f70ad17f210e4c9717693832db8c6
    https://github.com/scummvm/scummvm/commit/9cd4769c8a3f70ad17f210e4c9717693832db8c6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-02-24T00:10:48+02:00

Commit Message:
WAGE: Fix compilation with MSVC

Including EventRecorder.h directly in the engine has the odd side
effect of including winnt.h twice

Changed paths:
    engines/wage/wage.cpp



diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index 8886b0d..b708cff 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -46,10 +46,12 @@
  */
 
 #include "common/debug-channels.h"
+#include "common/error.h"
+#include "common/events.h"
+#include "common/system.h"
 
 #include "engines/engine.h"
 #include "engines/util.h"
-#include "gui/EventRecorder.h"
 
 #include "wage/wage.h"
 #include "wage/entities.h"






More information about the Scummvm-git-logs mailing list