diff --git a/include/z64scene.h b/include/z64scene.h index 600819540..7d4744bd6 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -556,10 +556,8 @@ typedef enum SceneDrawConfig { /* 50 */ SDC_FISHING_POND, /* 51 */ SDC_GANONS_TOWER_COLLAPSE_INTERIOR, /* 52 */ SDC_INSIDE_GANONS_CASTLE_COLLAPSE, -#if ENABLE_ANIMATED_MATERIALS /* 53 */ SDC_MAT_ANIM, /* 54 */ SDC_MAT_ANIM_MANUAL_STEP, -#endif /* 55 */ SDC_MAX } SceneDrawConfig; @@ -612,9 +610,7 @@ typedef enum SceneCommandTypeID { #if ENABLE_F3DEX3 SCENE_CMD_ID_OCC_PLANE_CAND_LIST, #endif -#if ENABLE_ANIMATED_MATERIALS SCENE_CMD_ID_ANIMATED_MATERIAL_LIST, -#endif /* 0x1A */ SCENE_CMD_ID_MAX } SceneCommandTypeID; @@ -702,10 +698,8 @@ typedef enum SceneCommandTypeID { { SCENE_CMD_ID_OCC_PLANE_CAND_LIST, numPlanes, CMD_PTR(planeList) } #endif -#if ENABLE_ANIMATED_MATERIALS #define SCENE_CMD_ANIMATED_MATERIAL_LIST(matAnimList) \ { SCENE_CMD_ID_ANIMATED_MATERIAL_LIST, 0, CMD_PTR(matAnimList) } -#endif s32 Scene_ExecuteCommands(struct PlayState* play, SceneCmd* sceneCmd); diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 0c8c3b4fe..151d2e220 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -527,13 +527,11 @@ void Scene_SetTransitionForNextEntrance(PlayState* play) { play->transitionType = ENTRANCE_INFO_START_TRANS_TYPE(gEntranceTable[entranceIndex].field); } -#if ENABLE_ANIMATED_MATERIALS - void Scene_CommandAnimatedMaterials(PlayState* play, SceneCmd* cmd) { +#if ENABLE_ANIMATED_MATERIALS play->sceneMaterialAnims = SEGMENTED_TO_VIRTUAL(cmd->textureAnimations.segment); -} - #endif +} SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX] = { Scene_CommandPlayerEntryList, // SCENE_CMD_ID_SPAWN_LIST @@ -565,9 +563,7 @@ SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX] = { #if ENABLE_F3DEX3 Scene_CommandOccPlaneCandList, // SCENE_CMD_ID_OCC_PLANE_CAND_LIST #endif -#if ENABLE_ANIMATED_MATERIALS Scene_CommandAnimatedMaterials, // SCENE_CMD_ID_ANIMATED_MATERIAL_LIST -#endif }; RomFile sNaviQuestHintFiles[] = { diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 1d1ce3aab..c616926c0 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -86,10 +86,8 @@ void Scene_DrawConfigFishingPond(PlayState* play); void Scene_DrawConfigGanonsTowerCollapseInterior(PlayState* play); void Scene_DrawConfigInsideGanonsCastleCollapse(PlayState* play); -#if ENABLE_ANIMATED_MATERIALS void Scene_DrawConfigMatAnim(PlayState* play); void Scene_DrawConfigMatAnimManualStep(PlayState* play); -#endif // Entrance Table definition #define DEFINE_ENTRANCE(_0, sceneId, spawn, continueBgm, displayTitleCard, endTransType, startTransType) \ @@ -198,10 +196,8 @@ SceneDrawConfigFunc sSceneDrawConfigs[SDC_MAX] = { Scene_DrawConfigFishingPond, // SDC_FISHING_POND Scene_DrawConfigGanonsTowerCollapseInterior, // SDC_GANONS_TOWER_COLLAPSE_INTERIOR Scene_DrawConfigInsideGanonsCastleCollapse, // SDC_INSIDE_GANONS_CASTLE_COLLAPSE -#if ENABLE_ANIMATED_MATERIALS - Scene_DrawConfigMatAnim, // SDC_MAT_ANIM - Scene_DrawConfigMatAnimManualStep, // SDC_MAT_ANIM_MANUAL_STEP -#endif + Scene_DrawConfigMatAnim, // SDC_MAT_ANIM + Scene_DrawConfigMatAnimManualStep, // SDC_MAT_ANIM_MANUAL_STEP }; #if PLATFORM_N64 // Scene_Draw is at end of file in GC/iQue versions @@ -1713,13 +1709,15 @@ void Scene_DrawConfigBesitu(PlayState* play) { CLOSE_DISPS(play->state.gfxCtx, "../z_scene_table.c", 7910); } -#if ENABLE_ANIMATED_MATERIALS - /** * Allows the usage of the animated material system in scenes. */ void Scene_DrawConfigMatAnim(PlayState* play) { +#if ENABLE_ANIMATED_MATERIALS AnimatedMat_Draw(play, play->sceneMaterialAnims); +#else + Scene_DrawConfigDefault(play); +#endif } /** @@ -1727,10 +1725,12 @@ void Scene_DrawConfigMatAnim(PlayState* play) { * rather than always animating like `Scene_DrawConfigMatAnim`. */ void Scene_DrawConfigMatAnimManualStep(PlayState* play) { +#if ENABLE_ANIMATED_MATERIALS AnimatedMat_DrawStep(play, play->sceneMaterialAnims, play->roomCtx.drawParams[0]); -} - +#else + Scene_DrawConfigDefault(play); #endif +} #if !PLATFORM_N64 // Scene_Draw is at beginning of file in N64 versions