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

cleanup

Browse source 
svn-id: r6214
This commit is contained in:
Max Horn 2002-12-28 00:45:44 +00:00
parent edd08521c3
commit 319facc9c3
4 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/actor.cpp
View file

@ -1223,7 +1223,7 @@ void Actor::startWalkAnim(int cmd, int angle)
*/
#if 0
if (walk_script != 0) {
int16 args[16];
int args[16];
args[0] = number;
args[1] = cmd;
args[2] = angle;

3
scumm/object.cpp
View file

@ -266,8 +266,7 @@ int Scumm::findObject(int x, int y)
a = _objs[b].parentstate;
b = _objs[b].parent;
if (b == 0) {
if (_objs[i].x_pos <= x &&
_objs[i].width + _objs[i].x_pos > x &&
if (_objs[i].x_pos <= x && _objs[i].width + _objs[i].x_pos > x &&
_objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y)
return _objs[i].obj_nr;
break;

11
scumm/script_v8.cpp
View file

@ -1456,12 +1456,21 @@ void Scumm_v8::o6_kernelGetFunctions()
case 0xCE: // getRGBSlot
case 0xD3: // getKeyState
case 0xD7: // getBox
push(0);
warning("o6_kernelGetFunctions: default case %d (len = %d)", args[0], len);
break;
case 0xD8: // findBlastObject
// FIXME - this is WRONG and just a temporary hack
push(findObject(args[1], args[2]));
break;
case 0xD9: // actorHit
push(0);
warning("o6_kernelGetFunctions: default case %d (len = %d)", args[0], len);
break;
case 0xDA: // lipSyncWidth
case 0xDB: // lipSyncHeight
case 0xDC: // actorTalkAnimation
// FIXME - hack!
// TODO - these methods are for lip syncing. Not so important right now, though
push(0);
break;
case 0xDD: // getMasterSFXVol