aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/support/video_surface.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-07-20 07:56:26 -0400
committerPaul Gilbert2016-07-20 07:56:26 -0400
commitc5792fce4bcf8a4e2e89d83242a248a56f579bc6 (patch)
tree7b6b5aadb2c82c8d2f837a3192cb9740f3a9d7df /engines/titanic/support/video_surface.cpp
parentd5bf17e73ff9533d2f54588622048ab755f4151b (diff)
downloadscummvm-rg350-c5792fce4bcf8a4e2e89d83242a248a56f579bc6.tar.gz
scummvm-rg350-c5792fce4bcf8a4e2e89d83242a248a56f579bc6.tar.bz2
scummvm-rg350-c5792fce4bcf8a4e2e89d83242a248a56f579bc6.zip
TITANIC: Clarify movie/surface has frame fields & variables
Diffstat (limited to 'engines/titanic/support/video_surface.cpp')
-rw-r--r--engines/titanic/support/video_surface.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/support/video_surface.cpp b/engines/titanic/support/video_surface.cpp
index 4169a80b4b..49388b64d8 100644
--- a/engines/titanic/support/video_surface.cpp
+++ b/engines/titanic/support/video_surface.cpp
@@ -33,7 +33,7 @@ CVideoSurface::CVideoSurface(CScreenManager *screenManager) :
_screenManager(screenManager), _rawSurface(nullptr), _movie(nullptr),
_pendingLoad(false), _transBlitFlag(false), _fastBlitFlag(false),
_movieFrameSurface(nullptr), _transparencyMode(TRANS_DEFAULT),
- _field48(0), _field50(1), _lockCount(0) {
+ _field48(0), _hasFrame(true), _lockCount(0) {
_videoSurfaceNum = _videoSurfaceCounter++;
}
@@ -170,12 +170,12 @@ uint CVideoSurface::getTransparencyColor() {
return val;
}
-bool CVideoSurface::proc45() {
- if (_field50) {
- _field50 = 0;
+bool CVideoSurface::hasFrame() {
+ if (_hasFrame) {
+ _hasFrame = false;
return true;
} else if (_movie) {
- return _movie->get10();
+ return _movie->hasVideoFrame();
} else {
return false;
}
@@ -519,7 +519,7 @@ bool OSVideoSurface::loadIfReady() {
if (hasSurface()) {
return true;
} else if (_pendingLoad) {
- _field50 = 1;
+ _hasFrame = true;
load();
return true;
} else {