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

Some small Zak256 fixes.

Browse source 
svn-id: r3577
This commit is contained in:
James Brown 2002-02-14 12:57:29 +00:00
parent d59b949833
commit c88e7351b4
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boxes.cpp
View file

@ -459,7 +459,7 @@ int Scumm::findPathTowards(Actor *a, byte box1nr, byte box2nr, byte box3nr) {
box2.ll = box2.lr; box2.ll = box2.lr;
box2.lr = tmp; box2.lr = tmp;
} }
error("findPathTowards: default"); warning("findPathTowards: default"); // FIXME: ZAK256
} }
void Scumm::setBoxFlags(int box, int val) { void Scumm::setBoxFlags(int box, int val) {
/* FULL_THROTTLE stuff */ /* FULL_THROTTLE stuff */

3
script_v1.cpp
View file

@ -1892,6 +1892,7 @@ void Scumm::o5_wait() {
break; break;
return; return;
case 2: /* wait for message */ case 2: /* wait for message */
if (_gameId == GID_ZAK256) return; // FIXME: ZAK256
if (_vars[VAR_HAVE_MSG]) if (_vars[VAR_HAVE_MSG])
break; break;
return; return;
@ -2098,7 +2099,7 @@ void Scumm::o5_pickupObjectOld() {
int obj; int obj;
obj = getVarOrDirectByte(0x80); obj = getVarOrDirectWord(0x80);
if(getObjectIndex(obj) != 1) if(getObjectIndex(obj) != 1)
return; return;

10
string.cpp
View file

@ -183,10 +183,7 @@ void Scumm::CHARSET_1() {
int s, i, t, c; int s, i, t, c;
int frme; int frme;
Actor *a; Actor *a;
byte *buffer; byte *buffer;
if(_gameId==GID_ZAK256)
return;
#if !defined(FULL_THROTTLE) #if !defined(FULL_THROTTLE)
if (!_haveMsg || (camera._dest.x>>3) != (camera._cur.x>>3) || if (!_haveMsg || (camera._dest.x>>3) != (camera._cur.x>>3) ||
@ -288,7 +285,10 @@ void Scumm::CHARSET_1() {
} }
buffer = charset._buffer + charset._bufPos; buffer = charset._buffer + charset._bufPos;
if(_gameId==GID_ZAK256) {
debug(1, "CHARSET_1: %s", buffer);
return;
}
charset.addLinebreaks(0, buffer,0, t); charset.addLinebreaks(0, buffer,0, t);
_lastXstart = virtscr[0].xstart; _lastXstart = virtscr[0].xstart;