[Scummvm-git-logs] scummvm master -> f114527ccaf55158526c9fa67778e5f2a4d8d5a2

sev- sev at scummvm.org
Tue Aug 10 17:51:33 UTC 2021


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:
f114527cca SCI: Avoid global constructor


Commit: f114527ccaf55158526c9fa67778e5f2a4d8d5a2
    https://github.com/scummvm/scummvm/commit/f114527ccaf55158526c9fa67778e5f2a4d8d5a2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-10T19:51:14+02:00

Commit Message:
SCI: Avoid global constructor

Changed paths:
    engines/sci/engine/vm_hooks.cpp
    engines/sci/engine/vm_hooks.h


diff --git a/engines/sci/engine/vm_hooks.cpp b/engines/sci/engine/vm_hooks.cpp
index 7a6476c719..961e6c2912 100644
--- a/engines/sci/engine/vm_hooks.cpp
+++ b/engines/sci/engine/vm_hooks.cpp
@@ -191,12 +191,12 @@ void VmHooks::vm_hook_before_exec(Sci::EngineState *s) {
 		_lastPc = s->xs->addr.pc;
 		HookEntry entry = _hooksMap[key];
 		if (hook_exec_match(s, entry)) {
-			debugC(kDebugLevelPatcher, "vm_hook: patching script: %d, PC: %04x:%04x, obj: %s, selector: %s, extern: %d, opcode: %s", scriptNumber, PRINT_REG(s->xs->addr.pc), entry.objName, entry.selector.c_str(), entry.exportId, entry.opcodeName);
+			debugC(kDebugLevelPatcher, "vm_hook: patching script: %d, PC: %04x:%04x, obj: %s, selector: %s, extern: %d, opcode: %s", scriptNumber, PRINT_REG(s->xs->addr.pc), entry.objName, entry.selector, entry.exportId, entry.opcodeName);
 			Common::Array<byte> buffer(entry.patch, entry.patchSize);
 
 			_hookScriptData = buffer;
 		} else {
-			debugC(kDebugLevelPatcher, "vm_hook: failed to match! script: %d, PC: %04x:%04x, obj: %s, selector: %s, extern: %d, opcode: %s", scriptNumber, PRINT_REG(s->xs->addr.pc), entry.objName, entry.selector.c_str(), entry.exportId, entry.opcodeName);
+			debugC(kDebugLevelPatcher, "vm_hook: failed to match! script: %d, PC: %04x:%04x, obj: %s, selector: %s, extern: %d, opcode: %s", scriptNumber, PRINT_REG(s->xs->addr.pc), entry.objName, entry.selector, entry.exportId, entry.opcodeName);
 		}
 	}
 }
diff --git a/engines/sci/engine/vm_hooks.h b/engines/sci/engine/vm_hooks.h
index a9b367c7e2..ce60c28da6 100644
--- a/engines/sci/engine/vm_hooks.h
+++ b/engines/sci/engine/vm_hooks.h
@@ -49,7 +49,7 @@ struct HookHashKey {
 struct HookEntry {
 	/** These are used to make sure that the PC is indeed the requested place */
 	const char *objName;
-	Common::String selector;
+	const char *selector;
 	int exportId;
 	const char *opcodeName;
 




More information about the Scummvm-git-logs mailing list