diff options
| -rw-r--r-- | engines/parallaction/animation.cpp | 6 | ||||
| -rw-r--r-- | engines/parallaction/parallaction.cpp | 17 |
2 files changed, 13 insertions, 10 deletions
diff --git a/engines/parallaction/animation.cpp b/engines/parallaction/animation.cpp index 40fb4bbaf7..9c2e15dc2c 100644 --- a/engines/parallaction/animation.cpp +++ b/engines/parallaction/animation.cpp @@ -226,7 +226,7 @@ void jobDisplayAnimations(void *parm, Job *j) { void jobEraseAnimations(void *arg_0, Job *j) { - debugC(3, kDebugLocation, "jobEraseAnimations"); + debugC(3, kDebugJobs, "jobEraseAnimations"); Animation *a = (Animation*)_animations._next; @@ -522,7 +522,7 @@ LValue getLValue(Instruction *inst, char *str, LocalVariable *locals, Animation void jobRunScripts(void *parm, Job *j) { - debugC(3, kDebugLocation, "jobRunScripts"); + debugC(3, kDebugJobs, "jobRunScripts"); static uint16 modCounter = 0; @@ -541,7 +541,7 @@ void jobRunScripts(void *parm, Job *j) { while ((inst->_index != INST_SHOW) && (a->_zone._flags & kFlagsActing)) { -// printf("Animation: %s, instruction: %s\n", a->_zone._name, inst->_index == INST_END ? "end" : _instructionNames[inst->_index - 1]); + debugC(1, kDebugJobs, "Animation: %s, instruction: %s", a->_zone._label._text, inst->_index == INST_END ? "end" : _instructionNames[inst->_index - 1]); switch (inst->_index) { case INST_ENDLOOP: // endloop diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 5c925e70a1..a26bb8778f 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -185,6 +185,9 @@ Parallaction::Parallaction(OSystem *syst) : Common::addSpecialDebugLevel(kDebugDisk, "disk", "Disk debug level"); Common::addSpecialDebugLevel(kDebugWalk, "walk", "Walk debug level"); Common::addSpecialDebugLevel(kDebugGraphics, "gfx", "Gfx debug level"); + Common::addSpecialDebugLevel(kDebugJobs, "jobs", "Jobs debug level"); + Common::addSpecialDebugLevel(kDebugInput, "input", "Input debug level"); + } @@ -486,7 +489,7 @@ void Parallaction::processInput(InputData *data) { switch (data->_event) { case kEvEnterZone: - debugC(2, kDebugLocation, "processInput: kEvEnterZone"); + debugC(2, kDebugInput, "processInput: kEvEnterZone"); _graphics->_labelPosition[1]._x = -1000; _graphics->_labelPosition[1]._y = -1000; _graphics->_labelPosition[0]._x = -1000; @@ -496,14 +499,14 @@ void Parallaction::processInput(InputData *data) { break; case kEvExitZone: - debugC(2, kDebugLocation, "processInput: kEvExitZone"); + debugC(2, kDebugInput, "processInput: kEvExitZone"); removeJob(_jDrawLabel); addJob(&jobWaitRemoveJob, _jEraseLabel, kPriority15); _jDrawLabel = NULL; break; case kEvAction: - debugC(2, kDebugLocation, "processInput: kEvAction"); + debugC(2, kDebugInput, "processInput: kEvAction"); _procCurrentHoverItem = -1; _hoverZone = NULL; pauseJobs(); @@ -547,7 +550,7 @@ void Parallaction::processInput(InputData *data) { break; case kEvWalk: - debugC(2, kDebugLocation, "processInput: kEvWalk"); + debugC(2, kDebugInput, "processInput: kEvWalk"); _hoverZone = NULL; changeCursor(kCursorArrow); if (_yourself._zone._flags & kFlagsRemove) break; @@ -772,7 +775,7 @@ void Parallaction::changeCursor(int32 index) { if (index == kCursorArrow) { // standard mouse pointer - debugC(1, kDebugLocation, "changeCursor(%i), label: %p", index, (const void*)_jDrawLabel); + debugC(1, kDebugInput, "changeCursor(%i), label: %p", index, (const void*)_jDrawLabel); if (_jDrawLabel != NULL) { removeJob(_jDrawLabel); @@ -965,7 +968,7 @@ void runJobs() { Job *j = (Job*)_jobs._node._next; while (j) { - debugC(3, kDebugLocation, "runJobs: %i", j->_tag); + debugC(3, kDebugJobs, "runJobs: %i", j->_tag); (*j->_fn)(j->_parm, j); Job *v4 = (Job*)j->_node._next; @@ -987,7 +990,7 @@ void jobWaitRemoveJob(void *parm, Job *j) { static uint16 count = 0; - debugC(3, kDebugLocation, "jobWaitRemoveJob: count = %i", count); + debugC(3, kDebugJobs, "jobWaitRemoveJob: count = %i", count); _engineFlags |= kEngineMouse; |