mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-29 21:02:18 -05:00
Code Issues Projects Releases Wiki Activity

Fix killer door textures (#1177)

Browse Source 
* Fix killer door textures

* Remove todo as requested by @Rozelette
This commit is contained in:
vaguerant 2022-10-21 15:28:40 +11:00 committed by GitHub
parent 5d29c4755e
commit 76942aeaee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
View File

@ -103,12 +103,32 @@ void DoorKiller_Init(Actor* thisx, GlobalContext* globalCtx2) {
s32 bankIndex; s32 bankIndex;
s32 i; s32 i;
/*
// Look in the object bank for one of the four objects containing door textures // Look in the object bank for one of the four objects containing door textures
bankIndex = -1; bankIndex = -1;
for (i = 0; bankIndex < 0; i++) { for (i = 0; bankIndex < 0; i++) {
bankIndex = Object_GetIndex(&globalCtx->objectCtx, sDoorTextures[i].objectId); bankIndex = Object_GetIndex(&globalCtx->objectCtx, sDoorTextures[i].objectId);
this->textureEntryIndex = i; this->textureEntryIndex = i;
} }
*/
// For SoH where all objects are loaded, hardcode the index to match the current map.
switch (globalCtx->sceneNum) {
case SCENE_HIDAN:
this->textureEntryIndex = 0;
break;
case SCENE_MIZUSIN:
this->textureEntryIndex = 1;
break;
case SCENE_HAKADAN:
case SCENE_HAKADANCH:
this->textureEntryIndex = 2;
break;
default:
this->textureEntryIndex = 3;
}
bankIndex = Object_GetIndex(&globalCtx->objectCtx, sDoorTextures[this->textureEntryIndex].objectId);
osSyncPrintf("bank_ID = %d\n", bankIndex); osSyncPrintf("bank_ID = %d\n", bankIndex);
osSyncPrintf("status = %d\n", this->textureEntryIndex); osSyncPrintf("status = %d\n", this->textureEntryIndex);
this->doorObjBankIndex = bankIndex; this->doorObjBankIndex = bankIndex;