[Scummvm-git-logs] scummvm branch-2-2 -> fdbaff28398efdc8e903b0cd6e22a3e7041cc519

[dreammaster]

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:
fdbaff2839 ULTIMA4: Fix projectiles not showing in combat


Commit: fdbaff28398efdc8e903b0cd6e22a3e7041cc519
    https://github.com/scummvm/scummvm/commit/fdbaff28398efdc8e903b0cd6e22a3e7041cc519
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-09-05T14:59:37-07:00

Commit Message:
ULTIMA4: Fix projectiles not showing in combat

Changed paths:
    engines/ultima/ultima4/gfx/screen.cpp
    engines/ultima/ultima4/gfx/screen.h


diff --git a/engines/ultima/ultima4/gfx/screen.cpp b/engines/ultima/ultima4/gfx/screen.cpp
index cb153e0a97..617e9e8665 100644
--- a/engines/ultima/ultima4/gfx/screen.cpp
+++ b/engines/ultima/ultima4/gfx/screen.cpp
@@ -58,8 +58,8 @@ Screen *g_screen;
 Screen::Screen() : _filterScaler(nullptr), _currentMouseCursor(-1),
                    _gemLayout(nullptr), _tileAnims(nullptr), _charSetInfo(nullptr),
                    _gemTilesInfo(nullptr), _needPrompt(1), _currentCycle(0),
-                   _cursorStatus(0), _cursorEnabled(1), _frameDuration(0),
-                   _continueScreenRefresh(true), _priorFrameTime(0) {
+                   _cursorStatus(0), _cursorEnabled(1), _priorFrameTime(0),
+                   _continueScreenRefresh(true) {
 	g_screen = this;
 	Common::fill(&_mouseCursors[0], &_mouseCursors[5], (MouseCursorSurface *)nullptr);
 	Common::fill(&_los[0][0], &_los[0][0] + (VIEWPORT_W * VIEWPORT_H), 0);
@@ -1317,7 +1317,8 @@ void Screen::screenRedrawTextArea(int x, int y, int width, int height) {
 }
 
 void Screen::screenWait(int numberOfAnimationFrames) {
-	g_system->delayMillis(numberOfAnimationFrames * _frameDuration);
+	update();
+	g_system->delayMillis(numberOfAnimationFrames * SCREEN_FRAME_TIME);
 }
 
 Image *Screen::screenScale(Image *src, int scale, int n, int filter) {
diff --git a/engines/ultima/ultima4/gfx/screen.h b/engines/ultima/ultima4/gfx/screen.h
index e7f7dfabc1..6a595553fd 100644
--- a/engines/ultima/ultima4/gfx/screen.h
+++ b/engines/ultima/ultima4/gfx/screen.h
@@ -118,7 +118,6 @@ private:
 	int _cursorStatus;
 	int _cursorEnabled;
 	int _los[VIEWPORT_W][VIEWPORT_H];
-	int _frameDuration;
 	bool _continueScreenRefresh;
 	uint32 _priorFrameTime;