diff options
| author | Travis Howell | 2009-06-05 04:16:32 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-06-05 04:16:32 +0000 |
| commit | 58d494a7cb11c97834c61f6596d38c1c71c57031 (patch) | |
| tree | 4a8546bb78361e92350d25487d7d6cd912ebc141 | |
| parent | 9ca2345fc13c9422f118ed00039e2fd900383fd5 (diff) | |
| download | scummvm-rg350-58d494a7cb11c97834c61f6596d38c1c71c57031.tar.gz scummvm-rg350-58d494a7cb11c97834c61f6596d38c1c71c57031.tar.bz2 scummvm-rg350-58d494a7cb11c97834c61f6596d38c1c71c57031.zip | |
Minor cleanup.
svn-id: r41189
| -rw-r--r-- | engines/scumm/he/script_v100he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/script_v90he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/wiz_he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/wiz_he.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp index 5912e3d528..665782bf36 100644 --- a/engines/scumm/he/script_v100he.cpp +++ b/engines/scumm/he/script_v100he.cpp @@ -2506,7 +2506,7 @@ void ScummEngine_v100he::o100_getWizData() { 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(); diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp index cdfef1a5e5..f97771a4f8 100644 --- a/engines/scumm/he/script_v90he.cpp +++ b/engines/scumm/he/script_v90he.cpp @@ -1300,7 +1300,7 @@ void ScummEngine_v90he::o90_getWizData() { 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(); diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index 6038433847..b23b7ac869 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -2322,7 +2322,7 @@ int Wiz::isWizPixelNonTransparent(int resNum, int state, int x, int y, int flags 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); diff --git a/engines/scumm/he/wiz_he.h b/engines/scumm/he/wiz_he.h index e6ea0fe57e..fe63457ead 100644 --- a/engines/scumm/he/wiz_he.h +++ b/engines/scumm/he/wiz_he.h @@ -182,7 +182,7 @@ public: 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(); |