[Scummvm-cvs-logs] SF.net SVN: scummvm:[41189] scummvm/trunk/engines/scumm/he

[Kirben at users.sourceforge.net]

Revision: 41189
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41189&view=rev
Author:   Kirben
Date:     2009-06-05 04:16:32 +0000 (Fri, 05 Jun 2009)

Log Message:
-----------
Minor cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/script_v100he.cpp
    scummvm/trunk/engines/scumm/he/script_v90he.cpp
    scummvm/trunk/engines/scumm/he/wiz_he.cpp
    scummvm/trunk/engines/scumm/he/wiz_he.h

Modified: scummvm/trunk/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v100he.cpp	2009-06-05 02:35:38 UTC (rev 41188)
+++ scummvm/trunk/engines/scumm/he/script_v100he.cpp	2009-06-05 04:16:32 UTC (rev 41189)
@@ -2506,7 +2506,7 @@
 		x = pop();
 		state = pop();
 		resId = pop();
-		push(_wiz->getWizPixelColor(resId, state, x, y, 0));
+		push(_wiz->getWizPixelColor(resId, state, x, y));
 		break;
 	case 26:
 		resId = pop();

Modified: scummvm/trunk/engines/scumm/he/script_v90he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v90he.cpp	2009-06-05 02:35:38 UTC (rev 41188)
+++ scummvm/trunk/engines/scumm/he/script_v90he.cpp	2009-06-05 04:16:32 UTC (rev 41189)
@@ -1300,7 +1300,7 @@
 		x = pop();
 		state = pop();
 		resId = pop();
-		push(_wiz->getWizPixelColor(resId, state, x, y, 0));
+		push(_wiz->getWizPixelColor(resId, state, x, y));
 		break;
 	case 130:
 		h = pop();

Modified: scummvm/trunk/engines/scumm/he/wiz_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.cpp	2009-06-05 02:35:38 UTC (rev 41188)
+++ scummvm/trunk/engines/scumm/he/wiz_he.cpp	2009-06-05 04:16:32 UTC (rev 41189)
@@ -2322,7 +2322,7 @@
 	return ret;
 }
 
-uint8 Wiz::getWizPixelColor(int resNum, int state, int x, int y, int flags) {
+uint16 Wiz::getWizPixelColor(int resNum, int state, int x, int y) {
 	uint16 color = 0;
 	uint8 *data = _vm->getResourceAddress(rtImage, resNum);
 	assert(data);

Modified: scummvm/trunk/engines/scumm/he/wiz_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.h	2009-06-05 02:35:38 UTC (rev 41188)
+++ scummvm/trunk/engines/scumm/he/wiz_he.h	2009-06-05 04:16:32 UTC (rev 41189)
@@ -182,7 +182,7 @@
 	void getWizImageDim(int resNum, int state, int32 &w, int32 &h);
 	int getWizImageStates(int resnum);
 	int isWizPixelNonTransparent(int resnum, int state, int x, int y, int flags);
-	uint8 getWizPixelColor(int resnum, int state, int x, int y, int flags);
+	uint16 getWizPixelColor(int resnum, int state, int x, int y);
 	int getWizImageData(int resNum, int state, int type);
 
 	void flushWizBuffer();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.