mirror of
https://github.com/zeldaret/tp
synced 2026-07-08 22:44:44 -04:00
some J3D/misc cleanup (#2628)
* some j3d cleanup * begin using uintptr_t * j3dgraphbase cleanup * j3dgraphanimator cleanup
This commit is contained in:
@@ -216,12 +216,12 @@ void Z2SceneMgr::setSceneName(char* spotName, s32 room, s32 layer) {
|
||||
}
|
||||
|
||||
if (spotName != NULL) {
|
||||
for (spot = 0; spot < (int)ARRAY_SIZE(sSpotName); spot++) {
|
||||
for (spot = 0; spot < ARRAY_SIZE(sSpotName); spot++) {
|
||||
if (!strcmp(spotName, sSpotName[spot])) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (spot == (int)ARRAY_SIZE(sSpotName)) {
|
||||
if (spot == ARRAY_SIZE(sSpotName)) {
|
||||
spot = SPOT_NONE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -694,7 +694,7 @@ bool Z2SeMgr::seStartLevel(JAISoundID i_soundID, Vec const* i_pos, u32 param_2,
|
||||
Z2GetAudience()->calcOffMicSound(i_volume);
|
||||
}
|
||||
|
||||
(*handle)->setUserData((u32)i_pos);
|
||||
(*handle)->setUserData((uintptr_t)i_pos);
|
||||
|
||||
if (ret) {
|
||||
(*handle)->setLifeTime(1, false);
|
||||
|
||||
@@ -340,7 +340,7 @@ void Z2SoundObjMgr::setGhostEnemyState(u8 p1) {
|
||||
* getEnemyID__13Z2SoundObjMgrFPCcP26JSULink<15Z2CreatureEnemy> */
|
||||
u8 Z2SoundObjMgr::getEnemyID(char const* param_0, JSULink<Z2CreatureEnemy>* param_1) {
|
||||
if (param_0 != NULL) {
|
||||
for (u8 uVar2 = 0; uVar2 < ARRAY_SIZE(mEnemyInfo); uVar2++) {
|
||||
for (u8 uVar2 = 0; uVar2 < ARRAY_SIZEU(mEnemyInfo); uVar2++) {
|
||||
if (strcmp(param_0, mEnemyInfo[(u32)uVar2].mName) == 0) {
|
||||
append(param_1);
|
||||
return uVar2;
|
||||
|
||||
Reference in New Issue
Block a user