[Scummvm-cvs-logs] scummvm master -> 408f1b3aa3dde0c5d72bc8be180d3ef1675f9705
Strangerke
Strangerke at scummvm.org
Tue Dec 17 07:44:30 CET 2013
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:
408f1b3aa3 TONY: Add a reset function in RMWindow in order to group variable initialization
Commit: 408f1b3aa3dde0c5d72bc8be180d3ef1675f9705
https://github.com/scummvm/scummvm/commit/408f1b3aa3dde0c5d72bc8be180d3ef1675f9705
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-12-16T22:43:58-08:00
Commit Message:
TONY: Add a reset function in RMWindow in order to group variable initialization
Changed paths:
engines/tony/window.cpp
engines/tony/window.h
diff --git a/engines/tony/window.cpp b/engines/tony/window.cpp
index a732862..0299197 100644
--- a/engines/tony/window.cpp
+++ b/engines/tony/window.cpp
@@ -40,7 +40,7 @@ namespace Tony {
\****************************************************************************/
RMWindow::RMWindow() {
- _showDirtyRects = false;
+ reset();
}
RMWindow::~RMWindow() {
@@ -55,11 +55,21 @@ RMWindow::~RMWindow() {
void RMWindow::init() {
Graphics::PixelFormat pixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0);
initGraphics(RM_SX, RM_SY, true, &pixelFormat);
+
+ reset();
+}
+/**
+ * Reset the variables
+ */
+void RMWindow::reset() {
+ _showDirtyRects = false;
_bGrabScreenshot = false;
_bGrabThumbnail = false;
_bGrabMovie = false;
_wiping = false;
+
+ _wThumbBuf = nullptr;
}
void RMWindow::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) {
diff --git a/engines/tony/window.h b/engines/tony/window.h
index 3874652..2cc9bfd 100644
--- a/engines/tony/window.h
+++ b/engines/tony/window.h
@@ -72,6 +72,7 @@ public:
* Initialization
*/
void init();
+ void reset();
void close();
/**
More information about the Scummvm-git-logs
mailing list