[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.249,2.250 script_v72he.cpp,2.90,2.91 script_v7he.cpp,2.82,2.83 script_v80he.cpp,2.19,2.20 script_v90he.cpp,2.31,2.32

Travis Howell kirben at users.sourceforge.net
Tue Sep 14 01:00:11 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv527/scumm

Modified Files:
	intern.h script_v72he.cpp script_v7he.cpp script_v80he.cpp 
	script_v90he.cpp 
Log Message:

Report when polyogn Wiz image is used.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.249
retrieving revision 2.250
diff -u -d -r2.249 -r2.250
--- intern.h	14 Sep 2004 06:21:10 -0000	2.249
+++ intern.h	14 Sep 2004 07:59:40 -0000	2.250
@@ -800,6 +800,7 @@
 	void o80_writeConfigFile();
 	void o80_cursorCommand();
 	void o80_setState();
+	void o80_drawWizPolygon();
 };
 
 class ScummEngine_v90he : public ScummEngine_v80he {

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.90
retrieving revision 2.91
diff -u -d -r2.90 -r2.91
--- script_v72he.cpp	13 Sep 2004 23:24:36 -0000	2.90
+++ script_v72he.cpp	14 Sep 2004 07:59:40 -0000	2.91
@@ -1392,6 +1392,7 @@
 	int y1 = pop();
 	int x1 = pop();
 	int resnum = pop();
+
 	if (_fullRedraw) {
 		assert(_wizImagesNum < ARRAYSIZE(_wizImages));
 		WizImage *pwi = &_wizImages[_wizImagesNum];

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.82
retrieving revision 2.83
diff -u -d -r2.82 -r2.83
--- script_v7he.cpp	14 Sep 2004 06:21:11 -0000	2.82
+++ script_v7he.cpp	14 Sep 2004 07:59:40 -0000	2.83
@@ -1130,6 +1130,8 @@
 }
 
 int ScummEngine_v7he::polygonHit(int id, int x, int y) {
+	debug(1, "polygonHit(%d, %d, %d)", id, x, y);
+
 	for (int i = 0; i < _WizNumPolygons; i++) {
 		if ((!id || id == i) && _WizPolygons[i].bound.contains(x, y)) {
 			if (polygonContains(_WizPolygons[i], x, y)) {

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -d -r2.19 -r2.20
--- script_v80he.cpp	14 Sep 2004 06:21:11 -0000	2.19
+++ script_v80he.cpp	14 Sep 2004 07:59:40 -0000	2.20
@@ -260,7 +260,7 @@
 		OPCODE(o6_getActorScaleX),
 		OPCODE(o6_getActorAnimCounter1),
 		/* AC */
-		OPCODE(o6_invalid),
+		OPCODE(o80_drawWizPolygon),
 		OPCODE(o6_isAnyOf),
 		OPCODE(o7_quitPauseRestart),
 		OPCODE(o6_isActorInBox),
@@ -581,4 +581,21 @@
 	removeObjectFromDrawQue(obj);
 }
 
+void ScummEngine_v80he::o80_drawWizPolygon() {
+	int xy1 = pop();
+	int resnum = pop();
+
+	if (_fullRedraw) {
+		assert(_wizImagesNum < ARRAYSIZE(_wizImages));
+		WizImage *pwi = &_wizImages[_wizImagesNum];
+		pwi->resnum = resnum;
+		pwi->x1 = xy1;
+		pwi->y1 = xy1;
+		pwi->flags = 64;
+		++_wizImagesNum;
+	} else {
+		drawWizImage(rtImage, resnum, 0, xy1, xy1, 64);
+	}
+}
+
 } // End of namespace Scumm

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.31
retrieving revision 2.32
diff -u -d -r2.31 -r2.32
--- script_v90he.cpp	14 Sep 2004 06:21:11 -0000	2.31
+++ script_v90he.cpp	14 Sep 2004 07:59:40 -0000	2.32
@@ -260,7 +260,7 @@
 		OPCODE(o6_getActorScaleX),
 		OPCODE(o6_getActorAnimCounter1),
 		/* AC */
-		OPCODE(o6_invalid),
+		OPCODE(o80_drawWizPolygon),
 		OPCODE(o6_isAnyOf),
 		OPCODE(o7_quitPauseRestart),
 		OPCODE(o6_isActorInBox),





More information about the Scummvm-git-logs mailing list