[Scummvm-cvs-logs] scummvm master -> 23badc97357162bfe8de06afc679b459c70d2f27

Strangerke Strangerke at scummvm.org
Mon Mar 4 07:48:03 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:
23badc9735 HOPKINS: Some renaming


Commit: 23badc97357162bfe8de06afc679b459c70d2f27
    https://github.com/scummvm/scummvm/commit/23badc97357162bfe8de06afc679b459c70d2f27
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-03T22:46:52-08:00

Commit Message:
HOPKINS: Some renaming

Changed paths:
    engines/hopkins/anim.cpp
    engines/hopkins/computer.cpp
    engines/hopkins/dialogs.cpp
    engines/hopkins/events.cpp
    engines/hopkins/events.h
    engines/hopkins/font.cpp
    engines/hopkins/graphics.cpp
    engines/hopkins/hopkins.cpp
    engines/hopkins/menu.cpp
    engines/hopkins/objects.cpp
    engines/hopkins/objects.h
    engines/hopkins/script.cpp
    engines/hopkins/sound.cpp
    engines/hopkins/talk.cpp



diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index 6531e1d..7b3c186 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -604,7 +604,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
 	bool hasScreenCopy = false;
 	_vm->_eventsManager._mouseFl = false;
 	if (!NO_COUL) {
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 
 		if (_vm->_graphicsManager._lineNbr == SCREEN_WIDTH)
 			_vm->_saveLoadManager.saveFile("TEMP.SCR", _vm->_graphicsManager._vesaScreen, 307200);
diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp
index ab81884..82cd17a 100644
--- a/engines/hopkins/computer.cpp
+++ b/engines/hopkins/computer.cpp
@@ -270,7 +270,7 @@ void ComputerManager::showComputer(ComputerEnum mode) {
 		setTextColor(4);
 		setTextPosition(16, 25);
 		outText(Common::String(_menuText[5]._line));
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 		_vm->_eventsManager.delay(1000);
 
 		memset(_vm->_graphicsManager._vesaBuffer, 0, 307199);
@@ -440,13 +440,13 @@ void ComputerManager::displayMessage(int xp, int yp, int textIdx) {
 			++textIndex;
 			x1 += _vm->_fontManager._fontFixedWidth;
 		}
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 	} while (textIndex != textIdx && curChar != 13);
 
 	_vm->_graphicsManager.Copy_Mem(_vm->_graphicsManager._vesaScreen, x1, yp, _vm->_fontManager._fontFixedWidth, 12, _vm->_graphicsManager._vesaBuffer, x1, yp);
 	_vm->_graphicsManager.addVesaSegment(x1, yp, _vm->_fontManager._fontFixedWidth + x1, yp + 12);
 
-	_vm->_eventsManager.VBL();
+	_vm->_eventsManager.refreshScreenAndEvents();
 	_inputBuf[textIndex] = 0;
 	_vm->_eventsManager._mouseFl = oldMouseFlag;
 }
@@ -515,7 +515,7 @@ void ComputerManager::readText(int idx) {
 			outText(curStr);
 
 			++lineNum;
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 			curStr = "";
 		} else if (curChar != '%') {
 			curStr += curChar;
@@ -727,7 +727,7 @@ void ComputerManager::playBreakout() {
 			_vm->_objectsManager.setSpriteY(1, 187);
 			_vm->_objectsManager.setSpriteX(1, _ballPosition.x);
 			_vm->_graphicsManager.resetVesaSegment();
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 			_vm->_graphicsManager.fadeInBreakout();
 
 			// Wait for mouse press to start playing
@@ -740,7 +740,7 @@ void ComputerManager::playBreakout() {
 				_vm->_objectsManager.setSpriteX(0, _padPositionX);
 				_vm->_objectsManager.setSpriteX(1, _padPositionX + 14);
 				_vm->_objectsManager.setSpriteY(1, 187);
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (!_vm->shouldQuit() && _vm->_eventsManager.getMouseButton() != 1);
 
 			_breakoutSpeed = 1;
@@ -759,7 +759,7 @@ void ComputerManager::playBreakout() {
 					_padPositionX = 282;
 				_vm->_objectsManager.setSpriteX(0, _padPositionX);
 				lastBreakoutEvent = moveBall();
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (!_vm->shouldQuit() && !lastBreakoutEvent);
 			if (lastBreakoutEvent != 1)
 				break;
@@ -839,7 +839,7 @@ int ComputerManager::displayHiscores() {
 		else if (_vm->_eventsManager.getMouseButton() == 1 && ABS(xp - 583) <= 32 && ABS(yp - 396) <= 13)
 			buttonIndex = 2;
 
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 	} while (!buttonIndex && !_vm->shouldQuit());
 
 	_vm->_eventsManager.mouseOff();
@@ -872,7 +872,7 @@ void ComputerManager::getScoreName() {
 		displayHiscoreLine(ptr, 9 * strPos + 140, 78, curChar);
 
 		for (int idx = 0; idx < 12; ++idx)
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 	}
 	_score[5]._score = "         ";
 
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index 49d690c..ad3e547 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -59,7 +59,7 @@ void DialogsManager::setParent(HopkinsEngine *vm) {
 
 void DialogsManager::showOptionsDialog() {
 	_vm->_eventsManager.changeMouseCursor(0);
-	_vm->_eventsManager.VBL();
+	_vm->_eventsManager.refreshScreenAndEvents();
 	Common::String filename;
 	if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS)
 		filename = "OPTION.SPR";
@@ -298,7 +298,7 @@ void DialogsManager::showOptionsDialog() {
 			break;
 		}
 
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 	} while (!doneFlag);
 
 	_vm->_graphicsManager.copySurface(_vm->_graphicsManager._vesaScreen, scrollOffset + 164,
@@ -321,7 +321,7 @@ void DialogsManager::showInventory() {
 		inventAnim();
 		_vm->_eventsManager.getMouseX();
 		_vm->_eventsManager.getMouseY();
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 	}
 	_inventWin1 = g_PTRNUL;
 
@@ -424,7 +424,7 @@ void DialogsManager::showInventory() {
 
 				if (_vm->_soundManager._voiceOffFl) {
 					do
-						_vm->_eventsManager.VBL();
+						_vm->_eventsManager.refreshScreenAndEvents();
 					while (!_vm->_globals._exitId && _vm->_eventsManager.getMouseButton() != 1);
 					_vm->_fontManager.hideText(9);
 				}
@@ -444,7 +444,7 @@ void DialogsManager::showInventory() {
 			}
 			if (_removeInventFl)
 				break;
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 			if (_vm->_globals._screenId >= 35 && _vm->_globals._screenId <= 40)
 				_vm->_objectsManager.handleSpecialGames();
 		}
@@ -567,13 +567,13 @@ void DialogsManager::testDialogOpening() {
  * Load Game dialog
  */
 void DialogsManager::showLoadGame() {
-	_vm->_eventsManager.VBL();
+	_vm->_eventsManager.refreshScreenAndEvents();
 	showSaveLoad(MODE_LOAD);
 
 	int slotNumber;
 	do {
 		slotNumber = searchSavegames();
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 	} while (!_vm->shouldQuit() && (!slotNumber || _vm->_eventsManager.getMouseButton() != 1));
 	_vm->_objectsManager._saveLoadFl = false;
 	_vm->_graphicsManager.copySurface(_vm->_graphicsManager._vesaScreen, _vm->_eventsManager._startPos.x + 183, 60, 274, 353, _vm->_graphicsManager._vesaBuffer, _vm->_eventsManager._startPos.x + 183, 60);
@@ -595,13 +595,13 @@ void DialogsManager::showLoadGame() {
  * Save Game dialog
  */
 void DialogsManager::showSaveGame() {
-	_vm->_eventsManager.VBL();
+	_vm->_eventsManager.refreshScreenAndEvents();
 
 	showSaveLoad(MODE_SAVE);
 	int slotNumber;
 	do {
 		slotNumber = searchSavegames();
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 	} while (!_vm->shouldQuit() && (!slotNumber || _vm->_eventsManager.getMouseButton() != 1));
 
 	_vm->_objectsManager._saveLoadFl = false;
diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index d13f545..950ccc7 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -334,12 +334,12 @@ int EventsManager::waitKeyPress() {
 		else if (_keyState[(byte)' '])
 			foundChar = ' ';
 
-		VBL();
+		refreshScreenAndEvents();
 	}
 
 	// Wait for keypress release
 	while (_keyState[(byte)foundChar] && !_vm->shouldQuit()) {
-		VBL();
+		refreshScreenAndEvents();
 		g_system->delayMillis(10);
 	}
 
@@ -347,7 +347,7 @@ int EventsManager::waitKeyPress() {
 	return foundChar;
 }
 
-void EventsManager::VBL() {
+void EventsManager::refreshScreenAndEvents() {
 	int bottom = 0;
 	int right = 0;
 	int height = 0;
diff --git a/engines/hopkins/events.h b/engines/hopkins/events.h
index d4759df..52b9c25 100644
--- a/engines/hopkins/events.h
+++ b/engines/hopkins/events.h
@@ -87,7 +87,7 @@ public:
 	void mouseOff();
 	void setMouseOn();
 
-	void VBL();
+	void refreshScreenAndEvents();
 };
 
 } // End of namespace Hopkins
diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp
index 89d197b..afe9dfe 100644
--- a/engines/hopkins/font.cpp
+++ b/engines/hopkins/font.cpp
@@ -466,10 +466,10 @@ void FontManager::renderTextDisplay(int xp, int yp, const Common::String &msg, i
 			_vm->_graphicsManager.addVesaSegment(charStartPosX, yp, charEndPosX, yp + 12);
 			if (_vm->_eventsManager._escKeyFl) {
 				_vm->_globals.iRegul = 1;
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} else {
 				_vm->_globals.iRegul = 4;
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 				_vm->_globals.iRegul = 1;
 			}
 		}
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index 31dbcd3..9f4c910 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -1056,8 +1056,8 @@ void GraphicsManager::endDisplayBob() {
 			_vm->_objectsManager.hideBob(idx);
 	}
 
-	_vm->_eventsManager.VBL();
-	_vm->_eventsManager.VBL();
+	_vm->_eventsManager.refreshScreenAndEvents();
+	_vm->_eventsManager.refreshScreenAndEvents();
 
 	for (int idx = 1; idx <= 20; ++idx) {
 		if (_vm->_globals._animBqe[idx]._enabledFl)
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index dab9738..87e1901 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -139,7 +139,7 @@ bool HopkinsEngine::runWin95Demo() {
 
 	for (int i = 1; i < 50; i++) {
 		_graphicsManager.copySurface(_graphicsManager._vesaScreen, 0, 0, 640, 440, _graphicsManager._vesaBuffer, 0, 0);
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 	}
 
 	_globals.iRegul = 0;
@@ -288,7 +288,7 @@ bool HopkinsEngine::runWin95Demo() {
 				_graphicsManager.fadeInLong();
 				_eventsManager.mouseOn();
 				do
-					_eventsManager.VBL();
+					_eventsManager.refreshScreenAndEvents();
 				while (_eventsManager.getMouseButton() != 1);
 				_graphicsManager.fadeOutLong();
 				restoreSystem();
@@ -1602,10 +1602,10 @@ void HopkinsEngine::playIntro() {
 	byte paletteData2[PALETTE_EXT_BLOCK_SIZE];
 
 	memset(&paletteData, 0, PALETTE_EXT_BLOCK_SIZE);
-	_eventsManager.VBL();
+	_eventsManager.refreshScreenAndEvents();
 	_eventsManager._mouseFl = false;
 	_globals.iRegul = 1;
-	_eventsManager.VBL();
+	_eventsManager.refreshScreenAndEvents();
 	_soundManager.playSound(16);
 	_animationManager._clearAnimationFl = true;
 	_animationManager.playAnim("J1.anm", 12, 12, 50);
@@ -1639,7 +1639,7 @@ void HopkinsEngine::playIntro() {
 	_graphicsManager.SETCOLOR3(251, 100, 100, 100);
 	_graphicsManager.SETCOLOR3(254, 0, 0, 0);
 	for (int i = 0; i <= 4; i++)
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 
 	_globals.iRegul = 1;
 	_graphicsManager.fadeInLong();
@@ -1657,10 +1657,10 @@ void HopkinsEngine::playIntro() {
 
 			if (_eventsManager.getMouseX() < _graphicsManager._scrollPosX + 10)
 				_eventsManager.setMouseXY(_eventsManager._mousePos.x + 4, _eventsManager.getMouseY());
-			_eventsManager.VBL();
+			_eventsManager.refreshScreenAndEvents();
 		} while (!shouldQuit() && !loopCond && _graphicsManager._scrollPosX != SCREEN_WIDTH);
 
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 		_graphicsManager._scrollStatus = 0;
 
 		if (shouldQuit())
@@ -1684,17 +1684,17 @@ void HopkinsEngine::playIntro() {
 	_graphicsManager.SETCOLOR3(254, 0, 0, 0);
 
 	for (int i = 0; i <= 4; i++)
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 
 	_globals.iRegul = 1;
 	_graphicsManager.fadeInLong();
 	for (uint i = 0; i < 200 / _globals._speed; ++i)
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 
 	_objectsManager.setBobAnimation(3);
 	_soundManager.mixVoice(5, 3);
 	_objectsManager.stopBobAnimation(3);
-	_eventsManager.VBL();
+	_eventsManager.refreshScreenAndEvents();
 	memcpy(&paletteData2, _graphicsManager._palette, 796);
 
 	_graphicsManager.setPaletteVGA256WithRefresh(paletteData, _graphicsManager._vesaBuffer);
@@ -1726,7 +1726,7 @@ void HopkinsEngine::playIntro() {
 	_graphicsManager.SETCOLOR3(254, 0, 0, 0);
 
 	for (int i = 0; i <= 3; i++)
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 
 	_globals.iRegul = 1;
 	_graphicsManager.setPaletteVGA256WithRefresh(paletteData2, _graphicsManager._vesaBuffer);
@@ -1735,9 +1735,9 @@ void HopkinsEngine::playIntro() {
 	while (!shouldQuit() && !_eventsManager._escKeyFl) {
 		if (introIndex == 12) {
 			_objectsManager.setBobAnimation(3);
-			_eventsManager.VBL();
+			_eventsManager.refreshScreenAndEvents();
 			_soundManager.mixVoice(6, 3);
-			_eventsManager.VBL();
+			_eventsManager.refreshScreenAndEvents();
 			_objectsManager.stopBobAnimation(3);
 		}
 
@@ -1751,28 +1751,28 @@ void HopkinsEngine::playIntro() {
 		_graphicsManager.setPaletteVGA256WithRefresh(_graphicsManager._palette, _graphicsManager._vesaBuffer);
 
 		for (int i = 1; i < 2 * introIndex; i++)
-			_eventsManager.VBL();
+			_eventsManager.refreshScreenAndEvents();
 
 		_graphicsManager.setPaletteVGA256WithRefresh(paletteData2, _graphicsManager._vesaBuffer);
 
 		for (int i = 1; i < 20 - introIndex; i++)
-			_eventsManager.VBL();
+			_eventsManager.refreshScreenAndEvents();
 
 		introIndex += 2;
 		if (introIndex > 15) {
 			_graphicsManager.setPaletteVGA256WithRefresh(paletteData, _graphicsManager._vesaBuffer);
 			for (uint j = 1; j < 100 / _globals._speed; ++j)
-				_eventsManager.VBL();
+				_eventsManager.refreshScreenAndEvents();
 
 			_objectsManager.setBobAnimation(3);
 			_soundManager.mixVoice(7, 3);
 			_objectsManager.stopBobAnimation(3);
 
 			for (uint k = 1; k < 60 / _globals._speed; ++k)
-				_eventsManager.VBL();
+				_eventsManager.refreshScreenAndEvents();
 			_objectsManager.setBobAnimation(5);
 			for (uint l = 0; l < 20 / _globals._speed; ++l)
-				_eventsManager.VBL();
+				_eventsManager.refreshScreenAndEvents();
 
 			Common::copy(&paletteData2[0], &paletteData2[PALETTE_BLOCK_SIZE], &_graphicsManager._palette[0]);
 			_graphicsManager.setPaletteVGA256WithRefresh(_graphicsManager._palette, _graphicsManager._vesaBuffer);
@@ -1784,7 +1784,7 @@ void HopkinsEngine::playIntro() {
 					_objectsManager.stopBobAnimation(3);
 				}
 
-				_eventsManager.VBL();
+				_eventsManager.refreshScreenAndEvents();
 			}
 
 			_graphicsManager.fadeOutLong();
@@ -1876,14 +1876,14 @@ void HopkinsEngine::bombExplosion() {
 	_objectsManager.stopBobAnimation(7);
 
 	for (int idx = 0; idx < 5; ++idx) {
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 	}
 
 	_graphicsManager.fadeInLong();
 	_eventsManager.mouseOff();
 
 	for (int idx = 0; idx < 20; ++idx) {
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 	}
 
 	_globals._introSpeechOffFl = true;
@@ -1892,7 +1892,7 @@ void HopkinsEngine::bombExplosion() {
 	_objectsManager.setBobAnimation(7);
 
 	for (int idx = 0; idx < 100; ++idx) {
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 	}
 
 	_graphicsManager.fadeOutLong();
@@ -1923,7 +1923,7 @@ void HopkinsEngine::endLinuxDemo() {
 	bool mouseClicked = false;
 
 	do {
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 
 		if (_eventsManager.getMouseButton() == 1)
 			mouseClicked = true;
@@ -1947,20 +1947,20 @@ void HopkinsEngine::handleConflagration() {
 	_graphicsManager.displayAllBob();
 
 	for (int cpt = 0; cpt <= 4; cpt++)
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 
 	_graphicsManager.fadeInLong();
 	_globals.iRegul = 1;
 
 	for (int cpt = 0; cpt <= 249; cpt++)
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 
 	_globals._introSpeechOffFl = true;
 	_talkManager.startAnimatedCharacterDialogue("SVGARD1.pe2");
 	_globals._introSpeechOffFl = false;
 
 	for (int cpt = 0; cpt <= 49; cpt++)
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 
 	_graphicsManager.fadeOutLong();
 	_graphicsManager.endDisplayBob();
@@ -2028,13 +2028,13 @@ void HopkinsEngine::BASED() {
 	_objectsManager.loadLinkFile("IM92");
 
 	for (int cpt = 0; cpt <= 4; cpt++)
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 
 	_graphicsManager.fadeInLong();
 	_globals.enableHiding();
 
 	do
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 	while (_objectsManager.getBobAnimDataIdx(8) != 22);
 
 	_graphicsManager.fadeOutLong();
@@ -2071,13 +2071,13 @@ void HopkinsEngine::playEnding() {
 	_eventsManager.changeMouseCursor(0);
 
 	for (int cpt = 0; cpt <= 4; cpt++)
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 
 	_graphicsManager.fadeInLong();
 	_globals.iRegul = 1;
 
 	do
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 	while (_objectsManager.getBobAnimDataIdx(6) != 54);
 
 	_globals._introSpeechOffFl = true;
@@ -2089,13 +2089,13 @@ void HopkinsEngine::playEnding() {
 	_objectsManager.setBobAnimation(7);
 
 	do
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 	while (_objectsManager.getBobAnimDataIdx(7) != 54);
 
 	_soundManager.playSample(1);
 
 	do
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 	while (_objectsManager.getBobAnimDataIdx(7) != 65);
 
 	_globals._introSpeechOffFl = true;
@@ -2104,21 +2104,21 @@ void HopkinsEngine::playEnding() {
 	_globals._disableInventFl = true;
 
 	do
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 	while (_objectsManager.getBobAnimDataIdx(7) != 72);
 
 	_globals._introSpeechOffFl = true;
 	_talkManager.startAnimatedCharacterDialogue("DUELH1.PE2");
 
 	do
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 	while (_objectsManager.getBobAnimDataIdx(7) != 81);
 
 	_globals._introSpeechOffFl = true;
 	_talkManager.startAnimatedCharacterDialogue("DUELB5.PE2");
 
 	do
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 	while (_objectsManager.getBobAnimDataIdx(7) != 120);
 
 	_objectsManager.stopBobAnimation(7);
@@ -2170,13 +2170,13 @@ void HopkinsEngine::playEnding() {
 		_globals._disableInventFl = true;
 
 		do
-			_eventsManager.VBL();
+			_eventsManager.refreshScreenAndEvents();
 		while (_objectsManager.getBobAnimDataIdx(8) != 5);
 
 		_soundManager.directPlayWav("SOUND41.WAV");
 
 		do
-			_eventsManager.VBL();
+			_eventsManager.refreshScreenAndEvents();
 		while (_objectsManager.getBobAnimDataIdx(8) != 21);
 
 		_graphicsManager.fadeOutLong();
@@ -2336,7 +2336,7 @@ int HopkinsEngine::handleBaseMap() {
 			_eventsManager.changeMouseCursor(0);
 			_graphicsManager.SETCOLOR4(251, 100, 100, 100);
 		}
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 		if ((mouseButton == 1) && zone)
 			loopCond = true;
 	} while (!loopCond);
@@ -2504,10 +2504,10 @@ void HopkinsEngine::displayCredits() {
 		}
 		--_globals._creditsPosY;
 		if (_globals._creditsStartX != -1 || _globals._creditsEndX != -1 || _globals._creditsStartY != -1 || _globals._creditsEndY != -1) {
-			_eventsManager.VBL();
+			_eventsManager.refreshScreenAndEvents();
 			_graphicsManager.copySurface(_graphicsManager._vesaScreen, 60, 50, 520, 380, _graphicsManager._vesaBuffer, 60, 50);
 		} else {
-			_eventsManager.VBL();
+			_eventsManager.refreshScreenAndEvents();
 		}
 		if (_globals._creditsItem[_globals._creditsLineNumb - 1]._linePosY <= 39) {
 			_globals._creditsPosY = 440;
@@ -2567,7 +2567,7 @@ void HopkinsEngine::handleOceanMouseEvents() {
 				oldX -= 6;
 			_objectsManager.setSpriteX(0, oldX);
 			setSubmarineSprites();
-			_eventsManager.VBL();
+			_eventsManager.refreshScreenAndEvents();
 			if (_eventsManager.getMouseButton() == 1 && oldPosX == _eventsManager.getMouseX() && _eventsManager.getMouseY() == oldPosY) {
 				displAnim = true;
 				break;
@@ -2603,7 +2603,7 @@ void HopkinsEngine::handleOceanMouseEvents() {
 				oldX += 6;
 			_objectsManager.setSpriteX(0, oldX);
 			setSubmarineSprites();
-			_eventsManager.VBL();
+			_eventsManager.refreshScreenAndEvents();
 			if (_eventsManager.getMouseButton() == 1 && oldPosX == _eventsManager.getMouseX() && _eventsManager.getMouseY() == oldPosY) {
 				displAnim = true;
 				break;
@@ -2625,7 +2625,7 @@ void HopkinsEngine::handleOceanMouseEvents() {
 					oldX += 6;
 				_objectsManager.setSpriteX(0, oldX);
 				setSubmarineSprites();
-				_eventsManager.VBL();
+				_eventsManager.refreshScreenAndEvents();
 				if (_eventsManager.getMouseButton() == 1 && oldPosX == _eventsManager.getMouseX() && _eventsManager.getMouseY() == oldPosY) {
 					displAnim = true;
 					break;
@@ -2648,7 +2648,7 @@ void HopkinsEngine::handleOceanMouseEvents() {
 					oldX -= 6;
 				_objectsManager.setSpriteX(0, oldX);
 				setSubmarineSprites();
-				_eventsManager.VBL();
+				_eventsManager.refreshScreenAndEvents();
 				if (_eventsManager.getMouseButton() == 1 && oldPosX == _eventsManager.getMouseX() && _eventsManager.getMouseY() == oldPosY) {
 					displAnim = true;
 					break;
@@ -2679,7 +2679,7 @@ void HopkinsEngine::handleOceanMouseEvents() {
 					oldX += 6;
 				_objectsManager.setSpriteX(0, oldX);
 				setSubmarineSprites();
-				_eventsManager.VBL();
+				_eventsManager.refreshScreenAndEvents();
 				if (_eventsManager.getMouseButton() == 1 && oldPosX == _eventsManager.getMouseX() && _eventsManager.getMouseY() == oldPosY) {
 					displAnim = true;
 					break;
@@ -2699,7 +2699,7 @@ void HopkinsEngine::handleOceanMouseEvents() {
 					oldX -= 6;
 				_objectsManager.setSpriteX(0, oldX);
 				setSubmarineSprites();
-				_eventsManager.VBL();
+				_eventsManager.refreshScreenAndEvents();
 				if (_eventsManager.getMouseButton() == 1 && oldPosX == _eventsManager.getMouseX() && _eventsManager.getMouseY() == oldPosY)
 					break;
 
@@ -2802,7 +2802,7 @@ void HopkinsEngine::handleOceanMaze(int16 curExitId, Common::String backgroundFi
 	_eventsManager.changeMouseCursor(4);
 
 	for (int cpt = 0; cpt <= 4; cpt++)
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 
 	if (!_graphicsManager._noFadingFl)
 		_graphicsManager.fadeInLong();
@@ -2815,7 +2815,7 @@ void HopkinsEngine::handleOceanMaze(int16 curExitId, Common::String backgroundFi
 			handleOceanMouseEvents();
 		_linesManager.checkZone();
 		setSubmarineSprites();
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 		if (_globals._exitId || g_system->getEventManager()->shouldQuit())
 			break;
 	}
@@ -2871,7 +2871,7 @@ bool HopkinsEngine::displayAdultDisclaimer() {
 		else if (xp >= 424 && xp <= 602 && yp >= 406 && yp <= 445)
 			buttonIndex = 1;
 
-		_eventsManager.VBL();
+		_eventsManager.refreshScreenAndEvents();
 	} while (!shouldQuit() && (buttonIndex == 0 || _eventsManager.getMouseButton() != 1));
 
 	_globals._disableInventFl = false;
diff --git a/engines/hopkins/menu.cpp b/engines/hopkins/menu.cpp
index 20b531f..e2e4859 100644
--- a/engines/hopkins/menu.cpp
+++ b/engines/hopkins/menu.cpp
@@ -125,7 +125,7 @@ int MenuManager::menu() {
 			_vm->_graphicsManager.fastDisplay(spriteData, 230, 322, frameIndex[2] + 4);
 			_vm->_graphicsManager.fastDisplay(spriteData, 230, 354, frameIndex[3] + 6);
 			_vm->_graphicsManager.fastDisplay(spriteData, 230, 386, frameIndex[4] + 8);
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 
 			if (_vm->_eventsManager.getMouseButton() == 1 && menuIndex != MENU_NONE)
 				selectionMade = true;
@@ -133,7 +133,7 @@ int MenuManager::menu() {
 
 		if (menuIndex > MENU_NONE) {
 			_vm->_graphicsManager.fastDisplay(spriteData, 230, 259 + 32 * (menuIndex - 1), 10 + (menuIndex - 1));
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 			_vm->_eventsManager.delay(200);
 		}
 
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index 25e8345..ab800e8 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -1766,7 +1766,7 @@ void ObjectsManager::handleCityMap() {
 	_vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0);
 
 	for (int i = 0; i <= 4; i++)
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 
 	_vm->_globals.iRegul = 1;
 	_vm->_graphicsManager.fadeInLong();
@@ -1803,7 +1803,7 @@ void ObjectsManager::handleCityMap() {
 
 		if (_vm->_linesManager._route == (RouteItem *)g_PTRNUL && _vm->_globals._actionMoveTo)
 			PARADISE();
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 
 		if (_vm->_globals._exitId)
 			loopCond = true;
@@ -1983,7 +1983,7 @@ void ObjectsManager::PARADISE() {
 						if (_vm->_eventsManager.getMouseX() > _vm->_graphicsManager._scrollPosX + 620)
 							_vm->_eventsManager.setMouseXY(_vm->_eventsManager._mousePos.x - 4, _vm->_eventsManager.getMouseY());
 
-						_vm->_eventsManager.VBL();
+						_vm->_eventsManager.refreshScreenAndEvents();
 					} while (!loopCond && _vm->_eventsManager._startPos.x > getSpriteX(0) - 320);
 				} else if (_vm->_eventsManager._startPos.x + 320 - getSpriteX(0) < -160) {
 					bool loopCond = false;
@@ -2000,14 +2000,14 @@ void ObjectsManager::PARADISE() {
 						if (_vm->_eventsManager.getMouseX() < _vm->_graphicsManager._scrollPosX + 10)
 							_vm->_eventsManager.setMouseXY(_vm->_eventsManager._mousePos.x + 4, _vm->_eventsManager.getMouseY());
 
-						_vm->_eventsManager.VBL();
+						_vm->_eventsManager.refreshScreenAndEvents();
 					} while (!loopCond && _vm->_eventsManager._startPos.x < getSpriteX(0) - 320);
 				}
 				if (_vm->_eventsManager.getMouseX() > _vm->_graphicsManager._scrollPosX + 620)
 					_vm->_eventsManager.setMouseXY(_vm->_graphicsManager._scrollPosX + 610, 0);
 				if (_vm->_eventsManager.getMouseX() < _vm->_graphicsManager._scrollPosX + 10)
 					_vm->_eventsManager.setMouseXY(_vm->_graphicsManager._scrollPosX + 10, 0);
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 				_vm->_graphicsManager._scrollStatus = 0;
 			}
 			_vm->_talkManager.REPONSE(_vm->_globals._saveData->_data[svLastZoneNum], _vm->_globals._saveData->_data[svLastMouseCursor]);
@@ -2687,7 +2687,7 @@ void ObjectsManager::handleSpecialGames() {
 
 		_vm->_globals._disableInventFl = true;
 		do
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 		while (getBobAnimDataIdx(8) != 3);
 		_vm->_globals._introSpeechOffFl = true;
 		_vm->_talkManager.startAnimatedCharacterDialogue("GM3.PE2");
@@ -2987,7 +2987,7 @@ void ObjectsManager::OPTI_ONE(int idx, int animIdx, int destPosi, int animAction
 
 	// Make Hopkins walk to the expected place
 	do {
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 	} while (destPosi != getBobAnimDataIdx(idx));
 
 	if (!animAction)
@@ -2996,7 +2996,7 @@ void ObjectsManager::OPTI_ONE(int idx, int animIdx, int destPosi, int animAction
 		_vm->_graphicsManager.fastDisplay(_bob[idx]._spriteData,
 			_bob[idx]._oldX, _bob[idx]._oldY, _bob[idx]._frameIndex);
 		stopBobAnimation(idx);
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 	}
 }
 
@@ -3203,7 +3203,7 @@ void ObjectsManager::loadLinkFile(const Common::String &file) {
 	_vm->_globals.freeMemory(ptr);
 }
 
-void ObjectsManager::SPECIAL_INI() {
+void ObjectsManager::sceneSpecialIni() {
 	switch (_vm->_globals._screenId) {
 	case 17:
 		if (_vm->_globals._prevScreenId == 20) {
@@ -3213,11 +3213,11 @@ void ObjectsManager::SPECIAL_INI() {
 			_vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100);
 			_vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0);
 			for (int i = 0; i <= 4; i++)
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			_vm->_graphicsManager.fadeInLong();
 			animateSprite(0);
 			for (int i = 0; i <= 4; i++)
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			VBOB(_vm->_globals.SPRITE_ECRAN, 5, 15, 28, 1);
 			_vm->_fontManager.hideText(9);
 			bool displayedTxtFl = false;
@@ -3233,12 +3233,12 @@ void ObjectsManager::SPECIAL_INI() {
 			_vm->_globals._saveData->_data[svField320] = 1;
 			if (_vm->_soundManager._voiceOffFl) {
 				for (int i = 0; i <= 199; i++)
-					_vm->_eventsManager.VBL();
+					_vm->_eventsManager.refreshScreenAndEvents();
 			}
 			_vm->_fontManager.hideText(9);
 			VBOB_OFF(5);
 			for (int i = 0; i <= 3; i++)
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			_vm->_graphicsManager._noFadingFl = true;
 			_vm->_globals._disableInventFl = false;
 		}
@@ -3248,7 +3248,7 @@ void ObjectsManager::SPECIAL_INI() {
 		if (_vm->_globals._prevScreenId == 17) {
 			_vm->_eventsManager._mouseSpriteId = 4;
 			for (int i = 0; i <= 4; i++)
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			_vm->_graphicsManager.fadeInLong();
 			_vm->_globals.iRegul = 1;
 			_vm->_globals._disableInventFl = false;
@@ -3328,7 +3328,7 @@ void ObjectsManager::SCI_OPTI_ONE(int idx, int animIdx, int animDataIdx, int a4)
 	}
 
 	do {
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 		if (_vm->_eventsManager._curMouseButton)
 			break;
 	} while (animDataIdx != getBobAnimDataIdx(idx));
@@ -3480,7 +3480,7 @@ void ObjectsManager::ACTION(const byte *spriteData, const Common::String &action
 				_sprite[0]._spriteIndex = idx;
 			}
 			for (int i = 0; i < realSpeed; i++)
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			if (idx == -1)
 				break;
 		}
@@ -3525,7 +3525,7 @@ void ObjectsManager::SPACTION(byte *spriteData, const Common::String &animationS
 			_sprite[0]._spriteIndex = spriteIndex;
 		}
 		for (int i = 0; i < realSpeed; i++)
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 	} while (spriteIndex != -1);
 }
 
@@ -3563,7 +3563,7 @@ void ObjectsManager::SPACTION1(byte *spriteData, const Common::String &animStrin
 			}
 
 			for (int i = 0; i < realSpeed; i++)
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 
 			if (spriteIndex == -1)
 				break;
@@ -3702,7 +3702,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo
 	_vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0);
 	_vm->_eventsManager.changeMouseCursor(4);
 	for (int i = 0; i <= 4; i++)
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 	_vm->_graphicsManager.fadeInLong();
 	if (_vm->_globals._screenId == 61) {
 		_vm->_animationManager.playSequence("OUVRE.SEQ", 10, 4, 10);
@@ -3716,7 +3716,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo
 		_vm->_globals._checkDistanceFl = true;
 		do {
 			GOHOME();
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 		} while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
 		setSpriteIndex(0, 64);
 	}
@@ -3732,7 +3732,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo
 		if (_vm->_globals._actionMoveTo)
 			PARADISE();
 		if (!_vm->_globals._exitId)
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 
 		if (_vm->_globals._exitId)
 			break;
@@ -3821,7 +3821,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm
 	_vm->_globals.enableHiding();
 	_vm->_linesManager._route = (RouteItem *)g_PTRNUL;
 	computeAndSetSpriteSize();
-	SPECIAL_INI();
+	sceneSpecialIni();
 	_vm->_eventsManager._mouseSpriteId = 4;
 	_oldCharacterPosX = _characterPos.x;
 	_oldCharacterPosY = _characterPos.y;
@@ -3829,7 +3829,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm
 	_vm->_globals.Compteur = 0;
 
 	for (int idx = 0; idx < 5; ++idx)
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 
 	_vm->_globals.iRegul = 1;
 	if (!_vm->_graphicsManager._noFadingFl)
@@ -3872,7 +3872,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm
 					PARADISE();
 			}
 			handleSpecialGames();
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 			if (!_vm->_globals._exitId)
 				continue;
 		}
diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h
index 7c9a321..6f4657a 100644
--- a/engines/hopkins/objects.h
+++ b/engines/hopkins/objects.h
@@ -127,7 +127,7 @@ private:
 	int getBobFrameIndex(int idx);
 	void handleForest(int screenId, int minX, int maxX, int minY, int maxY, int idx);
 
-	void SPECIAL_INI();
+	void sceneSpecialIni();
 	void ACTION(const byte *spriteData, const Common::String &actionStr, int speed, bool flipFl);
 public:
 	bool _disableFl;
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 83eaef5..c79f888 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -129,7 +129,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				do {
 					if (_vm->shouldQuit())
 						return -1; // Exiting game
-					_vm->_eventsManager.VBL();
+					_vm->_eventsManager.refreshScreenAndEvents();
 				} while (_vm->_soundManager._soundFl);
 			}
 			bool displayedTxtFl = false;
@@ -196,7 +196,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 							return -1; // Exiting game
 
 						--v4;
-						_vm->_eventsManager.VBL();
+						_vm->_eventsManager.refreshScreenAndEvents();
 					} while (v4);
 				}
 			}
@@ -469,7 +469,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			if (_vm->shouldQuit())
 				return -1; // Exiting game
 
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 		}
 		opcodeType = 1;
 		break;
@@ -538,8 +538,8 @@ int ScriptManager::handleOpcode(byte *dataP) {
 
 		case 12:
 			_vm->_fontManager.hideText(9);
-			_vm->_eventsManager.VBL();
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
+			_vm->_eventsManager.refreshScreenAndEvents();
 			_vm->_talkManager.startAnimatedCharacterDialogue("bqetueur.pe2");
 			break;
 
@@ -570,7 +570,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			}
 
 			_vm->_eventsManager.mouseOff();
@@ -579,7 +579,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(3) != 100);
 			_vm->_graphicsManager.fadeOutDefaultLength(_vm->_graphicsManager._vesaBuffer);
 			_vm->_graphicsManager.endDisplayBob();
@@ -600,7 +600,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			}
 
 			_vm->_eventsManager.mouseOff();
@@ -683,7 +683,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					if (_vm->shouldQuit())
 						return -1; // Exiting game
 
-					_vm->_eventsManager.VBL();
+					_vm->_eventsManager.refreshScreenAndEvents();
 				} while (_vm->_soundManager._soundFl);
 			}
 			_vm->_talkManager.startAnimatedCharacterDialogue("PTLAB.pe2");
@@ -761,7 +761,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					return -1; // Exiting game
 
 				_vm->_objectsManager.GOHOME();
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
 			_vm->_objectsManager.removeSprite(0);
 			_vm->_globals._checkDistanceFl = true;
@@ -815,7 +815,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 249, 2);
 				if (_vm->_objectsManager.getBobAnimDataIdx(10) == 34)
 					_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 249, 3);
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(9) != 36);
 			_vm->_objectsManager.animateSprite(0);
 			_vm->_objectsManager.stopBobAnimation(9);
@@ -863,7 +863,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				}
 				if (_vm->_objectsManager.getBobAnimDataIdx(10) == 12)
 					v20 = 0;
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(9) != v19);
 			if (v19 == 12) {
 				_vm->_objectsManager.animateSprite(0);
@@ -900,7 +900,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					_vm->_soundManager.playWav(1);
 					v52 = true;
 				}
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(12) != 34);
 			_vm->_objectsManager.stopBobAnimation(2);
 			_vm->_graphicsManager.fadeOutLong();
@@ -973,7 +973,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					return -1; // Exiting game
 
 				_vm->_objectsManager.GOHOME();
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
 			_vm->_objectsManager.removeSprite(0);
 			_vm->_objectsManager.setBobAnimation(7);
@@ -998,7 +998,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					v18 = 0;
 				if (_vm->_objectsManager.getBobAnimDataIdx(7) == 19)
 					_vm->_objectsManager.setBobAnimation(3);
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(3) != 48);
 			_vm->_soundManager.removeSample(1);
 			_vm->_objectsManager.setSpriteIndex(0, 62);
@@ -1049,7 +1049,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					_vm->_objectsManager.setBobAnimDataIdx(4, 0);
 					_vm->_objectsManager.setBobAnimDataIdx(13, 0);
 				}
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(4) != 16);
 			_vm->_objectsManager.stopBobAnimation(12);
 			_vm->_objectsManager.stopBobAnimation(4);
@@ -1073,7 +1073,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					return -1; // Exiting game
 
 				_vm->_objectsManager.GOHOME();
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
 			_vm->_objectsManager.removeSprite(0);
 			_vm->_objectsManager.setBobAnimation(11);
@@ -1100,7 +1100,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				}
 				if (_vm->_objectsManager.getBobAnimDataIdx(8) == 12)
 					v24 = 0;
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(8) != 32);
 			_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 201, 14, 1);
 			_vm->_objectsManager.animateSprite(0);
@@ -1115,7 +1115,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(5) != 74);
 			_vm->_objectsManager.stopBobAnimation(5);
 			_vm->_objectsManager.stopBobAnimation(6);
@@ -1142,7 +1142,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(5) != 6);
 			_vm->_objectsManager.stopBobAnimation(5);
 			_vm->_objectsManager.setBobAnimation(6);
@@ -1204,7 +1204,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					}
 					if (_vm->_objectsManager.getBobAnimDataIdx(1) == 8)
 						v25 = 0;
-					_vm->_eventsManager.VBL();
+					_vm->_eventsManager.refreshScreenAndEvents();
 				} while (_vm->_objectsManager.getBobAnimDataIdx(1) != 9);
 				_vm->_objectsManager.stopBobAnimation(1);
 				_vm->_objectsManager.stopBobAnimation(2);
@@ -1246,7 +1246,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					}
 					if (_vm->_objectsManager.getBobAnimDataIdx(1) == 8)
 						v26 = 0;
-					_vm->_eventsManager.VBL();
+					_vm->_eventsManager.refreshScreenAndEvents();
 				} while (_vm->_objectsManager.getBobAnimDataIdx(1) != 9);
 				_vm->_objectsManager.stopBobAnimation(1);
 				_vm->_objectsManager.stopBobAnimation(3);
@@ -1326,7 +1326,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(9) != 15);
 			_vm->_objectsManager.stopBobAnimation(9);
 			_vm->_objectsManager.animateSprite(0);
@@ -1335,7 +1335,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(12) != 117);
 			_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 830, 122, 0);
 			_vm->_objectsManager.stopBobAnimation(12);
@@ -1363,9 +1363,9 @@ int ScriptManager::handleOpcode(byte *dataP) {
 			_vm->_talkManager.startAnimatedCharacterDialogue("tourist1.pe2");
 			_vm->_globals._introSpeechOffFl = false;
 			_vm->_animationManager.playAnim2("T421.ANM", 100, 14, 500);
-			_vm->_eventsManager.VBL();
-			_vm->_eventsManager.VBL();
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
+			_vm->_eventsManager.refreshScreenAndEvents();
+			_vm->_eventsManager.refreshScreenAndEvents();
 			_vm->_globals._introSpeechOffFl = true;
 			_vm->_talkManager.startAnimatedCharacterDialogue("tourist2.pe2");
 			_vm->_globals._introSpeechOffFl = false;
@@ -1398,7 +1398,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					return -1; // Exiting game
 
 				_vm->_objectsManager.GOHOME();
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
 			_vm->_objectsManager.removeSprite(0);
 			_vm->_objectsManager.setSpriteIndex(0, 60);
@@ -1428,7 +1428,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					}
 					if (_vm->_objectsManager.getBobAnimDataIdx(4) == 56)
 						v33 = 0;
-					_vm->_eventsManager.VBL();
+					_vm->_eventsManager.refreshScreenAndEvents();
 				} while (_vm->_objectsManager.getBobAnimDataIdx(4) != 72);
 				_vm->_objectsManager.stopBobAnimation(4);
 			}
@@ -1457,7 +1457,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					}
 					if (_vm->_objectsManager.getBobAnimDataIdx(6) == 56)
 						v34 = 0;
-					_vm->_eventsManager.VBL();
+					_vm->_eventsManager.refreshScreenAndEvents();
 				} while (_vm->_objectsManager.getBobAnimDataIdx(6) != 72);
 				_vm->_objectsManager.stopBobAnimation(6);
 			}
@@ -1486,7 +1486,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					}
 					if (_vm->_objectsManager.getBobAnimDataIdx(5) == 56)
 						v35 = 0;
-					_vm->_eventsManager.VBL();
+					_vm->_eventsManager.refreshScreenAndEvents();
 				} while (_vm->_objectsManager.getBobAnimDataIdx(5) != 72);
 				_vm->_objectsManager.stopBobAnimation(5);
 			}
@@ -1506,28 +1506,28 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(4) != 10);
 			_vm->_soundManager.playWav(1);
 			do {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(4) != 18);
 			_vm->_soundManager.playWav(2);
 			do {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(4) != 62);
 			_vm->_soundManager.playWav(3);
 			do {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(4) != 77);
 			_vm->_objectsManager.stopBobAnimation(4);
 			_vm->_objectsManager.animateSprite(0);
@@ -1544,28 +1544,28 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(5) != 10);
 			_vm->_soundManager.playWav(1);
 			do {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(5) != 18);
 			_vm->_soundManager.playWav(2);
 			do {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(5) != 38);
 			_vm->_soundManager.playWav(3);
 			do {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(5) != 53);
 			_vm->_objectsManager.stopBobAnimation(5);
 			_vm->_objectsManager.animateSprite(0);
@@ -1639,7 +1639,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					return -1; // Exiting game
 
 				_vm->_objectsManager.GOHOME();
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
 			_vm->_globals._exitId = 59;
 			break;
@@ -1667,7 +1667,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					return -1; // Exiting game
 
 				_vm->_objectsManager.GOHOME();
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
 			_vm->_globals._exitId = 59;
 			break;
@@ -1688,7 +1688,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(10) != 7);
 			_vm->_objectsManager.setBobAnimation(6);
 			_vm->_objectsManager.stopBobAnimation(3);
@@ -1696,7 +1696,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(6) != 10);
 			_vm->_soundManager.playSoundFile("SOUND71.WAV");
 			_vm->_objectsManager.setBobAnimation(7);
@@ -1705,7 +1705,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(7) != 15);
 			_vm->_objectsManager.stopBobAnimation(5);
 			_vm->_objectsManager.setBobAnimation(8);
@@ -1714,7 +1714,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(8) != 76);
 			_vm->_objectsManager.stopBobAnimation(6);
 			_vm->_objectsManager.stopBobAnimation(7);
@@ -1748,7 +1748,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(3) != 18);
 			_vm->_objectsManager.stopBobAnimation(3);
 			_vm->_objectsManager.setBobAnimation(4);
@@ -1767,7 +1767,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 				if (_vm->_objectsManager.getBobAnimDataIdx(4) == 18)
 					_vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 18, 334, 0, false);
 			} while (_vm->_objectsManager.getBobAnimDataIdx(4) != 26);
@@ -1790,7 +1790,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				}
 				if (_vm->_objectsManager.getBobAnimDataIdx(3) == 11)
 					v41 = 0;
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(3) != 50);
 			_vm->_objectsManager.stopBobAnimation(3);
 			_vm->_objectsManager.animateSprite(0);
@@ -1812,7 +1812,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				}
 				if (_vm->_objectsManager.getBobAnimDataIdx(4) == 11)
 					v42 = 0;
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(4) != 24);
 			_vm->_objectsManager.stopBobAnimation(4);
 			_vm->_objectsManager.animateSprite(0);
@@ -1840,7 +1840,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					return -1; // Exiting game
 
 				_vm->_objectsManager.GOHOME();
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
 			_vm->_objectsManager.setSpriteIndex(0, 64);
 			_vm->_globals._exitId = _vm->_globals._saveData->_data[svField401];
@@ -1858,7 +1858,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(1) != 9);
 			_vm->_objectsManager.stopBobAnimation(1);
 			_vm->_linesManager._route = (RouteItem *)g_PTRNUL;
@@ -1871,7 +1871,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					return -1; // Exiting game
 
 				_vm->_objectsManager.GOHOME();
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
 			_vm->_objectsManager.setSpriteIndex(0, 64);
 			_vm->_objectsManager.setBobAnimation(2);
@@ -1880,7 +1880,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(2) != 10);
 			_vm->_objectsManager.stopBobAnimation(2);
 			_vm->_objectsManager.setBobAnimation(4);
@@ -1922,7 +1922,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			}
 
 			_vm->_graphicsManager.SETCOLOR4(252, 100, 100, 100);
@@ -1968,7 +1968,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					return -1; // Exiting game
 
 				_vm->_objectsManager.GOHOME();
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_linesManager._route != (RouteItem *)g_PTRNUL);
 			_vm->_objectsManager.removeSprite(0);
 			int v45 = 0;
@@ -1981,7 +1981,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 					v45 = 1;
 					_vm->_soundManager.playSoundFile("SOUND81.WAV");
 				}
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(7) != 15);
 			_vm->_objectsManager.stopBobAnimation(7);
 			_vm->_objectsManager.setSpriteX(0, 476);
@@ -2003,7 +2003,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(12) != 6);
 			_vm->_globals._introSpeechOffFl = true;
 			_vm->_talkManager.startAnimatedCharacterDialogue("PRMORT.pe2");
@@ -2012,7 +2012,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(12) != 12);
 			_vm->_objectsManager.animateSprite(0);
 			_vm->_objectsManager.stopBobAnimation(12);
@@ -2028,7 +2028,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 				if (_vm->_objectsManager.getBobAnimDataIdx(11) == 10 && !v46)
 					v46 = 1;
 			} while (_vm->_objectsManager.getBobAnimDataIdx(11) != 13);
@@ -2039,7 +2039,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			} while (_vm->_objectsManager.getBobAnimDataIdx(13) != 48);
 			_vm->_globals._introSpeechOffFl = true;
 			_vm->_talkManager.startAnimatedCharacterDialogue("HRADIO.PE2");
@@ -2170,7 +2170,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 				if (_vm->_objectsManager.getBobAnimDataIdx(1) == 12 && !soundFlag) {
 					_vm->_soundManager.playSoundFile("SOUND86.WAV");
 					soundFlag = true;
@@ -2199,7 +2199,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			}
 			CharacterLocation *v51 = &_vm->_globals._saveData->_realHopkins;
 			v51->_pos.x = _vm->_objectsManager.getSpriteX(0);
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 55c1155..62504da 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -595,7 +595,7 @@ bool SoundManager::mixVoice(int voiceId, int voiceMode, bool dispTxtFl) {
 	breakFlag = false;
 	do {
 		if (_specialSoundNum != 4 && !_skipRefreshFl)
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 		if (_vm->_eventsManager.getMouseButton())
 			break;
 		_vm->_eventsManager.refreshEvents();
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index ba73d21..f1a4ca0 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -54,7 +54,7 @@ void TalkManager::startAnimatedCharacterDialogue(const Common::String &filename)
 
 	_vm->_fontManager.hideText(5);
 	_vm->_fontManager.hideText(9);
-	_vm->_eventsManager.VBL();
+	_vm->_eventsManager.refreshScreenAndEvents();
 	_vm->_graphicsManager._scrollStatus = 1;
 	bool oldDisableInventFl = _vm->_globals._disableInventFl;
 	_vm->_globals._disableInventFl = true;
@@ -113,7 +113,7 @@ void TalkManager::startAnimatedCharacterDialogue(const Common::String &filename)
 				answer = dialogAnswer(dlgAnswer, false);
 			if (answer == -1)
 				dlgAnswer = _dialogueMesgId4;
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 		} while (dlgAnswer != _dialogueMesgId4);
 	}
 	if (_vm->_globals._introSpeechOffFl) {
@@ -150,7 +150,7 @@ void TalkManager::startAnimatedCharacterDialogue(const Common::String &filename)
 	_vm->_globals._disableInventFl = oldDisableInventFl;
 	_vm->_graphicsManager.updateScreen();
 	for (int i = 0; i <= 4; i++)
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 	_vm->_graphicsManager._scrollStatus = 0;
 }
 
@@ -286,7 +286,7 @@ int TalkManager::dialogQuestion(bool animatedFl) {
 			retVal = _dialogueMesgId4;
 		}
 
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 		if (_vm->_eventsManager.getMouseButton())
 			loopCond = true;
 		if (retVal == -1)
@@ -325,7 +325,7 @@ int TalkManager::dialogQuestion(bool animatedFl) {
 		dialogTalk();
 	}
 
-	_vm->_eventsManager.VBL();
+	_vm->_eventsManager.refreshScreenAndEvents();
   return retVal;
 }
 
@@ -390,11 +390,11 @@ int TalkManager::dialogAnswer(int idx, bool animatedFl) {
 
 		if (_vm->getIsDemo()) {
 			for (int i = 0; i < frameNumb; i++) {
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 			}
 		} else {
 			for (int i = 0; i < frameNumb; i++) {
-				_vm->_eventsManager.VBL();
+				_vm->_eventsManager.refreshScreenAndEvents();
 				if (_vm->_eventsManager._mouseButton || _vm->_eventsManager._curMouseButton)
 					break;
 				if (_vm->_eventsManager.getMouseButton() && i + 1 > abs(frameNumb / 5))
@@ -496,8 +496,8 @@ void TalkManager::dialogEndTalk() {
 			_vm->_objectsManager.hideBob(idx);
 	}
 
-	_vm->_eventsManager.VBL();
-	_vm->_eventsManager.VBL();
+	_vm->_eventsManager.refreshScreenAndEvents();
+	_vm->_eventsManager.refreshScreenAndEvents();
 
 	for (int idx = 21; idx <= 25; ++idx) {
 		if (_vm->_globals._animBqe[idx]._enabledFl)
@@ -882,7 +882,7 @@ void TalkManager::REPONSE2(int zone, int verb) {
 		_vm->_soundManager.playSample(1);
 		_vm->_objectsManager.SPACTION1(_vm->_objectsManager._forestSprite, "13,14,15,14,13,12,13,14,15,16,-1,", 4);
 		do
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 		while (_vm->_objectsManager.getBobAnimDataIdx(6) < 12);
 		_vm->_objectsManager.stopBobAnimation(6);
 		_vm->_objectsManager.setBobAnimation(8);
@@ -930,7 +930,7 @@ void TalkManager::REPONSE2(int zone, int verb) {
 		_vm->_soundManager.playSample(1);
 		_vm->_objectsManager.SPACTION1(_vm->_objectsManager._forestSprite, "13,14,15,14,13,12,13,14,15,16,-1,", 4);
 		do
-			_vm->_eventsManager.VBL();
+			_vm->_eventsManager.refreshScreenAndEvents();
 		while (_vm->_objectsManager.getBobAnimDataIdx(5) < 12);
 		_vm->_objectsManager.stopBobAnimation(5);
 		_vm->_objectsManager.setBobAnimation(7);
@@ -966,7 +966,7 @@ void TalkManager::REPONSE2(int zone, int verb) {
 void TalkManager::animateObject(const Common::String &filename) {
 	_vm->_fontManager.hideText(5);
 	_vm->_fontManager.hideText(9);
-	_vm->_eventsManager.VBL();
+	_vm->_eventsManager.refreshScreenAndEvents();
 	_vm->_graphicsManager._scrollStatus = 1;
 	_vm->_linesManager.clearAllZones();
 	_vm->_linesManager.resetLines();
@@ -1037,7 +1037,7 @@ void TalkManager::animateObject(const Common::String &filename) {
 		_vm->_linesManager.checkZone();
 		if (_vm->_globals._actionMoveTo)
 			_vm->_objectsManager.PARADISE();
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 	} while (!_vm->_globals._exitId);
 	dialogEndTalk();
 	dialogTalk();
@@ -1084,7 +1084,7 @@ void TalkManager::animateObject(const Common::String &filename) {
 	_vm->_globals._disableInventFl = false;
 	_vm->_graphicsManager.updateScreen();
 	for (int i = 0; i <= 4; i++)
-		_vm->_eventsManager.VBL();
+		_vm->_eventsManager.refreshScreenAndEvents();
 	_vm->_graphicsManager._scrollStatus = 0;
 }

More information about the Scummvm-git-logs mailing list