ihateninjas/OdysseyDecomp
1
0
Fork 0
mirror of https://github.com/MonsterDruide1/OdysseyDecomp synced 2026-04-23 09:04:21 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

all: Deprecate use of 'e' in vectors and resolve sign warnings (#998)

Browse source
This commit is contained in:
Narr the Reg 2026-03-22 04:14:33 -06:00 committed by GitHub
parent 7917987136
commit 8e45397ae7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/al/Library/Area/AreaShape.cpp
View file

@ -32,7 +32,7 @@ bool AreaShape::calcLocalPos(sead::Vector3f* localPos, const sead::Vector3f& tra
if (mBaseMtxPtr)
calcMtxLocalTrans(localPos, *mBaseMtxPtr, trans);
else
localPos->e = trans.e;
localPos->set(trans);
f32 localX = localPos->x;
localPos->x = localX / mScale.x;
@ -86,7 +86,7 @@ void AreaShape::calcTrans(sead::Vector3f* trans) const {
if (mBaseMtxPtr)
mBaseMtxPtr->getTranslation(*trans);
else
trans->e = sead::Vector3f::zero.e;
trans->set(sead::Vector3f::zero);
}
template <typename T>

16
src/System/BossSaveData.cpp
View file

@ -14,12 +14,12 @@ BossSaveData::BossSaveData() {
}
void BossSaveData::init() {
for (s32 i = 0; i < sBossBattleStartWorldNum; i++) {
for (s32 i = 0; i < (s32)sBossBattleStartWorldNum; i++) {
mIsShowDemoBossBattleStartLv1[i] = false;
mIsShowDemoBossBattleStartLv2[i] = false;
}
for (s32 i = 0; i < sDeadGKNum; i++) {
for (s32 i = 0; i < (s32)sDeadGKNum; i++) {
mIsAlreadyDeadGKLv1[i] = false;
mIsAlreadyDeadGKLv2[i] = false;
mIsAlreadyDeadGKLv3[i] = false;
@ -80,7 +80,7 @@ void BossSaveData::saveDemoBattleEndKoopaLv2() {
}
void BossSaveData::resetLv3Data() {
for (s32 i = 0; i < sDeadGKNum; i++)
for (s32 i = 0; i < (s32)sDeadGKNum; i++)
mIsAlreadyDeadGKLv3[i] = false;
}
@ -88,17 +88,17 @@ void BossSaveData::write(al::ByamlWriter* writer) {
writer->pushHash("BossSaveData");
writer->pushArray("IsShowDemoBossBattleStartLv1");
for (s32 i = 0; i < sBossBattleStartWorldNum; i++)
for (s32 i = 0; i < (s32)sBossBattleStartWorldNum; i++)
writer->addBool(mIsShowDemoBossBattleStartLv1[i]);
writer->pop();
writer->pushArray("IsShowDemoBossBattleStartLv2");
for (s32 i = 0; i < sBossBattleStartWorldNum; i++)
for (s32 i = 0; i < (s32)sBossBattleStartWorldNum; i++)
writer->addBool(mIsShowDemoBossBattleStartLv2[i]);
writer->pop();
writer->pushArray("IsAlreadyDeadGK");
for (s32 i = 0; i < sDeadGKNum; i++) {
for (s32 i = 0; i < (s32)sDeadGKNum; i++) {
writer->addBool(mIsAlreadyDeadGKLv1[i]);
writer->addBool(mIsAlreadyDeadGKLv2[i]);
}
@ -122,7 +122,7 @@ void BossSaveData::read(const al::ByamlIter& save) {
al::ByamlIter lv2Iter{};
bossIter.tryGetIterByKey(&lv2Iter, "IsShowDemoBossBattleStartLv2");
for (s32 i = 0; i < sBossBattleStartWorldNum; i++) {
for (s32 i = 0; i < (s32)sBossBattleStartWorldNum; i++) {
lv1Iter.tryGetBoolByIndex(&mIsShowDemoBossBattleStartLv1[i], i);
lv2Iter.tryGetBoolByIndex(&mIsShowDemoBossBattleStartLv2[i], i);
}
@ -130,7 +130,7 @@ void BossSaveData::read(const al::ByamlIter& save) {
al::ByamlIter gkIter{};
bossIter.tryGetIterByKey(&gkIter, "IsAlreadyDeadGK");
for (s32 i = 0; i < sDeadGKNum; i++) {
for (s32 i = 0; i < (s32)sDeadGKNum; i++) {
gkIter.tryGetBoolByIndex(&mIsAlreadyDeadGKLv1[i], i * 2 + 0);
gkIter.tryGetBoolByIndex(&mIsAlreadyDeadGKLv2[i], i * 2 + 1);
}