[Scummvm-git-logs] scummvm master -> bcce43c309922b48e3892923cf74d2fd3f351add

[dreammaster]

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:
bcce43c309 ULTIMA8: Fix compiler warnings


Commit: bcce43c309922b48e3892923cf74d2fd3f351add
    https://github.com/scummvm/scummvm/commit/bcce43c309922b48e3892923cf74d2fd3f351add
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-03-07T18:38:38-08:00

Commit Message:
ULTIMA8: Fix compiler warnings

Changed paths:
    engines/ultima/ultima8/graphics/texture.h
    engines/ultima/ultima8/meta_engine.cpp


diff --git a/engines/ultima/ultima8/graphics/texture.h b/engines/ultima/ultima8/graphics/texture.h
index f8b3616cf0..dd1d702b1e 100644
--- a/engines/ultima/ultima8/graphics/texture.h
+++ b/engines/ultima/ultima8/graphics/texture.h
@@ -114,6 +114,9 @@ public:
 	void create(uint16 width, uint16 height, const Graphics::PixelFormat &pixelFormat) override {
 		Graphics::ManagedSurface::create(width, height, pixelFormat);
 	}
+	void create(ManagedSurface &surf, const Common::Rect &bounds) override {
+		Graphics::ManagedSurface::create(surf, bounds);
+	}
 	void create(uint16 width, uint16 height, TextureFormat textureFormat);
 
 	// Calc texture log2's
diff --git a/engines/ultima/ultima8/meta_engine.cpp b/engines/ultima/ultima8/meta_engine.cpp
index babae36bf7..fe4f3d2297 100644
--- a/engines/ultima/ultima8/meta_engine.cpp
+++ b/engines/ultima/ultima8/meta_engine.cpp
@@ -54,7 +54,7 @@ static const KeybindingRecord KEYS[] = {
 		"GameMapGump::toggleHighlightItems", "TAB" },
 	{ ACTION_TOGGLE_TOUCHING, "TOUCHING", "Show Touching Items", "GUIApp::toggleShowTouchingItems", nullptr, "h" },
 
-	{ ACTION_NONE, nullptr, nullptr, nullptr, nullptr }
+	{ ACTION_NONE, nullptr, nullptr, nullptr, nullptr, nullptr }
 };
 
 static const KeybindingRecord CHEAT_KEYS[] = {
@@ -69,7 +69,7 @@ static const KeybindingRecord CHEAT_KEYS[] = {
 	{ ACTION_MOVE_LEFT, "MOVE_LEFT", "Move Left", "QuickAvatarMoverProcess::startMoveLeft", "QuickAvatarMoverProcess::stopMoveLeft", "LEFT" },
 	{ ACTION_RIGHT, "MOVE_RIGHT", "Move Right", "QuickAvatarMoverProcess::startMoveRight", "QuickAvatarMoverProcess::stopMoveRight", "RIGHT" },
 
-	{ ACTION_NONE, nullptr, nullptr, nullptr, nullptr }
+	{ ACTION_NONE, nullptr, nullptr, nullptr, nullptr, nullptr }
 };
 
 #ifndef RELEASE_BUILD
@@ -81,7 +81,7 @@ static const KeybindingRecord DEBUG_KEYS[] = {
 	{ ACTION_TOGGLE_STASIS, "TOGGLE_STASIS", "Toggle Avatar In Stasis", "GUIApp::toggleAvatarInStasis", nullptr, "F10" },
 	{ ACTION_SHAPE_VIEWER, "SHAPE_VIEWER", "Show Shape Viewer", "ShapeViewerGump::U8ShapeViewer", nullptr, "F11" },
 
-	{ ACTION_NONE, nullptr, nullptr, nullptr, nullptr }
+	{ ACTION_NONE, nullptr, nullptr, nullptr, nullptr, nullptr }
 };
 #endif