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

Didn't need to split it after all.

Browse source 
svn-id: r13973
This commit is contained in:
Travis Howell 2004-06-20 14:47:14 +00:00
parent b6ce351f6d
commit 3fd30cda0c
3 changed files with 9 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scumm/intern.h
View file

@ -598,7 +598,6 @@ protected:
void o6_writeFile(); void o6_writeFile();
void o6_setVolume(); void o6_setVolume();
void o6_seekFilePos(); void o6_seekFilePos();
void o6_unknownE1();
void o6_localizeArray(); void o6_localizeArray();
void o6_redimArray(); void o6_redimArray();
void o6_readFilePos(); void o6_readFilePos();

13
scumm/script_v6.cpp
View file

@ -3040,8 +3040,15 @@ void ScummEngine_v6::o6_getDateTime() {
void ScummEngine_v6::o6_unknownE1() { void ScummEngine_v6::o6_unknownE1() {
// this opcode check ground area in minigame "Asteroid Lander" in the dig // this opcode check ground area in minigame "Asteroid Lander" in the dig
int y = pop(); int x, y;
int x = pop();
if (_features & GF_HUMONGOUS) {
x = pop();
y = pop();
} else {
y = pop();
x = pop();
}
if (x > _screenWidth - 1) { if (x > _screenWidth - 1) {
push(-1); push(-1);
@ -3057,8 +3064,6 @@ void ScummEngine_v6::o6_unknownE1() {
return; return;
} }
// FIXME: Actually, there is only one virtscr in V7/V8 games anyway.
// And topline is always 0 for it.
VirtScreen *vs = findVirtScreen(y); VirtScreen *vs = findVirtScreen(y);
if (vs == NULL) { if (vs == NULL) {

31
scumm/script_v6he.cpp
View file

@ -1151,37 +1151,6 @@ void ScummEngine_v6he::o6_setVolume() {
} }
} }
void ScummEngine_v6he::o6_unknownE1() {
int x = pop();
int y = 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) {
push(-1);
return;
}
int offset = (y - vs->topline) * vs->width + x + _screenLeft;
byte area = *(vs->screenPtr + offset);
push(area);
}
void ScummEngine_v6he::o6_localizeArray() { void ScummEngine_v6he::o6_localizeArray() {
int stringID = pop(); int stringID = pop();