[Scummvm-cvs-logs] scummvm master -> ba7d71d553b8c75699d5d3e737688d71c4f145c8

bluegr md5 at scummvm.org
Mon Sep 26 00:49:41 CEST 2011


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:
ba7d71d553 AGI: doUpdate() already calls updateScreen()


Commit: ba7d71d553b8c75699d5d3e737688d71c4f145c8
    https://github.com/scummvm/scummvm/commit/ba7d71d553b8c75699d5d3e737688d71c4f145c8
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-09-25T15:43:14-07:00

Commit Message:
AGI: doUpdate() already calls updateScreen()

Changed paths:
    engines/agi/graphics.cpp
    engines/agi/preagi.cpp
    engines/agi/preagi_mickey.cpp
    engines/agi/preagi_troll.cpp
    engines/agi/preagi_winnie.cpp



diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index eb162e4..074e557 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -1192,7 +1192,6 @@ void GfxMgr::flushScreen() {
 	flushBlock(0, 0, GFX_WIDTH - 1, GFX_HEIGHT - 1);
 
 	doUpdate();
-	g_system->updateScreen();
 }
 
 /**
diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp
index 34180b5..8d407ec 100644
--- a/engines/agi/preagi.cpp
+++ b/engines/agi/preagi.cpp
@@ -185,7 +185,6 @@ void PreAgiEngine::printStr(const char* szMsg) {
 	clearTextArea();
 	drawStr(21, 0, IDA_DEFAULT, szMsg);
 	_gfx->doUpdate();
-	_system->updateScreen();
 }
 
 void PreAgiEngine::XOR80(char *buffer) {
@@ -284,7 +283,6 @@ void PreAgiEngine::waitForTimer(int msec_delay) {
 
 	while (_system->getMillis() < start_time + msec_delay) {
 		_gfx->doUpdate();
-		_system->updateScreen();
 		_system->delayMillis(10);
 	}
 }
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp
index 6d1eb44..ed4882f 100644
--- a/engines/agi/preagi_mickey.cpp
+++ b/engines/agi/preagi_mickey.cpp
@@ -150,7 +150,6 @@ void MickeyEngine::printStr(char *buffer) {
 
 	// Show the string on screen
 	_gfx->doUpdate();
-	_system->updateScreen();
 }
 
 void MickeyEngine::printLine(const char *buffer) {
@@ -160,7 +159,6 @@ void MickeyEngine::printLine(const char *buffer) {
 
 	// Show the string on screen
 	_gfx->doUpdate();
-	_system->updateScreen();
 
 	waitAnyKey(true);
 }
@@ -284,7 +282,6 @@ void MickeyEngine::drawMenu(MSA_MENU menu, int sel0, int sel1) {
 
 	// Menu created, show it on screen
 	_gfx->doUpdate();
-	_system->updateScreen();
 }
 
 void MickeyEngine::getMouseMenuSelRow(MSA_MENU menu, int *sel0, int *sel1, int iRow, int x, int y) {
@@ -1364,7 +1361,6 @@ void MickeyEngine::flipSwitch() {
 			strcpy(_gameStateMickey.szAddr, (char *)IDS_MSA_ADDR_PLANET[_gameStateMickey.iPlanetXtal[_gameStateMickey.nXtals]]);
 			_gameStateMickey.nButtons = strlen(_gameStateMickey.szAddr);
 			_gfx->doUpdate();
-			_system->updateScreen();	// TODO: this should go in the game's main loop
 #endif
 
 			waitAnyKey(true);
@@ -1452,14 +1448,12 @@ void MickeyEngine::intro() {
 		//Set screen to white
 		_gfx->clearScreen(15);
 		_gfx->doUpdate();
-		_system->updateScreen();
 
 		_system->delayMillis(IDI_MSA_ANIM_DELAY);
 
 		//Set back to black
 		_gfx->clearScreen(0);
 		_gfx->doUpdate();
-		_system->updateScreen();
 
 		drawRoom();
 		printDesc(_gameStateMickey.iRoom);
diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp
index c2e2bef..50b2945 100644
--- a/engines/agi/preagi_troll.cpp
+++ b/engines/agi/preagi_troll.cpp
@@ -362,7 +362,6 @@ void TrollEngine::intro() {
 	drawStr(9, 10, kColorDefault, IDS_TRO_INTRO_0);
 	drawStr(14, 15, kColorDefault, IDS_TRO_INTRO_1);
 	_gfx->doUpdate();
-	_system->updateScreen();
 	_system->delayMillis(3200);
 
 	CursorMan.showMouse(true);
diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp
index fee8fde..cc5c247 100644
--- a/engines/agi/preagi_winnie.cpp
+++ b/engines/agi/preagi_winnie.cpp
@@ -193,7 +193,6 @@ void WinnieEngine::intro() {
 	drawPic(IDS_WTP_FILE_LOGO);
 	printStr(IDS_WTP_INTRO_0);
 	_gfx->doUpdate();
-	_system->updateScreen();
 	_system->delayMillis(0x640);
 
 	if (getPlatform() == Common::kPlatformAmiga)
@@ -203,7 +202,6 @@ void WinnieEngine::intro() {
 
 	printStr(IDS_WTP_INTRO_1);
 	_gfx->doUpdate();
-	_system->updateScreen();
 	_system->delayMillis(0x640);
 
 	if (!playSound(IDI_WTP_SND_POOH_0))
@@ -455,7 +453,6 @@ int WinnieEngine::parser(int pc, int index, uint8 *buffer) {
 		if (iBlock == 1)
 			return IDI_WTP_PAR_OK;
 		_gfx->doUpdate();
-		_system->updateScreen();
 	}
 
 	return IDI_WTP_PAR_OK;
@@ -481,7 +478,6 @@ void WinnieEngine::inventory() {
 
 	drawStr(IDI_WTP_ROW_OPTION_4, IDI_WTP_COL_MENU, IDA_DEFAULT, missing.c_str());
 	_gfx->doUpdate();
-	_system->updateScreen(); //TODO: Move to game's main loop
 	getSelection(kSelAnyKey);
 }
 
@@ -760,7 +756,6 @@ void WinnieEngine::drawMenu(char *szMenu, int iSel, int fCanSel[]) {
 	}
 	drawStr(iRow, iCol - 1, IDA_DEFAULT, ">");
 	_gfx->doUpdate();
-	_system->updateScreen(); //TODO: Move to game's main loop
 }
 
 void WinnieEngine::incMenuSel(int *iSel, int fCanSel[]) {
@@ -1019,7 +1014,6 @@ phase0:
 	readRoom(_room, roomdata, hdr);
 	drawRoomPic();
 	_gfx->doUpdate();
-	_system->updateScreen();
 
 phase1:
 	if (getObjInRoom(_room)) {






More information about the Scummvm-git-logs mailing list