diff --git a/scumm/intern.h b/scumm/intern.h index 3f96b7af758..dd52c85fbde 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -583,9 +583,7 @@ protected: void o6_readFile(); void o6_rename(); void o6_writeFile(); - void o6_findAllObjects(); void o6_setVolume(); - void o6_unknownE1(); void o6_seekFile(); void o6_localizeArray(); void o6_unknownEE(); diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 8f70594ab4d..abf284b9383 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1887,30 +1887,6 @@ void ScummEngine_v6::o6_actorOps() { case 217: // SO_ACTOR_NEW a->initActor(2); break; - case 218: - { - // TODO: this opcode is used in the putt-putt fun pack, in 'checkers" mini game - warning("o6_actorOps():218 partially unimplemented"); - - int top_actor = a->top; - int bottom_actor = a->bottom; - a->forceClip = 1; - a->needRedraw = true; - a->drawActorCostume(); - a->forceClip = 0; - a->needRedraw = true; - a->drawActorCostume(); - a->needRedraw = false; - - if (a->top > top_actor) - a->top = top_actor; - if (a->bottom < bottom_actor) - a->bottom = bottom_actor; - - //FIXME Trigger redraw - a->bottom = top_actor; - } - break; case 227: // SO_ACTOR_DEPTH a->layer = pop(); break; diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index 46352e997f3..5594cbe5cf3 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -1064,56 +1064,6 @@ void ScummEngine_v6he::o6_writeFile() { warning("o6_writeFile(%d, %d)", slot, resID); } -void ScummEngine_v6he::o6_findAllObjects() { - int a = pop(); - int i = 1; - - if (a != _currentRoom) - warning("o6_findAllObjects: current room is not %d", a); - writeVar(0, 0); - defineArray(0, 5, 0, _numLocalObjects + 1); - writeArray(0, 0, 0, _numLocalObjects); - - while (i < _numLocalObjects) { - writeArray(0, 0, i, _objs[i].obj_nr); - i++; - } - - push(readVar(0)); -} - -void ScummEngine_v6he::o6_unknownE1() { - // this opcode check ground area in minigame "Asteroid Lander" in the dig - int y = pop(); - int x = 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_setVolume() { byte subOp = fetchScriptByte(); int soundVolumeMaster; diff --git a/scumm/vars.cpp b/scumm/vars.cpp index 88932c586a7..4fab7884de2 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -161,25 +161,6 @@ void ScummEngine_v6::setupScummVars() { VAR_TIMEDATE_MINUTE = 126; } -void ScummEngine_v6he::setupScummVars() { - // Many vars are the same as in V5 & V6 games, so just call the inherited method first - ScummEngine::setupScummVars(); - - VAR_V6_SCREEN_WIDTH = 41; - VAR_V6_SCREEN_HEIGHT = 54; - VAR_V6_EMSSPACE = 76; - VAR_RANDOM_NR = 118; - - VAR_V6_SOUNDMODE = 9; - - VAR_TIMEDATE_YEAR = 119; - VAR_TIMEDATE_MONTH = 129; - VAR_TIMEDATE_DAY = 128; - VAR_TIMEDATE_HOUR = 125; - VAR_TIMEDATE_MINUTE = 126; -} - - void ScummEngine_v7::setupScummVars() { VAR_MOUSE_X = 1; VAR_MOUSE_Y = 2;