[Scummvm-cvs-logs] scummvm master -> 6d1ab6d8cd3a928d456f533158358067ff318f03

bluegr md5 at scummvm.org
Fri Dec 9 17:20:02 CET 2011


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
447f0c6643 DREAMWEB: Use the C++ version of workScreen() in C++ code
6d1ab6d8cd DREAMWEB: Port 'monitorlogo' to C++


Commit: 447f0c664359f62330d91be20d49d66b9fb420fb
    https://github.com/scummvm/scummvm/commit/447f0c664359f62330d91be20d49d66b9fb420fb
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-09T08:18:32-08:00

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

Changed paths:
    engines/dreamweb/keypad.cpp
    engines/dreamweb/object.cpp
    engines/dreamweb/saveload.cpp
    engines/dreamweb/stubs.cpp
    engines/dreamweb/use.cpp



diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 44b01c4..fb6d2ff 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 44be58c..edc0b73 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 45a1c8e..1c0e635 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 2ac003f..7c388cb 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 02a5343..68f4aed 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;
 


Commit: 6d1ab6d8cd3a928d456f533158358067ff318f03
    https://github.com/scummvm/scummvm/commit/6d1ab6d8cd3a928d456f533158358067ff318f03
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-09T08:19:17-08:00

Commit Message:
DREAMWEB: Port 'monitorlogo' to C++

Changed paths:
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/monitor.cpp
    engines/dreamweb/stubs.h



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 2a317d4..8e95f1c 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -475,6 +475,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'middlepanel',
 	'mode640x480',
 	'modifychar',
+	'monitorlogo',
 	'monkandryan',
 	'monks2text',
 	'monmessage',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 93d0e17..28dfa9d 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3866,27 +3866,6 @@ finishpars:
 	di = offset_operand1;
 }
 
-void DreamGenContext::monitorLogo() {
-	STACK_CHECK;
-	al = data.byte(kLogonum);
-	_cmp(al, data.byte(kOldlogonum));
-	if (flags.z())
-		goto notnewlogo;
-	data.byte(kOldlogonum) = al;
-	printLogo();
-	printUnderMon();
-	workToScreen();
-	printLogo();
-	printLogo();
-	al = 26;
-	playChannel1();
-	cx = 20;
-	randomAccess();
-	return;
-notnewlogo:
-	printLogo();
-}
-
 void DreamGenContext::processTrigger() {
 	STACK_CHECK;
 	_cmp(data.byte(kLasttrigger), '1');
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d645ce7..e73f224 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -574,7 +574,6 @@ public:
 	void removeObFromInv();
 	void heavy();
 	void useKey();
-	void monitorLogo();
 	void dirFile();
 	void pickupConts();
 	void allPalette();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 49cd800..f016646 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -54,7 +54,7 @@ void DreamGenContext::useMon() {
 	printOuterMon();
 	initialMonCols();
 	printLogo();
-	workToScreen();
+	workToScreenCPP();
 	turnOnPower();
 	fadeupYellows();
 	fadeupMonFirst();
@@ -97,6 +97,21 @@ void DreamGenContext::useMon() {
 	workToScreenM();
 }
 
+void DreamGenContext::monitorLogo() {
+	if (data.byte(kLogonum) != data.byte(kOldlogonum)) {
+		data.byte(kOldlogonum) = data.byte(kLogonum);
+		printLogo();
+		printUnderMon();
+		workToScreenCPP();
+		printLogo();
+		printLogo();
+		playChannel1(26);
+		randomAccess(20);
+	} else {
+		printLogo();
+	}
+}
+
 void DreamBase::printLogo() {
 	showFrame(tempGraphics(), 56, 32, 0, 0);
 	showCurrentFile();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 3d29351..9430325 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -562,5 +562,6 @@
 	void hangOnPQ();
 	void showGun();
 	void endGame();
+	void monitorLogo();
 
 #endif






More information about the Scummvm-git-logs mailing list