thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DM: Replace _vm->_system with g_system

Browse source
This commit is contained in:
Bendegúz Nagy 2016-09-03 15:52:59 +02:00
parent d059a1cd4b
commit d0bae5b805
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/dm/dm.cpp
View file

@ -815,9 +815,9 @@ void DMEngine::openEntranceDoors() {
_displayMan->blitToScreen(_savedScreenForOpenEntranceDoors, &screenBox, 160, kM1_ColorNoTransparency, 200); _displayMan->blitToScreen(_savedScreenForOpenEntranceDoors, &screenBox, 160, kM1_ColorNoTransparency, 200);
_displayMan->blitToBitmap(leftDoorBitmap, _displayMan->_bitmapScreen, leftDoorBox, leftDoorBlitFrom, 0, 64, k160_byteWidthScreen, _displayMan->blitToBitmap(leftDoorBitmap, _displayMan->_bitmapScreen, leftDoorBox, leftDoorBlitFrom, 0, 64, k160_byteWidthScreen,
kM1_ColorNoTransparency, 161, k200_heightScreen); kM1_ColorNoTransparency, 161, k200_heightScreen);
_displayMan->blitToBitmap(rightDoorBitmap, _displayMan->_bitmapScreen, rightDoorBox, 0, 0, 64, k160_byteWidthScreen, _displayMan->blitToBitmap(rightDoorBitmap, _displayMan->_bitmapScreen, rightDoorBox, 0, 0, 64, k160_byteWidthScreen,
kM1_ColorNoTransparency, 161, k200_heightScreen); kM1_ColorNoTransparency, 161, k200_heightScreen);
_eventMan->discardAllInput(); _eventMan->discardAllInput();
_displayMan->updateScreen(); _displayMan->updateScreen();
@ -938,7 +938,7 @@ void DMEngine::fuseSequence() {
int16 fluxCageMapX = _dungeonMan->_partyMapX; int16 fluxCageMapX = _dungeonMan->_partyMapX;
int16 fluxcageMapY = _dungeonMan->_partyMapY; int16 fluxcageMapY = _dungeonMan->_partyMapY;
for(;;) { for (;;) {
Thing curThing = _dungeonMan->getSquareFirstObject(fluxCageMapX, fluxcageMapY); Thing curThing = _dungeonMan->getSquareFirstObject(fluxCageMapX, fluxcageMapY);
while (curThing != Thing::_endOfList) { while (curThing != Thing::_endOfList) {
if (curThing.getType() == k15_ExplosionThingType) { if (curThing.getType() == k15_ExplosionThingType) {

8
engines/dm/eventman.cpp
View file

@ -597,12 +597,12 @@ bool EventManager::isMouseButtonDown(MouseButton button) {
} }
void EventManager::setMousePos(Common::Point pos) { void EventManager::setMousePos(Common::Point pos) {
_vm->_system->warpMouse(pos.x, pos.y); g_system->warpMouse(pos.x, pos.y);
} }
Common::EventType EventManager::processInput(Common::Event *grabKey, Common::Event *grabMouseClick) { Common::EventType EventManager::processInput(Common::Event *grabKey, Common::Event *grabMouseClick) {
Common::Event event; Common::Event event;
while (_vm->_system->getEventManager()->pollEvent(event)) { while (g_system->getEventManager()->pollEvent(event)) {
switch (event.type) { switch (event.type) {
case Common::EVENT_KEYDOWN: { case Common::EVENT_KEYDOWN: {
if (event.synthetic) if (event.synthetic)
@ -1420,7 +1420,7 @@ void EventManager::drawSleepScreen() {
void EventManager::discardAllInput() { void EventManager::discardAllInput() {
Common::Event event; Common::Event event;
while (_vm->_system->getEventManager()->pollEvent(event) && !_vm->_engineShouldQuit) { while (g_system->getEventManager()->pollEvent(event) && !_vm->_engineShouldQuit) {
if (event.type == Common::EVENT_QUIT) if (event.type == Common::EVENT_QUIT)
_vm->_engineShouldQuit = true; _vm->_engineShouldQuit = true;
} }
@ -1626,7 +1626,7 @@ void EventManager::waitForMouseOrKeyActivity() {
discardAllInput(); discardAllInput();
Common::Event event; Common::Event event;
while (true) { while (true) {
if (_vm->_system->getEventManager()->pollEvent(event)) { if (g_system->getEventManager()->pollEvent(event)) {
switch (event.type) { switch (event.type) {
case Common::EVENT_QUIT: case Common::EVENT_QUIT:
_vm->_engineShouldQuit = true; _vm->_engineShouldQuit = true;

6
engines/dm/gfx.cpp
View file

@ -919,9 +919,9 @@ void DisplayMan::updateScreen() {
// apply copper // apply copper
for (uint32 i = 320 * 30; i < 320 * 170; ++i) for (uint32 i = 320 * 30; i < 320 * 170; ++i)
_bitmapScreen[i] += 16; _bitmapScreen[i] += 16;
_vm->_system->copyRectToScreen(_bitmapScreen, _screenWidth, 0, 0, _screenWidth, _screenHeight); g_system->copyRectToScreen(_bitmapScreen, _screenWidth, 0, 0, _screenWidth, _screenHeight);
_vm->_console->onFrame(); _vm->_console->onFrame();
_vm->_system->updateScreen(); g_system->updateScreen();
for (uint32 i = 320 * 30; i < 320 * 170; ++i) for (uint32 i = 320 * 30; i < 320 * 170; ++i)
_bitmapScreen[i] -= 16; _bitmapScreen[i] -= 16;
} }
@ -3861,7 +3861,7 @@ void DisplayMan::buildPaletteChangeCopperList(uint16* middleScreen, uint16* topA
colorPalette[i * 3 + 1] = (middleScreen[i - 16] >> 4) * (256 / 16); colorPalette[i * 3 + 1] = (middleScreen[i - 16] >> 4) * (256 / 16);
colorPalette[i * 3 + 2] = middleScreen[i - 16] * (256 / 16); colorPalette[i * 3 + 2] = middleScreen[i - 16] * (256 / 16);
} }
_vm->_system->getPaletteManager()->setPalette(colorPalette, 0, 32); g_system->getPaletteManager()->setPalette(colorPalette, 0, 32);
} }
} }

4
engines/dm/text.cpp
View file

@ -254,10 +254,10 @@ void TextMan::clearAllRows() {
void TextMan::updateMessageArea() { void TextMan::updateMessageArea() {
if (_isScrolling) { if (_isScrolling) {
if (_startedScrollingAt == -1) { if (_startedScrollingAt == -1) {
_startedScrollingAt = _vm->_system->getMillis(); _startedScrollingAt = g_system->getMillis();
memcpy(_messageAreaCopy, _vm->_displayMan->_bitmapScreen + (200 - 7 * 4) * 320, 320 * 7 * 4); memcpy(_messageAreaCopy, _vm->_displayMan->_bitmapScreen + (200 - 7 * 4) * 320, 320 * 7 * 4);
} }
int linesToCopy = (_vm->_system->getMillis() - _startedScrollingAt) / 50; int linesToCopy = (g_system->getMillis() - _startedScrollingAt) / 50;
if (linesToCopy >= 7) { if (linesToCopy >= 7) {
linesToCopy = 7; linesToCopy = 7;
_startedScrollingAt = -1; _startedScrollingAt = -1;