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

DREAMWEB: Cleanup identifyOb()

Browse source
This commit is contained in:
Filippos Karapetis 2011-12-26 13:18:09 +02:00
parent 70b9886340
commit 1b11f48a35
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
engines/dreamweb/object.cpp
View file

@ -343,25 +343,20 @@ void DreamGenContext::identifyOb() {
return; return;
} }
ax = data.word(kMousex) - data.word(kMapadx); uint16 initialX = data.word(kMousex) - data.word(kMapadx);
bx = data.word(kMousey) - data.word(kMapady); uint16 initialY = data.word(kMousey) - data.word(kMapady);
if (ax >= 22 * 8 || bx >= 20 * 8) { if (initialX >= 22 * 8 || initialY >= 20 * 8) {
blank(); blank();
return; return;
} }
data.byte(kInmaparea) = 1; byte x = initialX & 0xFF;
ah = bl; byte y = initialY & 0xFF;
push(ax);
data.byte(kPointerspath) = findPathOfPoint(al, ah);
ax = pop();
push(ax);
data.byte(kPointerfirstpath) = findFirstPath(al, ah);
ax = pop();
byte x = al; data.byte(kInmaparea) = 1;
byte y = ah; data.byte(kPointerspath) = findPathOfPoint(x, y);
data.byte(kPointerfirstpath) = findFirstPath(x, y);
if (checkIfEx(x, y) || checkIfFree(x, y) || if (checkIfEx(x, y) || checkIfFree(x, y) ||
checkIfPerson(x, y) || checkIfSet(x, y)) checkIfPerson(x, y) || checkIfSet(x, y))