[Scummvm-git-logs] scummvm master -> 34357fb3c04b9fa7b30829d94fde55a39aef5fb9
sev-
noreply at scummvm.org
Mon Mar 14 11:35:25 UTC 2022
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:
34357fb3c0 LINGO: Mimic memory pointers in object -> string conversion
Commit: 34357fb3c04b9fa7b30829d94fde55a39aef5fb9
https://github.com/scummvm/scummvm/commit/34357fb3c04b9fa7b30829d94fde55a39aef5fb9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-03-14T12:35:07+01:00
Commit Message:
LINGO: Mimic memory pointers in object -> string conversion
Changed paths:
engines/director/lingo/lingo.cpp
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 8d5255202ee..314a4add094 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -173,7 +173,7 @@ Lingo::Lingo(DirectorEngine *vm) : _vm(vm) {
_traceLoad = 0;
_updateMovieEnabled = false;
-
+
// events
_passEvent = false;
_perFrameHook = Datum();
@@ -841,7 +841,7 @@ Common::String Datum::asString(bool printonly) const {
if (!printonly) {
// Object names in Director are: "<Object:hex>"
// the starting '<' is important, it's used when comparing objects and integers
- s = Common::String::format("<Object:#%s", u.obj->getName().c_str());
+ s = Common::String::format("<Object:#%08x>", ((uint32)(intptr_t)((void *)u.obj)) & 0xffffffff);
} else {
s = u.obj->asString();
}
More information about the Scummvm-git-logs
mailing list