aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'scumm')
-rw-r--r--scumm/resource.cpp2
-rw-r--r--scumm/script_v8.cpp6
-rw-r--r--scumm/scummvm.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index e2d4d77692..5a07623173 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -524,7 +524,7 @@ int Scumm::loadResource(int type, int idx)
uint32 fileOffs;
uint32 size, tag;
- debug(1, "loadResource(%s,%d)", resTypeFromId(type),idx);
+ debug(2, "loadResource(%s,%d)", resTypeFromId(type),idx);
if (type == rtCharset && (_features & GF_SMALL_HEADER)) {
loadCharset(idx);
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index c7431db15f..7eb7a3bfde 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1138,10 +1138,10 @@ void Scumm_v8::o8_cameraOps()
byte subOp = fetchScriptByte();
switch (subOp) {
case 0x32: // SO_CAMERA_PAUSE
- warning("freezeCamera NYI");
+ //warning("freezeCamera NYI");
break;
case 0x33: // SO_CAMERA_RESUME
- warning("unfreezeCamera NYI");
+ //warning("unfreezeCamera NYI");
break;
default:
error("o8_cameraOps: default case %d", subOp);
@@ -1301,7 +1301,7 @@ void Scumm_v8::o6_kernelSetFunctions()
switch (args[0]) {
case 11: // lockObject
- warning("o6_kernelSetFunctions: lockObject(%d)", args[1]);
+// warning("o6_kernelSetFunctions: lockObject(%d)", args[1]);
lock(rtFlObject, args[1]); // FIXME - no idea if this is right?
// getObjectIndex(args[1]);
// if (ObjData.field28 != 0) {
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index f54c42ad07..42239973f4 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1247,7 +1247,7 @@ Actor *Scumm::derefActor(int id)
Actor *Scumm::derefActorSafe(int id, const char *errmsg)
{
if (id < 1 || id >= NUM_ACTORS) {
- if (_debugMode)
+ if (_debugLevel > 1)
warning
("Invalid actor %d in %s (script %d, opcode 0x%x) - This is potentially a BIG problem.",
id, errmsg, vm.slot[_curExecScript].number, _opcode);