PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Link SPositionHistory

This commit is contained in:
Luke Street 2022-10-18 21:38:45 -04:00
parent fc60e9b7c4
commit 45baefd608
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -388,7 +388,7 @@ LIBS = [
"MetroidPrime/ScriptObjects/CScriptProjectedShadow", "MetroidPrime/ScriptObjects/CScriptProjectedShadow",
"MetroidPrime/ScriptObjects/CEnergyBall", "MetroidPrime/ScriptObjects/CEnergyBall",
"MetroidPrime/Enemies/CMetroidPrimeProjectile", "MetroidPrime/Enemies/CMetroidPrimeProjectile",
"MetroidPrime/Enemies/SPositionHistory", ["MetroidPrime/Enemies/SPositionHistory", True],
], ],
}, },
{ {

3
include/rstl/reserved_vector.hpp
View File

@ -44,8 +44,7 @@ public:
~reserved_vector() { clear(); } ~reserved_vector() { clear(); }
void push_back(const T& in) { void push_back(const T& in) {
iterator out = begin() + x0_count; construct(&data()[x0_count], in);
out = in;
++x0_count; ++x0_count;
} }

2
obj_files.mk
View File

@ -355,7 +355,7 @@ METROIDPRIME :=\
$(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.o\ $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.o\
$(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CEnergyBall.o\ $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CEnergyBall.o\
$(BUILD_DIR)/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.o\ $(BUILD_DIR)/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.o\
$(BUILD_DIR)/asm/MetroidPrime/Enemies/SPositionHistory.o\ $(BUILD_DIR)/src/MetroidPrime/Enemies/SPositionHistory.o\
WORLDFORMAT :=\ WORLDFORMAT :=\
$(BUILD_DIR)/asm/WorldFormat/CAreaOctTree_Tests.o\ $(BUILD_DIR)/asm/WorldFormat/CAreaOctTree_Tests.o\