[Scummvm-cvs-logs] scummvm master -> b7419454c5416824552afd222af23d0bdfea7cb7
bluegr
bluegr at gmail.com
Tue Feb 26 00:09:21 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:
b7419454c5 HOPKINS: Rename DD_VBL() -> updateScreen()
Commit: b7419454c5416824552afd222af23d0bdfea7cb7
https://github.com/scummvm/scummvm/commit/b7419454c5416824552afd222af23d0bdfea7cb7
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-02-25T12:00:45-08:00
Commit Message:
HOPKINS: Rename DD_VBL() -> updateScreen()
Changed paths:
engines/hopkins/anim.cpp
engines/hopkins/computer.cpp
engines/hopkins/graphics.cpp
engines/hopkins/graphics.h
engines/hopkins/hopkins.cpp
engines/hopkins/objects.cpp
engines/hopkins/talk.cpp
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index fa6dd1c..5e7d648 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -100,7 +100,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
else
_vm->_graphicsManager.m_scroll16(screenP, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
_vm->_graphicsManager.unlockScreen();
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
}
_vm->_eventsManager._rateCounter = 0;
_vm->_eventsManager._escKeyFl = false;
@@ -155,7 +155,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
_vm->_graphicsManager.copyVideoVbe16(screenP);
}
_vm->_graphicsManager.unlockScreen();
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
_vm->_soundManager.checkSoundEnd();
}
}
@@ -281,7 +281,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u
else
_vm->_graphicsManager.m_scroll16(screenP, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
_vm->_graphicsManager.unlockScreen();
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
}
_vm->_eventsManager._rateCounter = 0;
_vm->_eventsManager._escKeyFl = false;
@@ -329,7 +329,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u
}
}
_vm->_graphicsManager.unlockScreen();
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
_vm->_soundManager.checkSoundEnd();
}
@@ -401,7 +401,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u
}
_vm->_graphicsManager.unlockScreen();
_vm->_graphicsManager.fadeInShort();
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
_vm->_eventsManager.mouseOn();
}
@@ -648,7 +648,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
else
_vm->_graphicsManager.m_scroll16(screenP, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
_vm->_graphicsManager.unlockScreen();
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
}
bool skipFl = false;
if (_vm->getIsDemo()) {
@@ -728,7 +728,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
_vm->_graphicsManager.copyVideoVbe16a(screenP);
}
_vm->_graphicsManager.unlockScreen();
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
_vm->_soundManager.checkSoundEnd();
}
}
@@ -808,7 +808,7 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u
else
_vm->_graphicsManager.m_scroll16(screenP, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
_vm->_graphicsManager.unlockScreen();
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
}
_vm->_eventsManager._rateCounter = 0;
_vm->_eventsManager._escKeyFl = false;
@@ -854,7 +854,7 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u
_vm->_graphicsManager.copyVideoVbe16a(screenP);
}
_vm->_graphicsManager.unlockScreen();
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
_vm->_soundManager.checkSoundEnd();
}
}
diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp
index 2e91115..af898d3 100644
--- a/engines/hopkins/computer.cpp
+++ b/engines/hopkins/computer.cpp
@@ -263,7 +263,7 @@ void ComputerManager::showComputer(ComputerEnum mode) {
_vm->_graphicsManager.lockScreen();
_vm->_graphicsManager.clearScreen();
_vm->_graphicsManager.unlockScreen();
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
restoreFBIRoom();
} else {
// Password doesn't match - Access Denied
@@ -277,7 +277,7 @@ void ComputerManager::showComputer(ComputerEnum mode) {
_vm->_graphicsManager.lockScreen();
_vm->_graphicsManager.clearScreen();
_vm->_graphicsManager.unlockScreen();
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
restoreFBIRoom();
_vm->_eventsManager.mouseOff();
}
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index b299082..03f27b5 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -560,7 +560,7 @@ void GraphicsManager::fadeIn(const byte *palette, int step, const byte *surface)
// Set the transition palette and refresh the screen
setPaletteVGA256(palData2);
m_scroll16(surface, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
- DD_VBL();
+ updateScreen();
// Added a delay in order to see the fading
_vm->_eventsManager.delay(20);
@@ -571,7 +571,7 @@ void GraphicsManager::fadeIn(const byte *palette, int step, const byte *surface)
// Refresh the screen
m_scroll16(surface, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
- DD_VBL();
+ updateScreen();
}
/**
@@ -590,7 +590,7 @@ void GraphicsManager::fadeOut(const byte *palette, int step, const byte *surface
setPaletteVGA256(palData);
m_scroll16(surface, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
- DD_VBL();
+ updateScreen();
_vm->_eventsManager.delay(20);
}
@@ -602,7 +602,7 @@ void GraphicsManager::fadeOut(const byte *palette, int step, const byte *surface
setPaletteVGA256(palData);
m_scroll16(surface, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
- return DD_VBL();
+ return updateScreen();
}
/**
@@ -661,7 +661,7 @@ void GraphicsManager::fadeInBreakout() {
lockScreen();
copy16bFromSurfaceScaleX2(_vesaBuffer);
unlockScreen();
- DD_VBL();
+ updateScreen();
}
/**
@@ -676,7 +676,7 @@ void GraphicsManager::fateOutBreakout() {
lockScreen();
copy16bFromSurfaceScaleX2(_vesaBuffer);
unlockScreen();
- DD_VBL();
+ updateScreen();
}
void GraphicsManager::setPaletteVGA256(const byte *palette) {
@@ -686,7 +686,7 @@ void GraphicsManager::setPaletteVGA256(const byte *palette) {
void GraphicsManager::setPaletteVGA256WithRefresh(const byte *palette, const byte *surface) {
changePalette(palette);
m_scroll16(surface, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
- DD_VBL();
+ updateScreen();
}
void GraphicsManager::SETCOLOR3(int palIndex, int r, int g, int b) {
@@ -724,7 +724,7 @@ uint16 GraphicsManager::mapRGB(byte r, byte g, byte b) {
| (b >> format.bLoss) << format.bShift;
}
-void GraphicsManager::DD_VBL() {
+void GraphicsManager::updateScreen() {
// TODO: Is this okay here?
g_system->updateScreen();
}
@@ -1744,7 +1744,7 @@ void GraphicsManager::NB_SCREEN(bool initPalette) {
unlockScreen();
memcpy(_vesaScreen, _vesaBuffer, 614399);
- DD_VBL();
+ updateScreen();
}
void GraphicsManager::copyWinscanVbe(const byte *src, byte *dest) {
diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
index 6dc8ec6..16788ad 100644
--- a/engines/hopkins/graphics.h
+++ b/engines/hopkins/graphics.h
@@ -161,7 +161,7 @@ public:
void SETCOLOR3(int palIndex, int r, int g, int b);
void SETCOLOR4(int palIndex, int r, int g, int b);
void AFFICHE_SPEEDVGA(const byte *objectData, int xp, int yp, int idx, bool addSegment = true);
- void DD_VBL();
+ void updateScreen();
void Affiche_Perfect(byte *surface, const byte *srcData, int xp300, int yp300, int frameIndex, int zoom1, int zoom2, bool flipFl);
void Copy_Mem(const byte *srcSurface, int x1, int y1, uint16 width, int height, byte *destSurface, int destX, int destY);
void SCANLINE(int pitch);
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 3d4d152..5992f22 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -339,7 +339,7 @@ bool HopkinsEngine::runWin95Demo() {
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
_graphicsManager.unlockScreen();
- _graphicsManager.DD_VBL();
+ _graphicsManager.updateScreen();
memset(_graphicsManager._vesaBuffer, 0, 307200);
memset(_graphicsManager._vesaScreen, 0, 307200);
_graphicsManager.clearPalette();
@@ -657,7 +657,7 @@ bool HopkinsEngine::runLinuxDemo() {
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
_graphicsManager.unlockScreen();
- _graphicsManager.DD_VBL();
+ _graphicsManager.updateScreen();
memset(_graphicsManager._vesaBuffer, 0, 307200);
memset(_graphicsManager._vesaScreen, 0, 307200);
_graphicsManager.clearPalette();
@@ -1430,7 +1430,7 @@ bool HopkinsEngine::runFull() {
_graphicsManager.lockScreen();
_graphicsManager.clearScreen();
_graphicsManager.unlockScreen();
- _graphicsManager.DD_VBL();
+ _graphicsManager.updateScreen();
memset(_graphicsManager._vesaBuffer, 0, 307200);
memset(_graphicsManager._vesaScreen, 0, 307200);
_graphicsManager.clearPalette();
@@ -1626,7 +1626,7 @@ void HopkinsEngine::playIntro() {
_graphicsManager.clearScreen();
_graphicsManager.unlockScreen();
_graphicsManager.clearPalette();
- _graphicsManager.DD_VBL();
+ _graphicsManager.updateScreen();
_soundManager.playSound(11);
_graphicsManager.loadImage("intro1");
_graphicsManager.scrollScreen(0);
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index b37dac2..f6c057b 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -2613,7 +2613,7 @@ void ObjectsManager::handleSpecialGames() {
memcpy(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager._vesaScreen, 614399);
_vm->_graphicsManager._scrollStatus = 0;
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
break;
case 20:
_vm->_globals._saveData->_data[svField132] = (getSpriteX(0) > 65 && getSpriteX(0) <= 124 && getSpriteY(0) > 372 && getSpriteY(0) <= 398) ? 1 : 0;
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index d3c60a0..72ad774 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -148,7 +148,7 @@ void TalkManager::startAnimatedCharacterDialogue(const Common::String &filename)
_vm->_graphicsManager.unlockScreen();
memcpy(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager._vesaScreen, 614399);
_vm->_globals._disableInventFl = oldDisableInventFl;
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
for (int i = 0; i <= 4; i++)
_vm->_eventsManager.VBL();
_vm->_graphicsManager._scrollStatus = 0;
@@ -1084,7 +1084,7 @@ void TalkManager::animateObject(const Common::String &a2) {
_vm->_graphicsManager.setPaletteVGA256(_vm->_graphicsManager._palette);
memcpy(_vm->_graphicsManager._vesaBuffer, _vm->_graphicsManager._vesaScreen, 614399);
_vm->_globals._disableInventFl = false;
- _vm->_graphicsManager.DD_VBL();
+ _vm->_graphicsManager.updateScreen();
for (int i = 0; i <= 4; i++)
_vm->_eventsManager.VBL();
_vm->_graphicsManager._scrollStatus = 0;
More information about the Scummvm-git-logs
mailing list