[Scummvm-git-logs] scummvm master -> 908f638d85f0acf9ea4a4879e81d2ce98eaa2527

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
908f638d85 SCUMM: DEBUGGER: Add OBIM and OBCD offsets to `objects` command


Commit: 908f638d85f0acf9ea4a4879e81d2ce98eaa2527
    https://github.com/scummvm/scummvm/commit/908f638d85f0acf9ea4a4879e81d2ce98eaa2527
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-09-29T02:24:10+03:00

Commit Message:
SCUMM: DEBUGGER: Add OBIM and OBCD offsets to `objects` command

Changed paths:
    engines/scumm/debugger.cpp


diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index 0d1f386ef81..bb42c414bad 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -947,9 +947,9 @@ bool ScummDebugger::Cmd_PrintObjects(int argc, const char **argv) {
 	int i;
 	ObjectData *o;
 	debugPrintf("Objects in current room\n");
-	debugPrintf("+-----------------------------------------------------------+\n");
-	debugPrintf("|num |    name    |  x |  y |width|height|state|fl|   cls   |\n");
-	debugPrintf("+----+------------+----+----+-----+------+-----+--+---------+\n");
+	debugPrintf("+-------------------------------------------------------------------------------+\n");
+	debugPrintf("|num |    name    |  x |  y |width|height|state|fl|   cls   | obimoff | obcdoff |\n");
+	debugPrintf("+----+------------+----+----+-----+------+-----+--+---------+---------+---------+\n");
 
 	for (i = 1; i < _vm->_numLocalObjects; i++) {
 		o = &(_vm->_objs[i]);
@@ -959,9 +959,9 @@ bool ScummDebugger::Cmd_PrintObjects(int argc, const char **argv) {
 		const byte *name = _vm->getObjOrActorName(o->obj_nr);
 		if (!name)
 			name = (const byte *)"(null)";
-		debugPrintf("|%4d|%-12.12s|%4d|%4d|%5d|%6d|%5d|%2d|$%08x|\n",
+		debugPrintf("|%4d|%-12.12s|%4d|%4d|%5d|%6d|%5d|%2d|$%08x|$%08x|$%08x|\n",
 				o->obj_nr, name, o->x_pos, o->y_pos, o->width, o->height, o->state,
-				o->fl_object_index, classData);
+				o->fl_object_index, classData, o->OBIMoffset, o->OBCDoffset);
 	}
 	debugPrintf("\n");