DREAMWEB: Rename workToScreenCPP to workToScreen

12 files changed, 44 insertions, 44 deletions

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 0dc4e52d86..0438defc05 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -692,7 +692,7 @@ public:
 	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height);
 	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height);
 	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height);
-	void workToScreenCPP();
+	void workToScreen();
 	void printUnderMon();
 	void cls();
 	void frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 29f31f1bd0..878fbda5bf 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -118,7 +118,7 @@ void DreamBase::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3
 	showKeypad();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 	data.word(kPresspointer) = 0;
 	data.byte(kGetback) = 0;
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 3ee68e897c..4627597ab0 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -61,7 +61,7 @@ void DreamGenContext::useMon() {
 	printOuterMon();
 	initialMonCols();
 	printLogo();
-	workToScreenCPP();
+	workToScreen();
 	turnOnPower();
 	fadeUpYellows();
 	fadeUpMonFirst();
@@ -174,7 +174,7 @@ void DreamBase::monitorLogo() {
 		//fadeDownMon(); // FIXME: Commented out in ASM
 		printLogo();
 		printUnderMon();
-		workToScreenCPP();
+		workToScreen();
 		printLogo();
 		//fadeUpMon(); // FIXME: Commented out in ASM
 		printLogo();
@@ -291,7 +291,7 @@ void DreamBase::delCurs() {
 void DreamBase::scrollMonitor() {
 	printLogo();
 	printUnderMon();
-	workToScreenCPP();
+	workToScreen();
 	playChannel1(25);
 }
 
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 4942804369..03824aa706 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -54,7 +54,7 @@ void DreamBase::selectLocation() {
 	readMouse();
 	data.byte(kPointerframe) = 0;
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	playChannel0(9, 255);
 	data.byte(kNewlocation) = 255;
 
@@ -189,7 +189,7 @@ void DreamBase::nextDest() {
 	underTextLine();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -218,7 +218,7 @@ void DreamBase::lastDest() {
 	underTextLine();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 0a278d11ee..8c26956681 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -147,7 +147,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 			data.byte(kCommandtype) = 255;
 			readMouse();
 			showPointer();
-			workToScreenCPP();
+			workToScreen();
 			delPointer();
 			examineAgain = false;
 		}
@@ -251,7 +251,7 @@ void DreamGenContext::inventory() {
 	openInv();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 	data.byte(kOpenedob) = 255;
 	examineOb(false);
@@ -600,7 +600,7 @@ void DreamGenContext::inToInv() {
 	readMouse();
 	showPointer();
 	outOfInv();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -641,7 +641,7 @@ void DreamGenContext::outOfInv() {
 	readMouse();
 	showPointer();
 	inToInv();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -834,7 +834,7 @@ void DreamGenContext::selectOpenOb() {
 	underTextLine();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -885,7 +885,7 @@ void DreamGenContext::swapWithInv() {
 	fillRyan();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -952,7 +952,7 @@ void DreamGenContext::useOpened() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -1010,7 +1010,7 @@ void DreamGenContext::outOfOpen() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -1080,7 +1080,7 @@ void DreamGenContext::swapWithOpen() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 32fbbc04e5..83eb10765b 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -921,7 +921,7 @@ void DreamBase::mugger(ReelRoutine &routine) {
 		const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
 		uint16 y = 104;
 		printDirect(&string, 33 + 20, &y, 241, 241 & 1);
-		workToScreenCPP();
+		workToScreen();
 		hangOn(300);
 		routine.setReelPointer(140);
 		data.byte(kManspath) = 2;
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 53c2f55d38..2076a349b5 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -133,7 +133,7 @@ void DreamBase::doLoad(int savegameId) {
 	data.word(kTextaddressy) = 182;
 	data.byte(kTextlen) = 240;
 	startup();
-	workToScreenCPP();
+	workToScreen();
 	data.byte(kGetback) = 4;
 }
 
@@ -220,7 +220,7 @@ void DreamBase::saveGame() {
 		data.word(kTextaddressy) = 182;
 		data.byte(kTextlen) = 240;
 		redrawMainScrn();
-		workToScreenCPP();	// show the main screen without the mouse pointer
+		workToScreen();	// show the main screen without the mouse pointer
 
 		// We need to save after the scene has been redrawn, to capture the
 		// correct screen thumbnail
@@ -265,7 +265,7 @@ void DreamBase::doSaveLoad() {
 	loadSaveBox();
 	showOpBox();
 	showMainOps();
-	workToScreenCPP();
+	workToScreen();
 
 	RectWithCallback<DreamGenContext> opsList[] = {
 		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamBase::getBackFromOps },
@@ -745,7 +745,7 @@ void DreamBase::selectSlot() {
 		showSaveOps();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index b2490c0364..0026d63204 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -508,7 +508,7 @@ void DreamGenContext::dreamweb() {
 			clearPalette();
 
 			doLoad(savegameId);
-			workToScreenCPP();
+			workToScreen();
 			fadeScreenUp();
 			startNewGame = false;
 
@@ -728,7 +728,7 @@ void DreamGenContext::startup1() {
 
 	startup();
 
-	workToScreenCPP();
+	workToScreen();
 	fadeScreenUp();
 }
 
@@ -849,10 +849,10 @@ void DreamGenContext::triggerMessage(uint16 index) {
 	uint16 y = 156;
 	printDirect(&string, 174, &y, 141, true);
 	hangOn(140);
-	workToScreenCPP();
+	workToScreen();
 	hangOn(340);
 	multiPut(mapStore(), 174, 153, 200, 63);
-	workToScreenCPP();
+	workToScreen();
 	data.byte(kLasttrigger) = 0;
 }
 
@@ -2490,7 +2490,7 @@ void DreamBase::workToScreenM() {
 	readMouse();
 	showPointer();
 	vSync();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -2768,7 +2768,7 @@ void DreamGenContext::afterIntroRoom() {
 	reelsOnScreen();
 	spriteUpdate();
 	printSprites();
-	workToScreenCPP();
+	workToScreen();
 	data.byte(kNowinnewroom) = 0;
 }
 
@@ -2877,7 +2877,7 @@ void DreamGenContext::errorMessage1() {
 	printMessage(76, 21, 58, 240, (240 & 1));
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 	hangOnP(50);
 	showPanel();
@@ -2886,7 +2886,7 @@ void DreamGenContext::errorMessage1() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -2896,7 +2896,7 @@ void DreamGenContext::errorMessage2() {
 	printMessage(76, 21, 59, 240, (240 & 1));
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 	hangOnP(50);
 	showPanel();
@@ -2905,7 +2905,7 @@ void DreamGenContext::errorMessage2() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -2920,7 +2920,7 @@ void DreamGenContext::errorMessage3() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -2940,7 +2940,7 @@ void DreamBase::putBackObStuff() {
 	data.byte(kCommandtype) = 255;
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -3125,7 +3125,7 @@ void DreamGenContext::decide() {
 	data.byte(kManisoffscreen) = 1;
 	loadSaveBox();
 	showDecisions();
-	workToScreenCPP();
+	workToScreen();
 	fadeScreenUp();
 	data.byte(kGetback) = 0;
 
@@ -3184,7 +3184,7 @@ void DreamGenContext::showGun() {
 	createPanel2();
 	showFrame(tempGraphics(), 100, 4, 0, 0);
 	showFrame(tempGraphics(), 158, 106, 1, 0);
-	workToScreenCPP();
+	workToScreen();
 	getRidOfTemp();
 	fadeScreenUp();
 	hangOn(160);
@@ -3688,7 +3688,7 @@ void DreamBase::incRyanPage() {
 	fillRyan();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 
 }
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 131e164cf6..a73a5091c0 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -38,7 +38,7 @@ void DreamBase::talk() {
 	data.byte(kCommandtype) = 255;
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 
 	RectWithCallback<DreamGenContext> talkList[] = {
 		{ 273,320,157,198,&DreamBase::getBack1 },
@@ -259,7 +259,7 @@ void DreamBase::redes() {
 	startTalk();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index f116a90b6a..dd8b3550cf 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -43,7 +43,7 @@ void DreamGenContext::monkSpeaking() {
 	loadIntoTemp("DREAMWEB.G15");
 	clearWork();
 	showFrame(tempGraphics(), 160, 72, 0, 128);	// show monk
-	workToScreenCPP();
+	workToScreen();
 	data.byte(kVolume) = 7;
 	data.byte(kVolumedirection) = (byte)-1;
 	data.byte(kVolumeto) = 5;
@@ -260,7 +260,7 @@ void DreamGenContext::loadIntroRoom() {
 	reelsOnScreen();
 	spriteUpdate();
 	printSprites();
-	workToScreenCPP();
+	workToScreen();
 }
 
 void DreamGenContext::set16ColPalette() {
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 78dffc99ad..8aa735d84f 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1267,7 +1267,7 @@ void DreamBase::useDiary() {
 	showDiaryPage();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 	data.byte(kGetback) = 0;
 
@@ -1586,7 +1586,7 @@ void DreamBase::withWhat() {
 	data.byte(kCommandtype) = 255;
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 	data.byte(kInvopen) = 2;
 }
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 1c39021420..ce89711f87 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -86,7 +86,7 @@ void DreamBase::multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
 	engine->blit(workspace() + offset, kScreenwidth, x, y, width, height);
 }
 
-void DreamBase::workToScreenCPP() {
+void DreamBase::workToScreen() {
 	engine->blit(workspace(), 320, 0, 0, 320, 200);
 }