Some small Zak256 fixes.
svn-id: r3577
This commit is contained in:
parent
d59b949833
commit
c88e7351b4
3 changed files with 8 additions and 7 deletions
|
@ -459,7 +459,7 @@ int Scumm::findPathTowards(Actor *a, byte box1nr, byte box2nr, byte box3nr) {
|
|||
box2.ll = box2.lr;
|
||||
box2.lr = tmp;
|
||||
}
|
||||
error("findPathTowards: default");
|
||||
warning("findPathTowards: default"); // FIXME: ZAK256
|
||||
}
|
||||
void Scumm::setBoxFlags(int box, int val) {
|
||||
/* FULL_THROTTLE stuff */
|
||||
|
|
|
@ -1892,6 +1892,7 @@ void Scumm::o5_wait() {
|
|||
break;
|
||||
return;
|
||||
case 2: /* wait for message */
|
||||
if (_gameId == GID_ZAK256) return; // FIXME: ZAK256
|
||||
if (_vars[VAR_HAVE_MSG])
|
||||
break;
|
||||
return;
|
||||
|
@ -2098,7 +2099,7 @@ void Scumm::o5_pickupObjectOld() {
|
|||
|
||||
int obj;
|
||||
|
||||
obj = getVarOrDirectByte(0x80);
|
||||
obj = getVarOrDirectWord(0x80);
|
||||
|
||||
if(getObjectIndex(obj) != 1)
|
||||
return;
|
||||
|
|
|
@ -185,9 +185,6 @@ void Scumm::CHARSET_1() {
|
|||
Actor *a;
|
||||
byte *buffer;
|
||||
|
||||
if(_gameId==GID_ZAK256)
|
||||
return;
|
||||
|
||||
#if !defined(FULL_THROTTLE)
|
||||
if (!_haveMsg || (camera._dest.x>>3) != (camera._cur.x>>3) ||
|
||||
camera._cur.x != camera._last.x
|
||||
|
@ -288,7 +285,10 @@ void Scumm::CHARSET_1() {
|
|||
}
|
||||
|
||||
buffer = charset._buffer + charset._bufPos;
|
||||
|
||||
if(_gameId==GID_ZAK256) {
|
||||
debug(1, "CHARSET_1: %s", buffer);
|
||||
return;
|
||||
}
|
||||
charset.addLinebreaks(0, buffer,0, t);
|
||||
|
||||
_lastXstart = virtscr[0].xstart;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue