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

Fix last commit

Browse source 
Add stub/warning

svn-id: r15184
This commit is contained in:
Travis Howell 2004-09-19 08:37:20 +00:00
parent 169d13080b
commit 45c34259bd
6 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scumm/actor.cpp
View file

@ -1933,7 +1933,10 @@ void ScummEngine::postProcessAuxQueue() {
warning("unimplemented compression type %d", comp); warning("unimplemented compression type %d", comp);
break; break;
} }
} else {
warning("unimplemented compression type %d", comp);
} }
} }
const uint8 *axur = findResourceData(MKID('AXUR'), auxd); const uint8 *axur = findResourceData(MKID('AXUR'), auxd);
if (axur) { if (axur) {

1
scumm/intern.h
View file

@ -739,6 +739,7 @@ protected:
void o72_wordArrayInc(); void o72_wordArrayInc();
void o72_objectX(); void o72_objectX();
void o72_objectY(); void o72_objectY();
void o72_unknown56();
void o72_getTimer(); void o72_getTimer();
void o72_setTimer(); void o72_setTimer();
void o72_unknown5A(); void o72_unknown5A();

22
scumm/script_v72he.cpp
View file

@ -152,7 +152,7 @@ void ScummEngine_v72he::setupOpcodes() {
/* 54 */ /* 54 */
OPCODE(o72_objectX), OPCODE(o72_objectX),
OPCODE(o72_objectY), OPCODE(o72_objectY),
OPCODE(o6_invalid), OPCODE(o72_unknown56),
OPCODE(o6_wordVarDec), OPCODE(o6_wordVarDec),
/* 58 */ /* 58 */
OPCODE(o72_getTimer), OPCODE(o72_getTimer),
@ -743,6 +743,17 @@ void ScummEngine_v72he::o72_objectY() {
push(_objs[objnum].y_pos); push(_objs[objnum].y_pos);
} }
void ScummEngine_v72he::o72_unknown56() {
// Drawing related
int a = pop();
int b = pop();
int c = pop();
int d = pop();
int e = pop();
debug(1, "stub o72_unknown56(%d, %d, %d, %d, %d)", a, b, c, d, e);
}
void ScummEngine_v72he::o72_getTimer() { void ScummEngine_v72he::o72_getTimer() {
int timer = pop(); int timer = pop();
int cmd = fetchScriptByte(); int cmd = fetchScriptByte();
@ -1533,7 +1544,10 @@ void ScummEngine_v72he::o72_openFile() {
copyScriptString(filename); copyScriptString(filename);
// The boot script in some HE games doen't set the // The boot script in some HE games doen't set the
// complete data file name. So we work around that. // complete data file name. So we work around that.
if (!strcmp((char *)filename,".he3")) { if (!strcmp((char *)filename,".he7")) {
memset(filename, 0, sizeof(filename));
sprintf((char *)filename, "%s.he7", _gameName.c_str());
} else if (!strcmp((char *)filename,".he3")) {
memset(filename, 0, sizeof(filename)); memset(filename, 0, sizeof(filename));
sprintf((char *)filename, "%s.he3", _gameName.c_str()); sprintf((char *)filename, "%s.he3", _gameName.c_str());
} }
@ -1920,9 +1934,7 @@ void ScummEngine_v72he::o72_readINI() {
switch (type) { switch (type) {
case 6: // number case 6: // number
if (!strcmp((char *)option, "ReadPagesAutomatically")) if (!strcmp((char *)option, "NoPrinting"))
push(1);
else if (!strcmp((char *)option, "NoPrinting"))
push(1); push(1);
else else
push(0); push(0);

2
scumm/script_v80he.cpp
View file

@ -152,7 +152,7 @@ void ScummEngine_v80he::setupOpcodes() {
/* 54 */ /* 54 */
OPCODE(o72_objectX), OPCODE(o72_objectX),
OPCODE(o72_objectY), OPCODE(o72_objectY),
OPCODE(o6_invalid), OPCODE(o72_unknown56),
OPCODE(o6_wordVarDec), OPCODE(o6_wordVarDec),
/* 58 */ /* 58 */
OPCODE(o72_getTimer), OPCODE(o72_getTimer),

2
scumm/script_v90he.cpp
View file

@ -152,7 +152,7 @@ void ScummEngine_v90he::setupOpcodes() {
/* 54 */ /* 54 */
OPCODE(o72_objectX), OPCODE(o72_objectX),
OPCODE(o72_objectY), OPCODE(o72_objectY),
OPCODE(o6_invalid), OPCODE(o72_unknown56),
OPCODE(o6_wordVarDec), OPCODE(o6_wordVarDec),
/* 58 */ /* 58 */
OPCODE(o72_getTimer), OPCODE(o72_getTimer),

4
scumm/scumm.cpp
View file

@ -1193,6 +1193,8 @@ void ScummEngine::launch() {
if (VAR_DEBUGMODE != 0xFF) { if (VAR_DEBUGMODE != 0xFF) {
// This is NOT for the Mac version of Indy3/Loom // This is NOT for the Mac version of Indy3/Loom
VAR(VAR_DEBUGMODE) = _debugMode; VAR(VAR_DEBUGMODE) = _debugMode;
if (_heversion >= 80)
VAR(85) = 1;
} }
if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA) if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
@ -1459,8 +1461,6 @@ void ScummEngine::initScummVars() {
VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1; VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1;
} }
if (_heversion >= 80) if (_heversion >= 80)
// Enable built-in debug mode keys
VAR(85) = 1;
VAR(VAR_WINDOWS_VERSION) = 40; VAR(VAR_WINDOWS_VERSION) = 40;
if (_heversion >= 90) if (_heversion >= 90)
VAR(VAR_NUM_SPRITES) = _numSprites - 1; VAR(VAR_NUM_SPRITES) = _numSprites - 1;