[Scummvm-git-logs] scummvm master -> 4d86f8226f63b0b913a59c605b083726b6fba090
aquadran
noreply at scummvm.org
Wed May 21 09:11:21 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
4d86f8226f WINTERMUTE: Removed not to be implemented function overrides
Commit: 4d86f8226f63b0b913a59c605b083726b6fba090
https://github.com/scummvm/scummvm/commit/4d86f8226f63b0b913a59c605b083726b6fba090
Author: PaweÅ KoÅodziejski (aquadran at gmail.com)
Date: 2025-05-21T11:11:15+02:00
Commit Message:
WINTERMUTE: Removed not to be implemented function overrides
Changed paths:
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
diff --git a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
index 2d3d377213d..bc6a9298516 100644
--- a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
@@ -56,11 +56,6 @@ bool BaseSurfaceOpenGL3D::invalidate() {
return true;
}
-bool BaseSurfaceOpenGL3D::displayHalfTrans(int x, int y, Rect32 rect) {
- warning("BaseSurfaceOpenGL3D::displayHalfTrans not yet implemented");
- return true;
-}
-
bool BaseSurfaceOpenGL3D::isTransparentAt(int x, int y) {
prepareToDraw();
@@ -118,11 +113,6 @@ bool BaseSurfaceOpenGL3D::displayTiled(int x, int y, Rect32 rect, int numTimesX,
return true;
}
-bool BaseSurfaceOpenGL3D::restore() {
- warning("BaseSurfaceOpenGL3D::restore not yet implemented");
- return true;
-}
-
bool BaseSurfaceOpenGL3D::create(const Common::String &filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime, bool keepLoaded) {
BaseImage img = BaseImage();
if (!img.loadFile(filename)) {
@@ -244,21 +234,11 @@ bool BaseSurfaceOpenGL3D::putSurface(const Graphics::Surface &surface, bool hasA
return true;
}
-bool BaseSurfaceOpenGL3D::putPixel(int x, int y, byte r, byte g, byte b, int a) {
- warning("BaseSurfaceOpenGL3D::putPixel not yet implemented");
- return true;
-}
-
bool BaseSurfaceOpenGL3D::getPixel(int x, int y, byte *r, byte *g, byte *b, byte *a) {
warning("BaseSurfaceOpenGL3D::getPixel not yet implemented");
return true;
}
-bool BaseSurfaceOpenGL3D::comparePixel(int x, int y, byte r, byte g, byte b, int a) {
- warning("BaseSurfaceOpenGL3D::comparePixel not yet implemented");
- return true;
-}
-
bool BaseSurfaceOpenGL3D::startPixelOp() {
prepareToDraw();
return true;
diff --git a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
index 15698ca3197..5878d569642 100644
--- a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
@@ -40,20 +40,16 @@ public:
bool invalidate() override;
- bool displayHalfTrans(int x, int y, Rect32 rect) override;
bool isTransparentAt(int x, int y) override;
bool displayTransRotate(int x, int y, uint32 angle, int32 hotspotX, int32 hotspotY, Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
bool displayTransZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
bool displayTrans(int x, int y, Rect32 rect, uint32 alpha = 0xFFFFFFFF, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false, int offsetX = 0, int offsetY = 0) override;
bool display(int x, int y, Rect32 rect, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
bool displayTiled(int x, int y, Rect32 rect, int numTimesX, int numTimesY) override;
- bool restore() override;
bool create(const Common::String &filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime = -1, bool keepLoaded = false) override;
bool create(int width, int height) override;
bool putSurface(const Graphics::Surface &surface, bool hasAlpha = false) override;
- bool putPixel(int x, int y, byte r, byte g, byte b, int a = -1) override;
bool getPixel(int x, int y, byte *r, byte *g, byte *b, byte *a = nullptr) override;
- bool comparePixel(int x, int y, byte r, byte g, byte b, int a = -1) override;
bool startPixelOp() override;
bool endPixelOp() override;
bool isTransparentAtLite(int x, int y) override;
More information about the Scummvm-git-logs
mailing list