PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-07-07 17:55:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Phillip Stephens 2022-11-16 12:06:16 -08:00
parent 11f243614b
commit c2e2487768
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.py
View File

@ -87,7 +87,7 @@ LIBS = [
"MetroidPrime/Tweaks/CTweakPlayerGun", "MetroidPrime/Tweaks/CTweakPlayerGun",
"MetroidPrime/CPauseScreen", "MetroidPrime/CPauseScreen",
"MetroidPrime/Tweaks/CTweakGui", "MetroidPrime/Tweaks/CTweakGui",
"MetroidPrime/ScriptObjects/CScriptActor", ["MetroidPrime/ScriptObjects/CScriptActor", False],
["MetroidPrime/ScriptObjects/CScriptTrigger", False], ["MetroidPrime/ScriptObjects/CScriptTrigger", False],
["MetroidPrime/ScriptObjects/CScriptWaypoint", True], ["MetroidPrime/ScriptObjects/CScriptWaypoint", True],
"MetroidPrime/Enemies/CPatterned", "MetroidPrime/Enemies/CPatterned",
@ -100,7 +100,7 @@ LIBS = [
["MetroidPrime/Tweaks/CTweakBall", True], ["MetroidPrime/Tweaks/CTweakBall", True],
["MetroidPrime/Player/CPlayerState", False], ["MetroidPrime/Player/CPlayerState", False],
["MetroidPrime/ScriptObjects/CScriptTimer", True], ["MetroidPrime/ScriptObjects/CScriptTimer", True],
"MetroidPrime/Cameras/CCinematicCamera", ["MetroidPrime/Cameras/CCinematicCamera", False],
"MetroidPrime/CAutoMapper", "MetroidPrime/CAutoMapper",
["MetroidPrime/ScriptObjects/CScriptCounter", True], ["MetroidPrime/ScriptObjects/CScriptCounter", True],
"MetroidPrime/CMapWorld", "MetroidPrime/CMapWorld",

2
include/MetroidPrime/TGameTypes.hpp
View File

@ -46,7 +46,7 @@ CHECK_SIZEOF(TEditorId, 0x4)
struct TUniqueId { struct TUniqueId {
ushort value; 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)) {} TUniqueId(ushort version, ushort id) : value(((version & 0x3F) << 10) | (id & 0x3FF)) {}
ushort Value() const { return value & 0x3FF; } ushort Value() const { return value & 0x3FF; }