From 447f0c664359f62330d91be20d49d66b9fb420fb Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 9 Dec 2011 18:18:32 +0200
Subject: DREAMWEB: Use the C++ version of workScreen() in C++ code

---
 engines/dreamweb/keypad.cpp   |  2 +-
 engines/dreamweb/object.cpp   |  4 ++--
 engines/dreamweb/saveload.cpp |  2 +-
 engines/dreamweb/stubs.cpp    | 38 +++++++++++++++++++-------------------
 engines/dreamweb/use.cpp      |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 44b01c4cc9..fb6d2ff851 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -118,7 +118,7 @@ void DreamGenContext::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8
 	showKeypad();
 	readMouse();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 	data.word(kPresspointer) = 0;
 	data.byte(kGetback) = 0;
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 44be58c168..edc0b734ec 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -135,7 +135,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 			data.byte(kCommandtype) = 255;
 			readMouse();
 			showPointer();
-			workToScreen();
+			workToScreenCPP();
 			delPointer();
 			examineAgain = false;
 		}
@@ -238,7 +238,7 @@ void DreamGenContext::inventory() {
 	openInv();
 	readMouse();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 	data.byte(kOpenedob) = 255;
 	examineOb(false);
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 45a1c8ef7a..1c0e6353fd 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -121,7 +121,7 @@ void DreamGenContext::doLoad(int savegameId) {
 	data.word(kTextaddressy) = 182;
 	data.byte(kTextlen) = 240;
 	startup();
-	workToScreen();
+	workToScreenCPP();
 	data.byte(kGetback) = 4;
 }
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 2ac003f46a..7c388cba6f 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -509,7 +509,7 @@ void DreamGenContext::dreamweb() {
 			clearPalette();
 
 			doLoad(savegameId);
-			workToScreen();
+			workToScreenCPP();
 			fadeScreenUp();
 			startNewGame = false;
 
@@ -726,7 +726,7 @@ void DreamGenContext::startup1() {
 
 	startup();
 
-	workToScreen();
+	workToScreenCPP();
 	fadeScreenUp();
 }
 
@@ -2681,7 +2681,7 @@ void DreamGenContext::workToScreenM() {
 	readMouse();
 	showPointer();
 	vSync();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 }
 
@@ -3297,7 +3297,7 @@ void DreamGenContext::loadIntroRoom() {
 	reelsOnScreen();
 	spriteUpdate();
 	printSprites();
-	workToScreen();
+	workToScreenCPP();
 }
 
 void DreamGenContext::afterIntroRoom() {
@@ -3311,7 +3311,7 @@ void DreamGenContext::afterIntroRoom() {
 	reelsOnScreen();
 	spriteUpdate();
 	printSprites();
-	workToScreen();
+	workToScreenCPP();
 	data.byte(kNowinnewroom) = 0;
 }
 
@@ -3410,7 +3410,7 @@ void DreamGenContext::errorMessage1() {
 	printMessage(76, 21, 58, 240, (240 & 1));
 	readMouse();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 	hangOnP(50);
 	showPanel();
@@ -3419,7 +3419,7 @@ void DreamGenContext::errorMessage1() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 }
 
@@ -3429,7 +3429,7 @@ void DreamGenContext::errorMessage2() {
 	printMessage(76, 21, 59, 240, (240 & 1));
 	readMouse();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 	hangOnP(50);
 	showPanel();
@@ -3438,7 +3438,7 @@ void DreamGenContext::errorMessage2() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 }
 
@@ -3453,7 +3453,7 @@ void DreamGenContext::errorMessage3() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 }
 
@@ -3488,7 +3488,7 @@ void DreamGenContext::nextDest() {
 	underTextLine();
 	readMouse();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 }
 
@@ -3519,7 +3519,7 @@ void DreamGenContext::lastDest() {
 	underTextLine();
 	readMouse();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 }
 
@@ -3548,7 +3548,7 @@ void DreamGenContext::putBackObStuff() {
 	data.byte(kCommandtype) = 255;
 	readMouse();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 }
 
@@ -3575,7 +3575,7 @@ void DreamGenContext::redes() {
 	startTalk();
 	readMouse();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 }
 
@@ -3637,7 +3637,7 @@ void DreamGenContext::selectLocation() {
 	readMouse();
 	data.byte(kPointerframe) = 0;
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	playChannel0(9, 255);
 	data.byte(kNewlocation) = 255;
 
@@ -3887,7 +3887,7 @@ void DreamGenContext::decide() {
 	data.byte(kManisoffscreen) = 1;
 	loadSaveBox();
 	showDecisions();
-	workToScreen();
+	workToScreenCPP();
 	fadeScreenUp();
 	data.byte(kGetback) = 0;
 
@@ -3934,7 +3934,7 @@ void DreamGenContext::talk() {
 	data.byte(kCommandtype) = 255;
 	readMouse();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 
 	RectWithCallback talkList[] = {
 		{ 273,320,157,198,&DreamGenContext::getBack1 },
@@ -4025,7 +4025,7 @@ void DreamGenContext::doSaveLoad() {
 	loadSaveBox();
 	showOpBox();
 	showMainOps();
-	workToScreen();
+	workToScreenCPP();
 
 	RectWithCallback opsList[] = {
 		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::getBackFromOps },
@@ -4154,7 +4154,7 @@ void DreamGenContext::showGun() {
 	createPanel2();
 	showFrame(tempGraphics(), 100, 4, 0, 0);
 	showFrame(tempGraphics(), 158, 106, 1, 0);
-	workToScreen();
+	workToScreenCPP();
 	getRidOfTemp();
 	fadeScreenUp();
 	hangOn(160);
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 02a53436fe..68f4aed1c0 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1170,7 +1170,7 @@ void DreamGenContext::useDiary() {
 	showDiaryPage();
 	readMouse();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 	data.byte(kGetback) = 0;
 
-- 
cgit v1.2.3