8 files changed, 13 insertions, 8 deletions
diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp
index 6fe5be9e11..2fc2096802 100644
--- a/engines/wintermute/base/base_sprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -137,7 +137,7 @@ bool BaseSprite::loadFile(const Common::String &filename, int lifeTime, TSpriteC
 		file = NULL;
 	}
 
-	bool ret;
+	bool ret = STATUS_FAILED;
 
 	AnsiString filePrefix = filename;
 	AnsiString ext = PathUtil::getExtension(filename);
@@ -164,6 +164,8 @@ bool BaseSprite::loadFile(const Common::String &filename, int lifeTime, TSpriteC
 		if (buffer) {
 			if (DID_FAIL(ret = loadBuffer(buffer, true, lifeTime, cacheType))) {
 				_gameRef->LOG(0, "Error parsing SPRITE file '%s'", filename.c_str());
+			} else {
+				ret = STATUS_OK;
 			}
 			delete[] buffer;
 		}
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
index 5859fec74e..44acca0267 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
@@ -83,6 +83,7 @@ public:
 	void drawFromTicket(RenderTicket *renderTicket);
 
 	bool setViewport(int left, int top, int right, int bottom);
+	bool setViewport(Rect32 *rect) { return BaseRenderer::setViewport(rect); }
 	Rect32 getViewPort();
 	void modTargetRect(Common::Rect *rect);
 	void pointFromScreen(Point32 *point);
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index f0ec41a265..ea88f19065 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -196,7 +196,7 @@ void BaseSurfaceOSystem::genAlphaMask(Graphics::Surface *surface) {
 	bool hasTransparency = false;
 	for (int y = 0; y < surface->h; y++) {
 		for (int x = 0; x < surface->w; x++) {
-			uint32 pixel = getPixel(surface, x, y);
+			uint32 pixel = getPixelAt(surface, x, y);
 
 			uint8 r, g, b, a;
 			surface->format.colorToARGB(pixel, a, r, g, b);
@@ -220,7 +220,7 @@ void BaseSurfaceOSystem::genAlphaMask(Graphics::Surface *surface) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-uint32 BaseSurfaceOSystem::getPixel(Graphics::Surface *surface, int x, int y) {
+uint32 BaseSurfaceOSystem::getPixelAt(Graphics::Surface *surface, int x, int y) {
 	warning("BaseSurfaceOSystem::GetPixel - Not ported yet");
 	int bpp = surface->format.bytesPerPixel;
 	/* Here p is the address to the pixel we want to retrieve */
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
index 27f9ad047e..1b7146632e 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
@@ -86,7 +86,7 @@ private:
 	bool finishLoad();
 	bool drawSprite(int x, int y, Rect32 *rect, float zoomX, float zoomY, uint32 alpha, bool alphaDisable, TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY, int offsetX = 0, int offsetY = 0);
 	void genAlphaMask(Graphics::Surface *surface);
-	uint32 getPixel(Graphics::Surface *surface, int x, int y);
+	uint32 getPixelAt(Graphics::Surface *surface, int x, int y);
 
 	bool _hasAlpha;
 	void *_lockPixels;
diff --git a/engines/wintermute/base/scriptables/script_ext_date.h b/engines/wintermute/base/scriptables/script_ext_date.h
index 521b7a9f8a..7cdf57e689 100644
--- a/engines/wintermute/base/scriptables/script_ext_date.h
+++ b/engines/wintermute/base/scriptables/script_ext_date.h
@@ -45,7 +45,6 @@ public:
 	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
 	const char *scToString();
 private:
-	char *_string;
 	TimeDate _tm;
 	Common::String _strRep;
 };
diff --git a/engines/wintermute/ui/ui_button.h b/engines/wintermute/ui/ui_button.h
index 61cdef476e..88ba8dafc7 100644
--- a/engines/wintermute/ui/ui_button.h
+++ b/engines/wintermute/ui/ui_button.h
@@ -44,7 +44,8 @@ public:
 	uint32 _oneTimePressTime;
 	DECLARE_PERSISTENT(UIButton, UIObject)
 	void press();
-	virtual bool display(int offsetX = 0, int offsetY = 0);
+	virtual bool display() { return display(0, 0); }
+	virtual bool display(int offsetX, int offsetY);
 	bool _press;
 	bool _hover;
 	void correctSize();
diff --git a/engines/wintermute/ui/ui_entity.h b/engines/wintermute/ui/ui_entity.h
index bc44c1f112..aeb32a6ffb 100644
--- a/engines/wintermute/ui/ui_entity.h
+++ b/engines/wintermute/ui/ui_entity.h
@@ -42,7 +42,8 @@ public:
 	bool loadBuffer(byte *buffer, bool complete);
 	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent);
 
-	virtual bool display(int offsetX = 0, int offsetY = 0);
+	virtual bool display() { return display(0, 0); }
+	virtual bool display(int offsetX, int offsetY);
 	AdEntity *_entity;
 	bool setEntity(const char *filename);
 
diff --git a/engines/wintermute/ui/ui_object.h b/engines/wintermute/ui/ui_object.h
index 8059207a9a..b0a34fe61e 100644
--- a/engines/wintermute/ui/ui_object.h
+++ b/engines/wintermute/ui/ui_object.h
@@ -49,7 +49,8 @@ public:
 	DECLARE_PERSISTENT(UIObject, BaseObject)
 	UIObject *_parent;
 	virtual bool display() { return display(0, 0); }
-	virtual bool display(int offsetX = 0, int offsetY = 0);
+	virtual bool display(int offsetX) { return display(offsetX, 0); }
+	virtual bool display(int offsetX, int offsetY);
 	virtual void correctSize();
 	bool _sharedFonts;
 	bool _sharedImages;