M4: Changed debug calls to debugCN since they all have newlines
svn-id: r54047
This commit is contained in:
Paul Gilbert
parent
e56a3747d2
commit
0ac1eb82c6
17 changed files with 379 additions and 378 deletions
|
|
@ -121,7 +121,7 @@ SeriesStreamBreakList::~SeriesStreamBreakList() {
|
|||
|
||||
void SeriesStreamBreakList::load(Common::File *fd) {
|
||||
uint32 count = fd->readUint32LE();
|
||||
debug(kDebugScript, "SeriesStreamBreakList::load() count = %d\n", count);
|
||||
debugCN(kDebugScript, "SeriesStreamBreakList::load() count = %d\n", count);
|
||||
for (uint32 i = 0; i < count; i++) {
|
||||
SeriesStreamBreakItem *item = new SeriesStreamBreakItem();
|
||||
item->frameNum = fd->readUint32LE();
|
||||
|
|
@ -135,7 +135,7 @@ void SeriesStreamBreakList::load(Common::File *fd) {
|
|||
item->value = fd->readUint32LE();
|
||||
_items.push_back(item);
|
||||
|
||||
debug(kDebugScript, "%02d: frameNum = %d; digiName = %s; digiChannel = %d; digiVolume = %d; trigger = %d; flags = %d; variable = %d; value = %d\n",
|
||||
debugCN(kDebugScript, "%02d: frameNum = %d; digiName = %s; digiChannel = %d; digiVolume = %d; trigger = %d; flags = %d; variable = %d; value = %d\n",
|
||||
i, item->frameNum, item->digiName, item->digiChannel, item->digiVolume, item->trigger, item->flags, item->variable.value, item->value);
|
||||
|
||||
}
|
||||
|
|
@ -146,7 +146,7 @@ SaidArray::~SaidArray() {
|
|||
|
||||
void SaidArray::load(Common::File *fd) {
|
||||
uint32 count = fd->readUint32LE();
|
||||
debug(kDebugScript, "SaidArray::load() count = %d\n", count);
|
||||
debugCN(kDebugScript, "SaidArray::load() count = %d\n", count);
|
||||
for (uint32 i = 0; i < count; i++) {
|
||||
SaidArrayItem *item = new SaidArrayItem();
|
||||
item->itemName = _inter->loadGlobalString(fd);
|
||||
|
|
@ -155,7 +155,7 @@ void SaidArray::load(Common::File *fd) {
|
|||
item->digiNameGear = _inter->loadGlobalString(fd);
|
||||
_items.push_back(item);
|
||||
|
||||
debug(kDebugScript, "itemName = %s; digiNameLook = %s; digiNameTake = %s; digiNameGear = %s\n",
|
||||
debugCN(kDebugScript, "itemName = %s; digiNameLook = %s; digiNameTake = %s; digiNameGear = %s\n",
|
||||
item->itemName, item->digiNameLook, item->digiNameTake, item->digiNameGear);
|
||||
|
||||
}
|
||||
|
|
@ -166,7 +166,7 @@ ParserArray::~ParserArray() {
|
|||
|
||||
void ParserArray::load(Common::File *fd) {
|
||||
uint32 count = fd->readUint32LE();
|
||||
debug(kDebugScript, "ParserArray::load() count = %d\n", count);
|
||||
debugCN(kDebugScript, "ParserArray::load() count = %d\n", count);
|
||||
for (uint32 i = 0; i < count; i++) {
|
||||
ParserArrayItem *item = new ParserArrayItem();
|
||||
item->w0 = _inter->loadGlobalString(fd);
|
||||
|
|
@ -180,7 +180,7 @@ void ParserArray::load(Common::File *fd) {
|
|||
item->value = fd->readUint32LE();
|
||||
_items.push_back(item);
|
||||
|
||||
debug(kDebugScript, "w0 = %s; w1 = %s; trigger = %d; testVariable = %d; testValue = %d; variable = %d; value = %d\n",
|
||||
debugCN(kDebugScript, "w0 = %s; w1 = %s; trigger = %d; testVariable = %d; testValue = %d; variable = %d; value = %d\n",
|
||||
item->w0, item->w1, item->trigger, item->testVariable.value, item->testValue, item->variable.value, item->value);
|
||||
|
||||
}
|
||||
|
|
@ -194,9 +194,9 @@ ScriptFunction::~ScriptFunction() {
|
|||
}
|
||||
|
||||
void ScriptFunction::load(Common::File *fd) {
|
||||
debug(kDebugScript, "ScriptFunction::load()\n");
|
||||
debugCN(kDebugScript, "ScriptFunction::load()\n");
|
||||
uint32 size = fd->readUint32LE();
|
||||
debug(kDebugScript, "ScriptFunction::load() size = %d\n", size);
|
||||
debugCN(kDebugScript, "ScriptFunction::load() size = %d\n", size);
|
||||
_code = fd->readStream(size);
|
||||
}
|
||||
|
||||
|
|
@ -243,16 +243,16 @@ void ScriptInterpreter::open(const char *filename) {
|
|||
}
|
||||
|
||||
int functionCount = _scriptFile->readUint32LE();
|
||||
debug(kDebugScript, "functionCount = %d\n", functionCount);
|
||||
debugCN(kDebugScript, "functionCount = %d\n", functionCount);
|
||||
for (int i = 0; i < functionCount; i++) {
|
||||
uint32 offset = _scriptFile->readUint32LE();
|
||||
debug(kDebugScript, "func(%d) offset = %08X\n", i, offset);
|
||||
debugCN(kDebugScript, "func(%d) offset = %08X\n", i, offset);
|
||||
uint32 len = _scriptFile->readUint32LE();
|
||||
if (len > 0) {
|
||||
char *funcName = new char[len + 1];
|
||||
_scriptFile->read(funcName, len);
|
||||
funcName[len] = '\0';
|
||||
debug(kDebugScript, "func(%d) name = %s\n", i, funcName);
|
||||
debugCN(kDebugScript, "func(%d) name = %s\n", i, funcName);
|
||||
_functionNames[Common::String(funcName)] = _functions.size();
|
||||
// DEBUG
|
||||
_scriptFunctionNames.push_back(Common::String(funcName));
|
||||
|
|
@ -262,16 +262,16 @@ void ScriptInterpreter::open(const char *filename) {
|
|||
}
|
||||
|
||||
int dataCount = _scriptFile->readUint32LE();
|
||||
debug(kDebugScript, "dataCount = %d\n", dataCount);
|
||||
debugCN(kDebugScript, "dataCount = %d\n", dataCount);
|
||||
for (int i = 0; i < dataCount; i++) {
|
||||
uint32 offset = _scriptFile->readUint32LE();
|
||||
ScriptDataType type = (ScriptDataType)_scriptFile->readUint32LE();
|
||||
debug(kDebugScript, "data(%d) offset = %08X; type = %d\n", i, offset, type);
|
||||
debugCN(kDebugScript, "data(%d) offset = %08X; type = %d\n", i, offset, type);
|
||||
_data.push_back(new ScriptDataEntry(offset, type));
|
||||
}
|
||||
|
||||
_globalVarCount = _scriptFile->readUint32LE();
|
||||
debug(kDebugScript, "_globalVarCount = %d\n", _globalVarCount);
|
||||
debugCN(kDebugScript, "_globalVarCount = %d\n", _globalVarCount);
|
||||
|
||||
uint32 stringOfs = _scriptFile->readUint32LE();
|
||||
_scriptFile->seek(stringOfs);
|
||||
|
|
@ -324,11 +324,11 @@ ScriptFunction *ScriptInterpreter::loadFunction(uint32 index) {
|
|||
ScriptFunction *ScriptInterpreter::loadFunction(const Common::String &name) {
|
||||
FunctionNameMap::iterator iter = _functionNames.find(name);
|
||||
if (iter == _functionNames.end()) {
|
||||
debug(kDebugScript, "ScriptInterpreter::loadFunction() Function '%s' not found!\n", name.c_str());
|
||||
debugCN(kDebugScript, "ScriptInterpreter::loadFunction() Function '%s' not found!\n", name.c_str());
|
||||
return NULL;
|
||||
}
|
||||
uint32 funcIndex = (*iter)._value;
|
||||
debug(kDebugScript, "ScriptInterpreter::loadFunction() index('%s') = %d\n", name.c_str(), funcIndex);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::loadFunction() index('%s') = %d\n", name.c_str(), funcIndex);
|
||||
return loadFunction(funcIndex);
|
||||
}
|
||||
|
||||
|
|
@ -375,24 +375,24 @@ void ScriptInterpreter::pop(ScriptValue &value) {
|
|||
}
|
||||
|
||||
void ScriptInterpreter::dumpStack() {
|
||||
debug(kDebugScript, "ScriptInterpreter::dumpStack()\n");
|
||||
debugCN(kDebugScript, "ScriptInterpreter::dumpStack()\n");
|
||||
for (int i = 0; i < _stackPtr; i++) {
|
||||
debug(kDebugScript, "%03d. type = %02d; value = %d\n", i, _stack[i].type, _stack[i].value);
|
||||
debugCN(kDebugScript, "%03d. type = %02d; value = %d\n", i, _stack[i].type, _stack[i].value);
|
||||
}
|
||||
}
|
||||
|
||||
void ScriptInterpreter::dumpRegisters() {
|
||||
debug(kDebugScript, "ScriptInterpreter::dumpRegisters()\n");
|
||||
debugCN(kDebugScript, "ScriptInterpreter::dumpRegisters()\n");
|
||||
for (int i = 0; i < ARRAYSIZE(_registers); i++) {
|
||||
debug(kDebugScript, "%03d. type = %02d; value = %d\n", i, _registers[i].type, _registers[i].value);
|
||||
debugCN(kDebugScript, "%03d. type = %02d; value = %d\n", i, _registers[i].type, _registers[i].value);
|
||||
}
|
||||
}
|
||||
|
||||
void ScriptInterpreter::dumpGlobalVars() {
|
||||
debug(kDebugScript, "ScriptInterpreter::dumpGlobalVars()\n");
|
||||
debugCN(kDebugScript, "ScriptInterpreter::dumpGlobalVars()\n");
|
||||
for (int i = 0; i < ARRAYSIZE(_globalVars); i++) {
|
||||
if (_globalVars[i].type != -1)
|
||||
debug(kDebugScript, "%03d. type = %02d; value = %d\n", i, _globalVars[i].type, _globalVars[i].value);
|
||||
debugCN(kDebugScript, "%03d. type = %02d; value = %d\n", i, _globalVars[i].type, _globalVars[i].value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -404,7 +404,7 @@ int ScriptInterpreter::toInteger(const ScriptValue &value) {
|
|||
return value.value;
|
||||
|
||||
default:
|
||||
debug(kDebugScript, "ScriptInterpreter::toInteger() Invalid type %d!\n", value.type);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::toInteger() Invalid type %d!\n", value.type);
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
|
@ -422,7 +422,7 @@ const char *ScriptInterpreter::toString(const ScriptValue &value) {
|
|||
return _constStrings[value.value];
|
||||
|
||||
default:
|
||||
debug(kDebugScript, "ScriptInterpreter::toString() Invalid type %d!\n", value.type);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::toString() Invalid type %d!\n", value.type);
|
||||
return NULL;
|
||||
|
||||
}
|
||||
|
|
@ -461,7 +461,7 @@ void ScriptInterpreter::loadValue(ScriptValue &value) {
|
|||
break;
|
||||
|
||||
default:
|
||||
debug(kDebugScript, "ScriptInterpreter::loadValue() Invalid value type %d!\n", value.type);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::loadValue() Invalid value type %d!\n", value.type);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -470,7 +470,7 @@ void ScriptInterpreter::loadValue(ScriptValue &value) {
|
|||
void ScriptInterpreter::copyValue(ScriptValue &destValue, ScriptValue &sourceValue) {
|
||||
|
||||
if (sourceValue.type == -1) {
|
||||
debug(kDebugScript, "ScriptInterpreter::copyValue() Trying to read uninitialized value!\n");
|
||||
debugCN(kDebugScript, "ScriptInterpreter::copyValue() Trying to read uninitialized value!\n");
|
||||
}
|
||||
|
||||
switch (destValue.type) {
|
||||
|
|
@ -488,7 +488,7 @@ void ScriptInterpreter::copyValue(ScriptValue &destValue, ScriptValue &sourceVal
|
|||
if (sourceValue.type == kInteger) {
|
||||
_logicGlobals[destValue.value] = sourceValue.value;
|
||||
} else {
|
||||
debug(kDebugScript, "ScriptInterpreter::copyValue() Invalid source value type %d!\n", sourceValue.type);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::copyValue() Invalid source value type %d!\n", sourceValue.type);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -497,7 +497,7 @@ void ScriptInterpreter::copyValue(ScriptValue &destValue, ScriptValue &sourceVal
|
|||
break;
|
||||
|
||||
default:
|
||||
debug(kDebugScript, "ScriptInterpreter::copyValue() Invalid dest value type %d!\n", destValue.type);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::copyValue() Invalid dest value type %d!\n", destValue.type);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -532,7 +532,7 @@ void ScriptInterpreter::derefValue(ScriptValue &value) {
|
|||
break;
|
||||
|
||||
default:
|
||||
debug(kDebugScript, "ScriptInterpreter::derefValue() Invalid value type %d!\n", value.type);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::derefValue() Invalid value type %d!\n", value.type);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -540,21 +540,21 @@ void ScriptInterpreter::derefValue(ScriptValue &value) {
|
|||
|
||||
void ScriptInterpreter::callKernelFunction(uint32 index) {
|
||||
|
||||
debug(kDebugScript, "ScriptInterpreter::callKernelFunction() index = %d\n", index);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::callKernelFunction() index = %d\n", index);
|
||||
|
||||
if (index > _kernelFunctionsMax) {
|
||||
debug(kDebugScript, "ScriptInterpreter::callKernelFunction() Invalid kernel functionindex (%d)\n", index);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::callKernelFunction() Invalid kernel functionindex (%d)\n", index);
|
||||
return;
|
||||
}
|
||||
|
||||
debug(kDebugScript, "ScriptInterpreter::callKernelFunction() name = %s\n", _kernelFunctions[index].desc);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::callKernelFunction() name = %s\n", _kernelFunctions[index].desc);
|
||||
|
||||
int args = (this->*(_kernelFunctions[index].proc))();
|
||||
// Now remove values from the stack if the function used any
|
||||
if (args > 4)
|
||||
_stackPtr -= args - 4;
|
||||
|
||||
debug(kDebugScript, "-------------\n");
|
||||
debugCN(kDebugScript, "-------------\n");
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -568,29 +568,29 @@ ScriptValue ScriptInterpreter::getArg(uint32 index) {
|
|||
}
|
||||
|
||||
void ScriptInterpreter::dumpArgs(uint32 count) {
|
||||
debug(kDebugScript, "ScriptInterpreter::dumpArgs() ");
|
||||
debugCN(kDebugScript, "ScriptInterpreter::dumpArgs() ");
|
||||
for (uint32 i = 0; i < count; i++) {
|
||||
ScriptValue argValue = getArg(i);
|
||||
if (argValue.type == kConstString) {
|
||||
debug(kDebugScript, "'%s'", toString(argValue));
|
||||
debugCN(kDebugScript, "'%s'", toString(argValue));
|
||||
} else {
|
||||
debug(kDebugScript, "%d", argValue.value);
|
||||
debugCN(kDebugScript, "%d", argValue.value);
|
||||
}
|
||||
if (i + 1 < count)
|
||||
debug(kDebugScript, ", ");
|
||||
debugCN(kDebugScript, ", ");
|
||||
}
|
||||
debug(kDebugScript, "\n");
|
||||
debugCN(kDebugScript, "\n");
|
||||
}
|
||||
|
||||
void ScriptInterpreter::callFunction(uint32 index) {
|
||||
// NOTE: This is a temporary hack for script functions not yet in the m4.dat
|
||||
if (index == 0xFFFFFFFF)
|
||||
return;
|
||||
debug(kDebugScript, "ScriptInterpreter::callFunction() index = %d [%s]\n", index, _scriptFunctionNames[index].c_str());
|
||||
debugCN(kDebugScript, "ScriptInterpreter::callFunction() index = %d [%s]\n", index, _scriptFunctionNames[index].c_str());
|
||||
ScriptFunction *subFunction = loadFunction(index);
|
||||
if (!subFunction) {
|
||||
// This *should* never happen since the linker checks this
|
||||
debug(kDebugScript, "ScriptInterpreter::callFunction() Function %d could not be loaded!\n", index);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::callFunction() Function %d could not be loaded!\n", index);
|
||||
return;
|
||||
}
|
||||
runFunction(subFunction);
|
||||
|
|
@ -598,7 +598,7 @@ void ScriptInterpreter::callFunction(uint32 index) {
|
|||
|
||||
bool ScriptInterpreter::execOpcode(byte opcode) {
|
||||
|
||||
debug(kDebugScript, "opcode = %d (%s)\n", opcode, opcodeNames[opcode]);
|
||||
debugCN(kDebugScript, "opcode = %d (%s)\n", opcode, opcodeNames[opcode]);
|
||||
|
||||
ScriptValue value1, value2, value3;
|
||||
uint32 temp;
|
||||
|
|
@ -647,14 +647,14 @@ bool ScriptInterpreter::execOpcode(byte opcode) {
|
|||
|
||||
case opJmp:
|
||||
temp = _runningFunction->readUint32();
|
||||
debug(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
debugCN(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
_runningFunction->jumpAbsolute(temp);
|
||||
return true;
|
||||
|
||||
case opJl:
|
||||
temp = _runningFunction->readUint32();
|
||||
if (_cmpFlags < 0) {
|
||||
debug(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
debugCN(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
_runningFunction->jumpAbsolute(temp);
|
||||
}
|
||||
return true;
|
||||
|
|
@ -662,7 +662,7 @@ bool ScriptInterpreter::execOpcode(byte opcode) {
|
|||
case opJle:
|
||||
temp = _runningFunction->readUint32();
|
||||
if (_cmpFlags <= 0) {
|
||||
debug(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
debugCN(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
_runningFunction->jumpAbsolute(temp);
|
||||
}
|
||||
return true;
|
||||
|
|
@ -670,7 +670,7 @@ bool ScriptInterpreter::execOpcode(byte opcode) {
|
|||
case opJg:
|
||||
temp = _runningFunction->readUint32();
|
||||
if (_cmpFlags > 0) {
|
||||
debug(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
debugCN(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
_runningFunction->jumpAbsolute(temp);
|
||||
}
|
||||
return true;
|
||||
|
|
@ -678,7 +678,7 @@ bool ScriptInterpreter::execOpcode(byte opcode) {
|
|||
case opJge:
|
||||
temp = _runningFunction->readUint32();
|
||||
if (_cmpFlags >= 0) {
|
||||
debug(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
debugCN(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
_runningFunction->jumpAbsolute(temp);
|
||||
}
|
||||
return true;
|
||||
|
|
@ -686,7 +686,7 @@ bool ScriptInterpreter::execOpcode(byte opcode) {
|
|||
case opJz:
|
||||
temp = _runningFunction->readUint32();
|
||||
if (_cmpFlags == 0) {
|
||||
debug(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
debugCN(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
_runningFunction->jumpAbsolute(temp);
|
||||
}
|
||||
return true;
|
||||
|
|
@ -694,17 +694,17 @@ bool ScriptInterpreter::execOpcode(byte opcode) {
|
|||
case opJnz:
|
||||
temp = _runningFunction->readUint32();
|
||||
if (_cmpFlags != 0) {
|
||||
debug(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
debugCN(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
_runningFunction->jumpAbsolute(temp);
|
||||
}
|
||||
return true;
|
||||
|
||||
case opJmpByTable:
|
||||
temp = _runningFunction->readUint32();
|
||||
debug(kDebugScript, "-> index = %d\n", _registers[0].value);
|
||||
debugCN(kDebugScript, "-> index = %d\n", _registers[0].value);
|
||||
_runningFunction->jumpRelative(_registers[0].value * 4);
|
||||
temp = _runningFunction->readUint32();
|
||||
debug(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
debugCN(kDebugScript, "-> ofs = %08X\n", temp);
|
||||
_runningFunction->jumpAbsolute(temp);
|
||||
return true;
|
||||
|
||||
|
|
@ -716,8 +716,8 @@ bool ScriptInterpreter::execOpcode(byte opcode) {
|
|||
if (value1.type != kInteger || value2.type != kInteger)
|
||||
warning("ScriptInterpreter::execOpcode() Trying to compare non-integer values (%d, %d, line %d)", value1.type, value2.type, _lineNum);
|
||||
_cmpFlags = value1.value - value2.value;
|
||||
debug(kDebugScript, "-> cmp %d, %d\n", value1.value, value2.value);
|
||||
debug(kDebugScript, "-> _cmpFlags = %d\n", _cmpFlags);
|
||||
debugCN(kDebugScript, "-> cmp %d, %d\n", value1.value, value2.value);
|
||||
debugCN(kDebugScript, "-> _cmpFlags = %d\n", _cmpFlags);
|
||||
return true;
|
||||
|
||||
case opCall:
|
||||
|
|
@ -771,7 +771,7 @@ bool ScriptInterpreter::execOpcode(byte opcode) {
|
|||
return true;
|
||||
|
||||
default:
|
||||
debug(kDebugScript, "Invalid opcode %d!\n", opcode);
|
||||
debugCN(kDebugScript, "Invalid opcode %d!\n", opcode);
|
||||
return false;
|
||||
|
||||
}
|
||||
|
|
@ -920,14 +920,14 @@ int ScriptInterpreter::o1_wilburFinishedTalking() {
|
|||
int ScriptInterpreter::o1_preloadSound() {
|
||||
const char *name = STRING(0);
|
||||
int room = INTEGER(1);
|
||||
debug(kDebugScript, "name = %s; room = %d\n", name, room);
|
||||
debugCN(kDebugScript, "name = %s; room = %d\n", name, room);
|
||||
return 2;
|
||||
}
|
||||
|
||||
int ScriptInterpreter::o1_unloadSound() {
|
||||
const char *name = STRING(0);
|
||||
int room = INTEGER(1);
|
||||
debug(kDebugScript, "name = %s; room = %d\n", name, room);
|
||||
debugCN(kDebugScript, "name = %s; room = %d\n", name, room);
|
||||
return 2;
|
||||
}
|
||||
|
||||
|
|
@ -937,7 +937,7 @@ int ScriptInterpreter::o1_playSound() {
|
|||
int volume = INTEGER(2);
|
||||
int trigger = INTEGER(3);
|
||||
int room = INTEGER(4);
|
||||
debug(kDebugScript, "name = %s; channel = %d; volume = %d; trigger = %d; room = %d\n",
|
||||
debugCN(kDebugScript, "name = %s; channel = %d; volume = %d; trigger = %d; room = %d\n",
|
||||
name, channel, volume, trigger, room);
|
||||
|
||||
Common::String soundName = Common::String(name) + ".raw";
|
||||
|
|
@ -955,7 +955,7 @@ int ScriptInterpreter::o1_playLoopingSound() {
|
|||
int volume = INTEGER(2);
|
||||
int trigger = INTEGER(3);
|
||||
int room = INTEGER(4);
|
||||
debug(kDebugScript, "name = %s; channel = %d; volume = %d; trigger = %d; room = %d\n",
|
||||
debugCN(kDebugScript, "name = %s; channel = %d; volume = %d; trigger = %d; room = %d\n",
|
||||
name, channel, volume, trigger, room);
|
||||
|
||||
// HACK until fixed
|
||||
|
|
@ -966,14 +966,14 @@ int ScriptInterpreter::o1_playLoopingSound() {
|
|||
|
||||
int ScriptInterpreter::o1_stopSound() {
|
||||
int channel = INTEGER(0);
|
||||
debug(kDebugScript, "channel = %d\n", channel);
|
||||
debugCN(kDebugScript, "channel = %d\n", channel);
|
||||
return 1;
|
||||
}
|
||||
|
||||
int ScriptInterpreter::o1_fadeSetStart() {
|
||||
// skip arg 0: palette ptr
|
||||
int percent = INTEGER(1);
|
||||
debug(kDebugScript, "percent = %d\n", percent);
|
||||
debugCN(kDebugScript, "percent = %d\n", percent);
|
||||
return 2;
|
||||
}
|
||||
|
||||
|
|
@ -984,7 +984,7 @@ int ScriptInterpreter::o1_fadeInit() {
|
|||
int percent = INTEGER(3);
|
||||
int ticks = INTEGER(4);
|
||||
int trigger = INTEGER(5);
|
||||
debug(kDebugScript, "first = %d; last = %d; percent = %d; ticks = %d; trigger = %d\n",
|
||||
debugCN(kDebugScript, "first = %d; last = %d; percent = %d; ticks = %d; trigger = %d\n",
|
||||
first, last, percent, ticks, trigger);
|
||||
|
||||
// HACK until palette fading is implemented
|
||||
|
|
@ -1003,7 +1003,7 @@ int ScriptInterpreter::o1_initPaletteCycle() {
|
|||
int delay = INTEGER(2);
|
||||
int ticks = INTEGER(3);
|
||||
int trigger = INTEGER(4);
|
||||
debug(kDebugScript, "first = %d; last = %d; delay = %d; ticks = %d; trigger = %d\n",
|
||||
debugCN(kDebugScript, "first = %d; last = %d; delay = %d; ticks = %d; trigger = %d\n",
|
||||
first, last, delay, ticks, trigger);
|
||||
|
||||
// HACK until palette cycling is implemented
|
||||
|
|
@ -1020,11 +1020,11 @@ int ScriptInterpreter::o1_hasPlayerSaid() {
|
|||
const char *words[3];
|
||||
for (int i = 0; i < 3; i++)
|
||||
words[i] = STRING(i);
|
||||
debug(kDebugScript, "'%s', '%s', '%s'\n", words[0], words[1], words[2]);
|
||||
debugCN(kDebugScript, "'%s', '%s', '%s'\n", words[0], words[1], words[2]);
|
||||
|
||||
int result = _vm->_player->said(words[0], words[1], words[2]);
|
||||
|
||||
debug(kDebugScript, " -> '%d'\n", result);
|
||||
debugCN(kDebugScript, " -> '%d'\n", result);
|
||||
|
||||
RETURN(result);
|
||||
return 3;
|
||||
|
|
@ -1035,11 +1035,11 @@ int ScriptInterpreter::o1_hasPlayerSaidAny() {
|
|||
for (int i = 0; i < 10; i++)
|
||||
words[i] = STRING(i);
|
||||
|
||||
debug(kDebugScript, "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'\n",
|
||||
debugCN(kDebugScript, "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'\n",
|
||||
words[0], words[1], words[2], words[3], words[4], words[5], words[6], words[7], words[8], words[9]);
|
||||
|
||||
int result = _vm->_player->saidAny(words[0], words[1], words[2], words[3], words[4], words[5], words[6], words[7], words[8], words[9]);
|
||||
debug(kDebugScript, " -> '%d'\n", result);
|
||||
debugCN(kDebugScript, " -> '%d'\n", result);
|
||||
|
||||
RETURN(result);
|
||||
return 10;
|
||||
|
|
@ -1055,13 +1055,13 @@ int ScriptInterpreter::o1_playerHotspotWalkOverride() {
|
|||
int y1 = INTEGER(1);
|
||||
int x2 = INTEGER(2);
|
||||
int y2 = INTEGER(3);
|
||||
debug(kDebugScript, "(%d, %d); (%d, %d)\n", x1, y1, x2, y2);
|
||||
debugCN(kDebugScript, "(%d, %d); (%d, %d)\n", x1, y1, x2, y2);
|
||||
return 4;
|
||||
}
|
||||
|
||||
int ScriptInterpreter::o1_playerHasItem() {
|
||||
const char *name = STRING(0);
|
||||
debug(kDebugScript, "item = '%s'\n", name);
|
||||
debugCN(kDebugScript, "item = '%s'\n", name);
|
||||
// TODO
|
||||
RETURN(0);
|
||||
return 1;
|
||||
|
|
@ -1071,14 +1071,14 @@ int ScriptInterpreter::o1_setWalkerLocation() {
|
|||
// skip arg 0: walker
|
||||
int x = INTEGER(1);
|
||||
int y = INTEGER(2);
|
||||
debug(kDebugScript, "x = %d; y = %d\n", x, y);
|
||||
debugCN(kDebugScript, "x = %d; y = %d\n", x, y);
|
||||
return 3;
|
||||
}
|
||||
|
||||
int ScriptInterpreter::o1_setWalkerFacing() {
|
||||
// skip arg 0: walker
|
||||
int facing = INTEGER(1);
|
||||
debug(kDebugScript, "facing = %d\n", facing);
|
||||
debugCN(kDebugScript, "facing = %d\n", facing);
|
||||
return 2;
|
||||
}
|
||||
|
||||
|
|
@ -1086,7 +1086,7 @@ int ScriptInterpreter::o1_setHotspot() {
|
|||
// skip arg 0: hotspot list
|
||||
const char *name = STRING(1);
|
||||
int value = INTEGER(2);
|
||||
debug(kDebugScript, "name = '%s' -> %d\n", name, value);
|
||||
debugCN(kDebugScript, "name = '%s' -> %d\n", name, value);
|
||||
|
||||
_vm->_scene->getSceneResources().hotspots->setActive(name, (value != 0));
|
||||
|
||||
|
|
@ -1117,7 +1117,7 @@ int ScriptInterpreter::o1_playSeries() {
|
|||
int firstFrame = INTEGER(9);
|
||||
int lastFrame = INTEGER(10);
|
||||
|
||||
debug(kDebugScript, "name = %s; layer = %04X; flags = %08X; trigger = %d; frameRate = %d; loopCount = %d; scale = %d; x = %d; y = %d: firstFrame = %d; lastFrame = %d\n",
|
||||
debugCN(kDebugScript, "name = %s; layer = %04X; flags = %08X; trigger = %d; frameRate = %d; loopCount = %d; scale = %d; x = %d; y = %d: firstFrame = %d; lastFrame = %d\n",
|
||||
name, layer, flags, trigger, frameRate, loopCount, scale, x, y, firstFrame, lastFrame);
|
||||
|
||||
// TODO: Return the machine to the script
|
||||
|
|
@ -1137,7 +1137,7 @@ int ScriptInterpreter::o1_showSeries() {
|
|||
int x = INTEGER(7);
|
||||
int y = INTEGER(8);
|
||||
|
||||
debug(kDebugScript, "name = %s; layer = %04X; flags = %08X; trigger = %d; duration = %d; frameIndex = %d; scale = %d; x = %d; y = %d\n",
|
||||
debugCN(kDebugScript, "name = %s; layer = %04X; flags = %08X; trigger = %d; duration = %d; frameIndex = %d; scale = %d; x = %d; y = %d\n",
|
||||
name, layer, flags, trigger, duration, frameIndex, scale, x, y);
|
||||
|
||||
// TODO: Return the machine to the script
|
||||
|
|
@ -1151,7 +1151,7 @@ int ScriptInterpreter::o1_loadSeries() {
|
|||
int hash = INTEGER(1);
|
||||
// skip arg 3: palette ptr
|
||||
|
||||
debug(kDebugScript, "name = %s; hash = %d\n", name, hash);
|
||||
debugCN(kDebugScript, "name = %s; hash = %d\n", name, hash);
|
||||
|
||||
int result = _vm->_ws->loadSeries(name, hash, NULL);
|
||||
|
||||
|
|
@ -1182,7 +1182,7 @@ int ScriptInterpreter::o1_globalTriggerProc() {
|
|||
int value1 = INTEGER(0);
|
||||
int value2 = INTEGER(1);
|
||||
int value3 = INTEGER(2);
|
||||
debug(kDebugScript, "%d; %d; %d\n", value1, value2, value3);
|
||||
debugCN(kDebugScript, "%d; %d; %d\n", value1, value2, value3);
|
||||
return 3;
|
||||
}
|
||||
|
||||
|
|
@ -1190,13 +1190,13 @@ int ScriptInterpreter::o1_triggerTimerProc() {
|
|||
int value1 = INTEGER(0);
|
||||
int value2 = INTEGER(1);
|
||||
int value3 = INTEGER(2);
|
||||
debug(kDebugScript, "%d; %d; %d\n", value1, value2, value3);
|
||||
debugCN(kDebugScript, "%d; %d; %d\n", value1, value2, value3);
|
||||
return 3;
|
||||
}
|
||||
|
||||
int ScriptInterpreter::o1_dispatchTrigger() {
|
||||
int trigger = INTEGER(0);
|
||||
debug(kDebugScript, "trigger = %d\n", trigger);
|
||||
debugCN(kDebugScript, "trigger = %d\n", trigger);
|
||||
|
||||
_vm->_kernel->sendTrigger(trigger);
|
||||
//g_system->delayMillis(5000);
|
||||
|
|
@ -1222,7 +1222,7 @@ int ScriptInterpreter::o1_wilburSaid() {
|
|||
SaidArrayItem *item = saidArray[i];
|
||||
|
||||
if (_vm->_player->said("LOOK AT", item->itemName) && item->digiNameLook) {
|
||||
debug(kDebugScript, " -> LOOK AT: '%s'\n", item->digiNameLook);
|
||||
debugCN(kDebugScript, " -> LOOK AT: '%s'\n", item->digiNameLook);
|
||||
Common::String soundName = Common::String(item->digiNameLook) + ".raw";
|
||||
_vm->_sound->playVoice(soundName.c_str(), 100);
|
||||
result = 1;
|
||||
|
|
@ -1230,7 +1230,7 @@ int ScriptInterpreter::o1_wilburSaid() {
|
|||
}
|
||||
|
||||
if (_vm->_player->said("TAKE", item->itemName) && item->digiNameTake) {
|
||||
debug(kDebugScript, " -> TAKE: '%s'\n", item->digiNameTake);
|
||||
debugCN(kDebugScript, " -> TAKE: '%s'\n", item->digiNameTake);
|
||||
Common::String soundName = Common::String(item->digiNameTake) + ".raw";
|
||||
_vm->_sound->playVoice(soundName.c_str(), 100);
|
||||
result = 1;
|
||||
|
|
@ -1238,7 +1238,7 @@ int ScriptInterpreter::o1_wilburSaid() {
|
|||
}
|
||||
|
||||
if (_vm->_player->said("GEAR", item->itemName) && item->digiNameGear) {
|
||||
debug(kDebugScript, " -> GEAR: '%s'\n", item->digiNameGear);
|
||||
debugCN(kDebugScript, " -> GEAR: '%s'\n", item->digiNameGear);
|
||||
Common::String soundName = Common::String(item->digiNameGear) + ".raw";
|
||||
_vm->_sound->playVoice(soundName.c_str(), 100);
|
||||
result = 1;
|
||||
|
|
@ -1246,11 +1246,11 @@ int ScriptInterpreter::o1_wilburSaid() {
|
|||
}
|
||||
|
||||
/*
|
||||
debug(kDebugScript, "##### itemName = '%s'; digiNameLook = %s; digiNameTake = %s; digiNameGear = %s\n",
|
||||
debugCN(kDebugScript, "##### itemName = '%s'; digiNameLook = %s; digiNameTake = %s; digiNameGear = %s\n",
|
||||
item->itemName, item->digiNameLook, item->digiNameTake, item->digiNameGear);
|
||||
*/
|
||||
}
|
||||
debug(kDebugScript, " -> '%d'\n", result);
|
||||
debugCN(kDebugScript, " -> '%d'\n", result);
|
||||
|
||||
RETURN(result);
|
||||
return 1;
|
||||
|
|
@ -1270,7 +1270,7 @@ int ScriptInterpreter::o1_wilburSpeech() {
|
|||
int volume = INTEGER(4);
|
||||
int slot = INTEGER(5);
|
||||
|
||||
debug(kDebugScript, "%s; %d; %d; %d; %d; %d\n", name, trigger, room, flag, volume, slot);
|
||||
debugCN(kDebugScript, "%s; %d; %d; %d; %d; %d\n", name, trigger, room, flag, volume, slot);
|
||||
//g_system->delayMillis(5000);
|
||||
|
||||
KernelTriggerType oldTriggerMode = _vm->_kernel->triggerMode;
|
||||
|
|
@ -1288,14 +1288,14 @@ int ScriptInterpreter::o1_wilburSpeech() {
|
|||
|
||||
void ScriptInterpreter::getKernelVar(int index, ScriptValue &value) {
|
||||
|
||||
debug(kDebugScript, "ScriptInterpreter::getKernelVar() index = %d\n", index);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::getKernelVar() index = %d\n", index);
|
||||
|
||||
if (index > _kernelVarsMax) {
|
||||
debug(kDebugScript, "ScriptInterpreter::getKernelVar() Invalid kernel var index %d!\n", index);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::getKernelVar() Invalid kernel var index %d!\n", index);
|
||||
return;
|
||||
}
|
||||
|
||||
debug(kDebugScript, "ScriptInterpreter::getKernelVar() name = %s\n", _kernelVars[index].desc);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::getKernelVar() name = %s\n", _kernelVars[index].desc);
|
||||
|
||||
ScriptKernelVariable var = _kernelVars[index].var;
|
||||
|
||||
|
|
@ -1333,7 +1333,7 @@ void ScriptInterpreter::getKernelVar(int index, ScriptValue &value) {
|
|||
break;
|
||||
|
||||
default:
|
||||
debug(kDebugScript, "ScriptInterpreter::getKernelVar() Invalid kernel var %d!\n", var);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::getKernelVar() Invalid kernel var %d!\n", var);
|
||||
//g_system->delayMillis(2000);
|
||||
|
||||
}
|
||||
|
|
@ -1342,14 +1342,14 @@ void ScriptInterpreter::getKernelVar(int index, ScriptValue &value) {
|
|||
|
||||
void ScriptInterpreter::setKernelVar(int index, const ScriptValue &value) {
|
||||
|
||||
debug(kDebugScript, "ScriptInterpreter::setKernelVar() index = %d\n", index);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::setKernelVar() index = %d\n", index);
|
||||
|
||||
if (index > _kernelVarsMax) {
|
||||
debug(kDebugScript, "ScriptInterpreter::setKernelVar() Invalid kernel var index %d!\n", index);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::setKernelVar() Invalid kernel var index %d!\n", index);
|
||||
return;
|
||||
}
|
||||
|
||||
debug(kDebugScript, "ScriptInterpreter::setKernelVar() name = %s\n", _kernelVars[index].desc);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::setKernelVar() name = %s\n", _kernelVars[index].desc);
|
||||
|
||||
ScriptKernelVariable var = _kernelVars[index].var;
|
||||
|
||||
|
|
@ -1357,31 +1357,31 @@ void ScriptInterpreter::setKernelVar(int index, const ScriptValue &value) {
|
|||
|
||||
case kKernelTrigger:
|
||||
_vm->_kernel->trigger = toInteger(value);
|
||||
debug(kDebugScript, "kKernelTrigger -> %d\n", toInteger(value));
|
||||
debugCN(kDebugScript, "kKernelTrigger -> %d\n", toInteger(value));
|
||||
break;
|
||||
|
||||
case kKernelTriggerMode:
|
||||
_vm->_kernel->triggerMode = (KernelTriggerType)toInteger(value);
|
||||
debug(kDebugScript, "kKernelTrigger -> %d\n", toInteger(value));
|
||||
debugCN(kDebugScript, "kKernelTrigger -> %d\n", toInteger(value));
|
||||
break;
|
||||
|
||||
case kKernelContinueHandlingTrigger:
|
||||
_vm->_kernel->daemonTriggerAvailable = (toInteger(value) != 0);
|
||||
debug(kDebugScript, "kKernelContinueHandlingTrigger -> %d\n", toInteger(value));
|
||||
debugCN(kDebugScript, "kKernelContinueHandlingTrigger -> %d\n", toInteger(value));
|
||||
break;
|
||||
|
||||
case kGameNewRoom:
|
||||
_vm->_kernel->newRoom = toInteger(value);
|
||||
debug(kDebugScript, "kGameNewRoom -> %d\n", toInteger(value));
|
||||
debugCN(kDebugScript, "kGameNewRoom -> %d\n", toInteger(value));
|
||||
break;
|
||||
|
||||
case kPlayerCommandReady:
|
||||
// TODO
|
||||
debug(kDebugScript, "kPlayerCommandReady -> %d\n", toInteger(value));
|
||||
debugCN(kDebugScript, "kPlayerCommandReady -> %d\n", toInteger(value));
|
||||
break;
|
||||
|
||||
default:
|
||||
debug(kDebugScript, "ScriptInterpreter::setKernelVar() Invalid kernel var %d!\n", var);
|
||||
debugCN(kDebugScript, "ScriptInterpreter::setKernelVar() Invalid kernel var %d!\n", var);
|
||||
//g_system->delayMillis(2000);
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue