Skip to content

Commit

Permalink
HOPKINS: Some renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strangerke
Strangerke committed Mar 4, 2013
1 parent 8a62471 commit 23badc9
Show file tree
Hide file tree
Showing 14 changed files with 180 additions and 180 deletions.
2 changes: 1 addition & 1 deletion engines/hopkins/anim.cpp
View file
Expand Up @@ -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);
Expand Down
18 changes: 9 additions & 9 deletions engines/hopkins/computer.cpp
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -515,7 +515,7 @@ void ComputerManager::readText(int idx) {
outText(curStr);

++lineNum;
_vm->_eventsManager.VBL();
_vm->_eventsManager.refreshScreenAndEvents();
curStr = "";
} else if (curChar != '%') {
curStr += curChar;
Expand Down Expand Up @@ -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
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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 = " ";

Expand Down
18 changes: 9 additions & 9 deletions engines/hopkins/dialogs.cpp
View file
Expand Up @@ -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";
Expand Down Expand Up @@ -298,7 +298,7 @@ void DialogsManager::showOptionsDialog() {
break;
}

_vm->_eventsManager.VBL();
_vm->_eventsManager.refreshScreenAndEvents();
} while (!doneFlag);

_vm->_graphicsManager.copySurface(_vm->_graphicsManager._vesaScreen, scrollOffset + 164,
Expand All @@ -321,7 +321,7 @@ void DialogsManager::showInventory() {
inventAnim();
_vm->_eventsManager.getMouseX();
_vm->_eventsManager.getMouseY();
_vm->_eventsManager.VBL();
_vm->_eventsManager.refreshScreenAndEvents();
}
_inventWin1 = g_PTRNUL;

Expand Down Expand Up @@ -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);
}
Expand All @@ -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();
}
Expand Down Expand Up @@ -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);
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions engines/hopkins/events.cpp
View file
Expand Up @@ -334,20 +334,20 @@ 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);
}

// Return character
return foundChar;
}

void EventsManager::VBL() {
void EventsManager::refreshScreenAndEvents() {
int bottom = 0;
int right = 0;
int height = 0;
Expand Down
2 changes: 1 addition & 1 deletion engines/hopkins/events.h
View file
Expand Up @@ -87,7 +87,7 @@ class EventsManager {
void mouseOff();
void setMouseOn();

void VBL();
void refreshScreenAndEvents();
};

} // End of namespace Hopkins
Expand Down
4 changes: 2 additions & 2 deletions engines/hopkins/font.cpp
View file
Expand Up @@ -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;
}
}
Expand Down
4 changes: 2 additions & 2 deletions engines/hopkins/graphics.cpp
View file
Expand Up @@ -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)
Expand Down

0 comments on commit 23badc9

Please sign in to comment.