aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorColin Snover2016-03-02 14:02:15 -0600
committerColin Snover2016-03-02 14:02:49 -0600
commitb6a7d8c6a5bc286c68fea091e43e6a51df456655 (patch)
tree0a8cb034f6eb1b7b3a7069e1ddc6c83b10ea082d /engines
parent5e0cff364f95d21853a7f5ddc96aed36897774c4 (diff)
downloadscummvm-rg350-b6a7d8c6a5bc286c68fea091e43e6a51df456655.tar.gz
scummvm-rg350-b6a7d8c6a5bc286c68fea091e43e6a51df456655.tar.bz2
scummvm-rg350-b6a7d8c6a5bc286c68fea091e43e6a51df456655.zip
SCI32: Minor consistency improvement to FrameOut
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/engine/kgraphics32.cpp2
-rw-r--r--engines/sci/graphics/frameout.cpp5
-rw-r--r--engines/sci/graphics/frameout.h4
3 files changed, 5 insertions, 6 deletions
diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index 5810a59ff6..36f637be0f 100644
--- a/engines/sci/engine/kgraphics32.cpp
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -132,7 +132,7 @@ reg_t kGetHighPlanePri(EngineState *s, int argc, reg_t *argv) {
reg_t kFrameOut(EngineState *s, int argc, reg_t *argv) {
bool showBits = argc > 0 ? argv[0].toUint16() : true;
- g_sci->_gfxFrameout->kernelFrameout(showBits);
+ g_sci->_gfxFrameout->kernelFrameOut(showBits);
s->speedThrottler(16);
s->_throttleTrigger = true;
return NULL_REG;
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 32de79d7ca..ab2ed7a4a5 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -1947,7 +1947,7 @@ bool GfxFrameout::processShowStyle12(ShowStyleEntry *const showStyle) {
}
#endif
-void GfxFrameout::kernelFrameout(const bool shouldShowBits) {
+void GfxFrameout::kernelFrameOut(const bool shouldShowBits) {
if (_showStyles != nullptr) {
processShowStyles();
} else if (_palMorphIsOn) {
@@ -1959,8 +1959,7 @@ void GfxFrameout::kernelFrameout(const bool shouldShowBits) {
// doScroll();
// }
- Common::Rect frameOutRect(0, 0);
- frameOut(shouldShowBits, frameOutRect);
+ frameOut(shouldShowBits);
}
}
diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h
index 0da6866f7c..f172997704 100644
--- a/engines/sci/graphics/frameout.h
+++ b/engines/sci/graphics/frameout.h
@@ -427,7 +427,7 @@ private:
* frame. If `shouldShowBits` is true, also sends the
* buffer to hardware.
*/
- void frameOut(const bool shouldShowBits, const Common::Rect &rect);
+ void frameOut(const bool shouldShowBits, const Common::Rect &rect = Common::Rect());
/**
* Adds a new rectangle to the list of regions to write
@@ -466,7 +466,7 @@ public:
return _currentBuffer;
}
- void kernelFrameout(const bool showBits);
+ void kernelFrameOut(const bool showBits);
/**
* Modifies the raw pixel data for the next frame with