aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorRichieSams2013-09-07 18:03:25 -0500
committerRichieSams2013-09-07 18:03:25 -0500
commit70e75dd6403a25f220e2e5eb0af9c3f0e940288c (patch)
tree776d51e565ac88fccc80c2639f5f33dd071f4dcf /engines
parent48745ad197b2986c784bd18c5ae73c569a20b3e9 (diff)
downloadscummvm-rg350-70e75dd6403a25f220e2e5eb0af9c3f0e940288c.tar.gz
scummvm-rg350-70e75dd6403a25f220e2e5eb0af9c3f0e940288c.tar.bz2
scummvm-rg350-70e75dd6403a25f220e2e5eb0af9c3f0e940288c.zip
ZVISION: Make the declaration and implementation of copyRectToWorkingWindow be the same
Diffstat (limited to 'engines')
-rw-r--r--engines/zvision/render_manager.cpp4
-rw-r--r--engines/zvision/render_manager.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp
index bd3e73563f..3793ea8cf9 100644
--- a/engines/zvision/render_manager.cpp
+++ b/engines/zvision/render_manager.cpp
@@ -166,7 +166,7 @@ void RenderManager::renderSubRectToScreen(Graphics::Surface &surface, int16 dest
if (!subRect.isValidRect() || subRect.isEmpty())
return;
- renderRectToWorkingWindow((uint16 *)surface.getBasePtr(subRect.left, subRect.top), surface.w, destinationX, destinationY, subRect.width(), subRect.height());
+ copyRectToWorkingWindow((const uint16 *)surface.getBasePtr(subRect.left, subRect.top), destinationX, destinationY, surface.w, subRect.width(), subRect.height());
}
void RenderManager::renderImageToScreen(const Common::String &fileName, int16 destinationX, int16 destinationY, bool wrap) {
@@ -274,7 +274,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics:
destination.convertToInPlace(_pixelFormat);
}
-void RenderManager::renderRectToWorkingWindow(uint16 *buffer, int32 imageWidth, int32 destX, int32 destY, int32 width, int32 height) {
+void RenderManager::copyRectToWorkingWindow(const uint16 *buffer, int32 destX, int32 destY, int32 imageWidth, int32 width, int32 height) {
uint32 destOffset = 0;
uint32 sourceOffset = 0;
uint16 *workingWindowBufferPtr = (uint16 *)_workingWindowBuffer.getBasePtr(destX, destY);
diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h
index fd36ab5730..9881676583 100644
--- a/engines/zvision/render_manager.h
+++ b/engines/zvision/render_manager.h
@@ -108,6 +108,8 @@ public:
*/
void renderBackbufferToScreen();
+ void copyRectToWorkingWindow(const uint16 *buffer, int32 destX, int32 destY, int32 imageWidth, int32 width, int32 height);
+
/**
* Fills the entire workingWindow with the specified color
*
@@ -192,8 +194,6 @@ private:
void readImageToSurface(const Common::String &fileName, Graphics::Surface &destination);
- void renderRectToWorkingWindow(uint16 *buffer, int32 x, int32 y, int32 imageWidth, int32 width, int32 height);
-
void moveBackground(int offset);
};