2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 03:47:43 +00:00

CActorContraption fixes, better CMake dependency handling

This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions

View File

@@ -37,7 +37,7 @@ CPlayerVisor::~CPlayerVisor() {
}
int CPlayerVisor::FindEmptyInactiveScanTarget() const {
for (int i = 0; i < x13c_scanTargets.size(); ++i) {
for (size_t i = 0; i < x13c_scanTargets.size(); ++i) {
const SScanTarget& tgt = x13c_scanTargets[i];
if (tgt.x4_timer == 0.f)
return i;
@@ -46,7 +46,7 @@ int CPlayerVisor::FindEmptyInactiveScanTarget() const {
}
int CPlayerVisor::FindCachedInactiveScanTarget(TUniqueId uid) const {
for (int i = 0; i < x13c_scanTargets.size(); ++i) {
for (size_t i = 0; i < x13c_scanTargets.size(); ++i) {
const SScanTarget& tgt = x13c_scanTargets[i];
if (tgt.x0_objId == uid && tgt.x4_timer > 0.f)
return i;