From 1609c491a512f6a0453a302a216ed772e1ef790a Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Wed, 16 Nov 2022 12:06:16 -0800 Subject: [PATCH] Fix build Former-commit-id: c2e248776844a75259ac66e95339f0f51a569b1d --- configure.py | 4 ++-- include/MetroidPrime/TGameTypes.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.py b/configure.py index 163e14e5..d6602157 100755 --- a/configure.py +++ b/configure.py @@ -87,7 +87,7 @@ LIBS = [ "MetroidPrime/Tweaks/CTweakPlayerGun", "MetroidPrime/CPauseScreen", "MetroidPrime/Tweaks/CTweakGui", - "MetroidPrime/ScriptObjects/CScriptActor", + ["MetroidPrime/ScriptObjects/CScriptActor", False], ["MetroidPrime/ScriptObjects/CScriptTrigger", False], ["MetroidPrime/ScriptObjects/CScriptWaypoint", True], "MetroidPrime/Enemies/CPatterned", @@ -100,7 +100,7 @@ LIBS = [ ["MetroidPrime/Tweaks/CTweakBall", True], ["MetroidPrime/Player/CPlayerState", False], ["MetroidPrime/ScriptObjects/CScriptTimer", True], - "MetroidPrime/Cameras/CCinematicCamera", + ["MetroidPrime/Cameras/CCinematicCamera", False], "MetroidPrime/CAutoMapper", ["MetroidPrime/ScriptObjects/CScriptCounter", True], "MetroidPrime/CMapWorld", diff --git a/include/MetroidPrime/TGameTypes.hpp b/include/MetroidPrime/TGameTypes.hpp index d9947714..08aead19 100644 --- a/include/MetroidPrime/TGameTypes.hpp +++ b/include/MetroidPrime/TGameTypes.hpp @@ -46,7 +46,7 @@ CHECK_SIZEOF(TEditorId, 0x4) struct TUniqueId { ushort value; - TUniqueId(const TUniqueId& other) : value(other.value) {} + //TUniqueId(const TUniqueId& other) : value(other.value) {} TUniqueId(ushort version, ushort id) : value(((version & 0x3F) << 10) | (id & 0x3FF)) {} ushort Value() const { return value & 0x3FF; }