[Scummvm-git-logs] scummvm master -> 8af755c7e3412ac7708de02e5b23684a3e71884c

[moralrecordings]

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:
8af755c7e3 DIRECTOR: Fix b_updateStage to redraw the screen


Commit: 8af755c7e3412ac7708de02e5b23684a3e71884c
    https://github.com/scummvm/scummvm/commit/8af755c7e3412ac7708de02e5b23684a3e71884c
Author: Scott Percival (code at moral.net.au)
Date: 2020-07-11T12:30:58+08:00

Commit Message:
DIRECTOR: Fix b_updateStage to redraw the screen

Changed paths:
    engines/director/director.cpp
    engines/director/director.h
    engines/director/graphics.cpp
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index b29f3746e7..ab7037a592 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -198,8 +198,7 @@ Common::Error DirectorEngine::run() {
 			}
 		}
 
-		_wm->renderZoomBox(true);
-		_wm->draw();
+		draw();
 	}
 
 	return Common::kNoError;
diff --git a/engines/director/director.h b/engines/director/director.h
index 11e561208f..a27a846202 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -165,6 +165,8 @@ public:
 	Stage *getCurrentStage() const { return _currentStage; }
 	Movie *getCurrentMovie() const;
 	Common::String getCurrentPath() const;
+
+	// graphics.cpp
 	void setPalette(int id);
 	void setPalette(byte *palette, uint16 count);
 	bool hasFeature(EngineFeature f) const override;
@@ -174,7 +176,8 @@ public:
 	void loadPatterns();
 	uint32 transformColor(uint32 color);
 	Graphics::MacPatterns &getPatterns();
-	void setCursor(int type); // graphics.cpp
+	void setCursor(int type);
+	void draw();
 
 	void loadKeyCodes();
 
diff --git a/engines/director/graphics.cpp b/engines/director/graphics.cpp
index 8291ef94b8..0d37fa88fd 100644
--- a/engines/director/graphics.cpp
+++ b/engines/director/graphics.cpp
@@ -793,6 +793,11 @@ void DirectorEngine::setCursor(int type) {
 	}
 }
 
+void DirectorEngine::draw() {
+	_wm->renderZoomBox(true);
+	_wm->draw();
+}
+
 void inkDrawPixel(int x, int y, int src, void *data) {
 	DirectorPlotData *p = (DirectorPlotData *)data;
 
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index c9926f4bb5..fd9930ee1a 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1924,6 +1924,7 @@ void LB::b_updateStage(int nargs) {
 	Score *score = movie->getScore();
 
 	score->renderFrame(score->getCurrentFrame(), kRenderUpdateStageOnly);
+	g_director->draw();
 	g_director->processEvents(true);
 
 	if (debugChannelSet(-1, kDebugFewFramesOnly)) {