thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed o6_unknownE1 to o6_getPixel; use vs->xstart instead of _screenLeft

Browse source 
svn-id: r14607
This commit is contained in:
Max Horn 2004-08-14 15:14:01 +00:00
parent bc7b72f13d
commit 239aa2b062
4 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
scumm/script_v6.cpp
View file

@ -331,7 +331,7 @@ void ScummEngine_v6::setupOpcodes() {
OPCODE(o6_invalid),
/* E0 */
OPCODE(o6_invalid),
OPCODE(o6_unknownE1),
OPCODE(o6_getPixel),
OPCODE(o6_invalid),
OPCODE(o6_pickVarRandom),
/* E4 */
@ -3104,7 +3104,7 @@ void ScummEngine_v6::o6_getDateTime() {
VAR(VAR_TIMEDATE_SECOND) = t->tm_sec;
}
void ScummEngine_v6::o6_unknownE1() {
void ScummEngine_v6::o6_getPixel() {
// this opcode check ground area in minigame "Asteroid Lander" in the dig
int x, y;
@ -3116,28 +3116,14 @@ void ScummEngine_v6::o6_unknownE1() {
x = pop();
}
if (x > _screenWidth - 1) {
push(-1);
return;
}
if (x < 0) {
push(-1);
return;
}
if (y < 0) {
push(-1);
return;
}
VirtScreen *vs = findVirtScreen(y);
if (vs == NULL) {
if (vs == NULL || x > _screenWidth - 1 || x < 0) {
push(-1);
return;
}
int offset = (y - vs->topline) * vs->width + x + _screenLeft;
int offset = (y - vs->topline) * vs->width + x + vs->xstart;
byte area = *(vs->screenPtr + offset);
push(area);