aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Snover2017-05-24 22:41:32 -0500
committerColin Snover2017-05-27 23:36:11 -0500
commitf9403468120e065fc569b28d9b6a460ac0706213 (patch)
tree6cf5a88dcfd043aac1fa844185fbe38c966b79c1
parentccf5665fac6fe24510c17bcd492a5dcbe2c3d6d6 (diff)
downloadscummvm-rg350-f9403468120e065fc569b28d9b6a460ac0706213.tar.gz
scummvm-rg350-f9403468120e065fc569b28d9b6a460ac0706213.tar.bz2
scummvm-rg350-f9403468120e065fc569b28d9b6a460ac0706213.zip
SCI32: Minor cleanup to plane debug information
-rw-r--r--engines/sci/graphics/plane32.cpp5
-rw-r--r--engines/sci/graphics/screen_item32.cpp11
2 files changed, 11 insertions, 5 deletions
diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp
index a8724dee67..0a69ab2a98 100644
--- a/engines/sci/graphics/plane32.cpp
+++ b/engines/sci/graphics/plane32.cpp
@@ -149,8 +149,7 @@ void Plane::convertGameRectToPlaneRect() {
}
void Plane::printDebugInfo(Console *con) const {
- Common::String name;
-
+ const char *name;
if (_object.isNumber()) {
name = "-scummvm-";
} else {
@@ -159,7 +158,7 @@ void Plane::printDebugInfo(Console *con) const {
con->debugPrintf("%04x:%04x (%s): type %d, prio %d, ins %u, pic %d, mirror %d, back %d\n",
PRINT_REG(_object),
- name.c_str(),
+ name,
_type,
_priority,
_creationId,
diff --git a/engines/sci/graphics/screen_item32.cpp b/engines/sci/graphics/screen_item32.cpp
index d184485aa6..7b7553189a 100644
--- a/engines/sci/graphics/screen_item32.cpp
+++ b/engines/sci/graphics/screen_item32.cpp
@@ -499,9 +499,16 @@ CelObj &ScreenItem::getCelObj() const {
}
void ScreenItem::printDebugInfo(Console *con) const {
+ const char *name;
+ if (_object.isNumber()) {
+ name = "-scummvm-";
+ } else {
+ name = g_sci->getEngineState()->_segMan->getObjectName(_object);
+ }
+
con->debugPrintf("%04x:%04x (%s), prio %d, ins %u, x %d, y %d, z: %d, scaledX: %d, scaledY: %d flags: %d\n",
- _object.getSegment(), _object.getOffset(),
- g_sci->getEngineState()->_segMan->getObjectName(_object),
+ PRINT_REG(_object),
+ name,
_priority,
_creationId,
_position.x,