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

Use rstl::find

This commit is contained in:
Henrique Gemignani Passos Lima 2022-11-04 00:12:10 +02:00
parent 7f414d1d5e
commit 6c4971ec76
No known key found for this signature in database
GPG Key ID: E224F951761145F8
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/rstl/reserved_vector.hpp
View File

@ -81,13 +81,6 @@ public:
--x0_count; --x0_count;
} }
} }
iterator find(const T& value) {
rstl::reserved_vector< TUniqueId, 8 >::iterator it = begin();
for (; it != end() && *it != value; ++it) {
}
return it;
}
}; };
} // namespace rstl } // namespace rstl

6
src/MetroidPrime/ScriptObjects/CScriptPlayerHint.cpp
View File

@ -5,6 +5,8 @@
#include "MetroidPrime/Enemies/CMetroidPrimeRelay.hpp" #include "MetroidPrime/Enemies/CMetroidPrimeRelay.hpp"
#include "MetroidPrime/Player/CPlayer.hpp" #include "MetroidPrime/Player/CPlayer.hpp"
#include "rstl/algorithm.hpp"
CScriptPlayerHint::CScriptPlayerHint(TUniqueId uid, const rstl::string& name, CScriptPlayerHint::CScriptPlayerHint(TUniqueId uid, const rstl::string& name,
const CEntityInfo& info, const CTransform4f& xf, bool active, const CEntityInfo& info, const CTransform4f& xf, bool active,
int priority, int overrideFlags) int priority, int overrideFlags)
@ -18,7 +20,7 @@ CScriptPlayerHint::CScriptPlayerHint(TUniqueId uid, const rstl::string& name,
void CScriptPlayerHint::ClearObjectList() { xe8_objectList.clear(); } void CScriptPlayerHint::ClearObjectList() { xe8_objectList.clear(); }
void CScriptPlayerHint::AddToObjectList(TUniqueId uid) { void CScriptPlayerHint::AddToObjectList(TUniqueId uid) {
rstl::reserved_vector< TUniqueId, 8 >::iterator it = xe8_objectList.find(uid); rstl::reserved_vector< TUniqueId, 8 >::iterator it = rstl::find(xe8_objectList.begin(), xe8_objectList.end(), uid);
if (it != xe8_objectList.end()) { if (it != xe8_objectList.end()) {
return; return;
} }
@ -30,7 +32,7 @@ void CScriptPlayerHint::RemoveFromObjectList(TUniqueId uid, CStateManager& mgr)
return; return;
} }
rstl::reserved_vector< TUniqueId, 8 >::iterator it = xe8_objectList.find(uid); rstl::reserved_vector< TUniqueId, 8 >::iterator it = rstl::find(xe8_objectList.begin(), xe8_objectList.end(), uid);
if (it == xe8_objectList.end()) { if (it == xe8_objectList.end()) {
xe8_objectList.erase(xe8_objectList.begin()); xe8_objectList.erase(xe8_objectList.begin());