[Scummvm-cvs-logs] scummvm master -> 73a0e833569bd4474c032fdf43b5c59dd55ee2fc

tramboi bertrand_augereau at yahoo.fr
Sun Dec 4 15:00:29 CET 2011


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

Summary:
22a7ab4424 DREAMWEB: Minor warning fix (shadowing)
7ce0cee002 DREAMWEB: kIcons2 accessor
73a0e83356 DREAMWEB: 'panelIcons1' ported to C++


Commit: 22a7ab4424f4731a998b17725c89621070231380
    https://github.com/scummvm/scummvm/commit/22a7ab4424f4731a998b17725c89621070231380
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-04T07:54:05-08:00

Commit Message:
DREAMWEB: Minor warning fix (shadowing)

Changed paths:
    engines/dreamweb/object.cpp



diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index f617bfb..4877937 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -73,8 +73,7 @@ void DreamGenContext::obToInv() {
 }
 
 void DreamGenContext::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
-	Frame *icons1 = (Frame *)getSegment(data.word(kIcons1)).ptr(0, 0);
-	showFrame(icons1, x - 2, y - 1, 10, 0);
+	showFrame(icons1(), x - 2, y - 1, 10, 0);
 	if (index == 0xff)
 		return;
 
@@ -85,7 +84,7 @@ void DreamGenContext::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 	const DynObject *object = (const DynObject *)getAnyAdDir(index, flag);
 	bool worn = isItWorn(object);
 	if (worn)
-		showFrame(icons1, x - 3, y - 2, 7, 0);
+		showFrame(icons1(), x - 3, y - 2, 7, 0);
 }
 
 void DreamGenContext::obPicture() {


Commit: 7ce0cee00289d6c3360cdb9350678b29679249f0
    https://github.com/scummvm/scummvm/commit/7ce0cee00289d6c3360cdb9350678b29679249f0
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-04T07:54:06-08:00

Commit Message:
DREAMWEB: kIcons2 accessor

Changed paths:
    engines/dreamweb/stubs.cpp
    engines/dreamweb/stubs.h



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index c1f8058..940d26a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2488,6 +2488,10 @@ Frame * DreamGenContext::icons1() {
 	return (Frame *)getSegment(data.word(kIcons1)).ptr(0, 0);
 }
 
+Frame * DreamGenContext::icons2() {
+	return (Frame *)getSegment(data.word(kIcons2)).ptr(0, 0);
+}
+
 void DreamGenContext::playChannel0(uint8 index, uint8 repeat) {
 	if (data.byte(kSoundint) == 255)
 		return;
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 816499d..54e413f 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -319,6 +319,7 @@
 	Frame *tempGraphics2();
 	Frame *tempGraphics3();
 	Frame *icons1();
+	Frame *icons2();
 	void accessLightOn();
 	void accessLightOff();
 	void randomAccess(uint16 count);


Commit: 73a0e833569bd4474c032fdf43b5c59dd55ee2fc
    https://github.com/scummvm/scummvm/commit/73a0e833569bd4474c032fdf43b5c59dd55ee2fc
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-04T07:58:32-08:00

Commit Message:
DREAMWEB: 'panelIcons1' ported to C++

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



diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 5608ecf..4b7e28c 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -334,6 +334,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'out22c',
 	'paltoendpal',
 	'paltostartpal',
+	'panelicons1',
 	'paneltomap',
 	'parseblaster',
 	'personnametext',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 685b08e..c72bd02 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -10867,37 +10867,6 @@ void DreamGenContext::middlePanel() {
 	showFrame();
 }
 
-void DreamGenContext::panelIcons1() {
-	STACK_CHECK;
-	di = 0;
-	_cmp(data.byte(kWatchon), 1);
-	if (flags.z())
-		goto watchison;
-	di = 48;
-watchison:
-	push(di);
-	ds = data.word(kIcons2);
-	_add(di, 204);
-	bx = 4;
-	al = 2;
-	ah = 0;
-	showFrame();
-	di = pop();
-	push(di);
-	_cmp(data.byte(kZoomon), 1);
-	if (flags.z())
-		goto zoomisoff;
-	ds = data.word(kIcons1);
-	_add(di, 228);
-	bx = 8;
-	al = 5;
-	ah = 0;
-	showFrame();
-zoomisoff:
-	di = pop();
-	showWatch();
-}
-
 void DreamGenContext::blank() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 199);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index c053e56..2328c3b 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -939,7 +939,6 @@ public:
 	void loadSecondSample();
 	void transferConToEx();
 	void businessMan();
-	void panelIcons1();
 	void adjustDown();
 	void withWhat();
 	void createFile();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 940d26a..3205ee8 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2813,6 +2813,18 @@ void DreamGenContext::showMan() {
 		showFrame(icons1(), 28, 25, 2, 0);
 }
 
+void DreamGenContext::panelIcons1() {
+	uint16 x;
+	if (data.byte(kWatchon) != 1)
+		x = 48;
+	else
+		x = 0;
+	showFrame(icons2(), 204 + x, 4, 2, 0);
+	if (data.byte(kZoomon) != 1)
+		showFrame(icons1(), 228 + x, 8, 5, 0);
+	showWatch();
+}
+
 uint8 DreamGenContext::getLocation(uint8 index) {
 	return data.byte(kRoomscango + index);
 }
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 54e413f..6a728d9 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -408,6 +408,7 @@
 	void showOuterPad();
 	void showExit();
 	void showMan();
+	void panelIcons1();
 	void buttonOne();
 	void buttonTwo();
 	void buttonThree();






More information about the Scummvm-git-logs mailing list