From feb8677f93ef60565eb2d5a91c86eb5a5b8cf830 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Tue, 18 Oct 2022 21:38:45 -0400 Subject: [PATCH] Link SPositionHistory Former-commit-id: 45baefd6086aab035c5935752843209fd3995614 --- configure.py | 2 +- include/rstl/reserved_vector.hpp | 5 ++--- obj_files.mk | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.py b/configure.py index 3e78930d..c5977292 100755 --- a/configure.py +++ b/configure.py @@ -388,7 +388,7 @@ LIBS = [ "MetroidPrime/ScriptObjects/CScriptProjectedShadow", "MetroidPrime/ScriptObjects/CEnergyBall", "MetroidPrime/Enemies/CMetroidPrimeProjectile", - "MetroidPrime/Enemies/SPositionHistory", + ["MetroidPrime/Enemies/SPositionHistory", True], ], }, { diff --git a/include/rstl/reserved_vector.hpp b/include/rstl/reserved_vector.hpp index 73ce84fc..5f1f3bad 100644 --- a/include/rstl/reserved_vector.hpp +++ b/include/rstl/reserved_vector.hpp @@ -42,10 +42,9 @@ public: } ~reserved_vector() { clear(); } - + void push_back(const T& in) { - iterator out = begin() + x0_count; - out = in; + construct(&data()[x0_count], in); ++x0_count; } diff --git a/obj_files.mk b/obj_files.mk index 688ea041..fc852406 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -355,7 +355,7 @@ METROIDPRIME :=\ $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.o\ $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CEnergyBall.o\ $(BUILD_DIR)/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.o\ - $(BUILD_DIR)/asm/MetroidPrime/Enemies/SPositionHistory.o\ + $(BUILD_DIR)/src/MetroidPrime/Enemies/SPositionHistory.o\ WORLDFORMAT :=\ $(BUILD_DIR)/asm/WorldFormat/CAreaOctTree_Tests.o\