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

DREAMWEB: Use the C++ version of workScreen() in C++ code

Browse source
This commit is contained in:
Filippos Karapetis 2011-12-09 18:18:32 +02:00
parent aebab022de
commit 447f0c6643
5 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/dreamweb/keypad.cpp
View file

@ -118,7 +118,7 @@ void DreamGenContext::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8
showKeypad(); showKeypad();
readMouse(); readMouse();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
data.word(kPresspointer) = 0; data.word(kPresspointer) = 0;
data.byte(kGetback) = 0; data.byte(kGetback) = 0;

4
engines/dreamweb/object.cpp
View file

@ -135,7 +135,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
data.byte(kCommandtype) = 255; data.byte(kCommandtype) = 255;
readMouse(); readMouse();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
examineAgain = false; examineAgain = false;
} }
@ -238,7 +238,7 @@ void DreamGenContext::inventory() {
openInv(); openInv();
readMouse(); readMouse();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
data.byte(kOpenedob) = 255; data.byte(kOpenedob) = 255;
examineOb(false); examineOb(false);

2
engines/dreamweb/saveload.cpp
View file

@ -121,7 +121,7 @@ void DreamGenContext::doLoad(int savegameId) {
data.word(kTextaddressy) = 182; data.word(kTextaddressy) = 182;
data.byte(kTextlen) = 240; data.byte(kTextlen) = 240;
startup(); startup();
workToScreen(); workToScreenCPP();
data.byte(kGetback) = 4; data.byte(kGetback) = 4;
} }

38
engines/dreamweb/stubs.cpp
View file

@ -509,7 +509,7 @@ void DreamGenContext::dreamweb() {
clearPalette(); clearPalette();
doLoad(savegameId); doLoad(savegameId);
workToScreen(); workToScreenCPP();
fadeScreenUp(); fadeScreenUp();
startNewGame = false; startNewGame = false;
@ -726,7 +726,7 @@ void DreamGenContext::startup1() {
startup(); startup();
workToScreen(); workToScreenCPP();
fadeScreenUp(); fadeScreenUp();
} }
@ -2681,7 +2681,7 @@ void DreamGenContext::workToScreenM() {
readMouse(); readMouse();
showPointer(); showPointer();
vSync(); vSync();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
} }
@ -3297,7 +3297,7 @@ void DreamGenContext::loadIntroRoom() {
reelsOnScreen(); reelsOnScreen();
spriteUpdate(); spriteUpdate();
printSprites(); printSprites();
workToScreen(); workToScreenCPP();
} }
void DreamGenContext::afterIntroRoom() { void DreamGenContext::afterIntroRoom() {
@ -3311,7 +3311,7 @@ void DreamGenContext::afterIntroRoom() {
reelsOnScreen(); reelsOnScreen();
spriteUpdate(); spriteUpdate();
printSprites(); printSprites();
workToScreen(); workToScreenCPP();
data.byte(kNowinnewroom) = 0; data.byte(kNowinnewroom) = 0;
} }
@ -3410,7 +3410,7 @@ void DreamGenContext::errorMessage1() {
printMessage(76, 21, 58, 240, (240 & 1)); printMessage(76, 21, 58, 240, (240 & 1));
readMouse(); readMouse();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
hangOnP(50); hangOnP(50);
showPanel(); showPanel();
@ -3419,7 +3419,7 @@ void DreamGenContext::errorMessage1() {
readMouse(); readMouse();
useOpened(); useOpened();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
} }
@ -3429,7 +3429,7 @@ void DreamGenContext::errorMessage2() {
printMessage(76, 21, 59, 240, (240 & 1)); printMessage(76, 21, 59, 240, (240 & 1));
readMouse(); readMouse();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
hangOnP(50); hangOnP(50);
showPanel(); showPanel();
@ -3438,7 +3438,7 @@ void DreamGenContext::errorMessage2() {
readMouse(); readMouse();
useOpened(); useOpened();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
} }
@ -3453,7 +3453,7 @@ void DreamGenContext::errorMessage3() {
readMouse(); readMouse();
useOpened(); useOpened();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
} }
@ -3488,7 +3488,7 @@ void DreamGenContext::nextDest() {
underTextLine(); underTextLine();
readMouse(); readMouse();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
} }
@ -3519,7 +3519,7 @@ void DreamGenContext::lastDest() {
underTextLine(); underTextLine();
readMouse(); readMouse();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
} }
@ -3548,7 +3548,7 @@ void DreamGenContext::putBackObStuff() {
data.byte(kCommandtype) = 255; data.byte(kCommandtype) = 255;
readMouse(); readMouse();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
} }
@ -3575,7 +3575,7 @@ void DreamGenContext::redes() {
startTalk(); startTalk();
readMouse(); readMouse();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
} }
@ -3637,7 +3637,7 @@ void DreamGenContext::selectLocation() {
readMouse(); readMouse();
data.byte(kPointerframe) = 0; data.byte(kPointerframe) = 0;
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
playChannel0(9, 255); playChannel0(9, 255);
data.byte(kNewlocation) = 255; data.byte(kNewlocation) = 255;
@ -3887,7 +3887,7 @@ void DreamGenContext::decide() {
data.byte(kManisoffscreen) = 1; data.byte(kManisoffscreen) = 1;
loadSaveBox(); loadSaveBox();
showDecisions(); showDecisions();
workToScreen(); workToScreenCPP();
fadeScreenUp(); fadeScreenUp();
data.byte(kGetback) = 0; data.byte(kGetback) = 0;
@ -3934,7 +3934,7 @@ void DreamGenContext::talk() {
data.byte(kCommandtype) = 255; data.byte(kCommandtype) = 255;
readMouse(); readMouse();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
RectWithCallback talkList[] = { RectWithCallback talkList[] = {
{ 273,320,157,198,&DreamGenContext::getBack1 }, { 273,320,157,198,&DreamGenContext::getBack1 },
@ -4025,7 +4025,7 @@ void DreamGenContext::doSaveLoad() {
loadSaveBox(); loadSaveBox();
showOpBox(); showOpBox();
showMainOps(); showMainOps();
workToScreen(); workToScreenCPP();
RectWithCallback opsList[] = { RectWithCallback opsList[] = {
{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::getBackFromOps }, { kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::getBackFromOps },
@ -4154,7 +4154,7 @@ void DreamGenContext::showGun() {
createPanel2(); createPanel2();
showFrame(tempGraphics(), 100, 4, 0, 0); showFrame(tempGraphics(), 100, 4, 0, 0);
showFrame(tempGraphics(), 158, 106, 1, 0); showFrame(tempGraphics(), 158, 106, 1, 0);
workToScreen(); workToScreenCPP();
getRidOfTemp(); getRidOfTemp();
fadeScreenUp(); fadeScreenUp();
hangOn(160); hangOn(160);

2
engines/dreamweb/use.cpp
View file

@ -1170,7 +1170,7 @@ void DreamGenContext::useDiary() {
showDiaryPage(); showDiaryPage();
readMouse(); readMouse();
showPointer(); showPointer();
workToScreen(); workToScreenCPP();
delPointer(); delPointer();
data.byte(kGetback) = 0; data.byte(kGetback) = 0;