fixed disable acts (#390)
This commit is contained in:
parent
89fa4fbe5b
commit
52e4bac21a
|
@ -938,7 +938,7 @@ static void level_cmd_place_object_ext(void) {
|
|||
return;
|
||||
}
|
||||
|
||||
if (sCurrAreaIndex != -1 && ((CMD_GET(u8, 2) & val7) || CMD_GET(u8, 2) == 0x1F)) {
|
||||
if (sCurrAreaIndex != -1 && (gLevelValues.disableActs || (CMD_GET(u8, 2) & val7) || CMD_GET(u8, 2) == 0x1F)) {
|
||||
u16 model = CMD_GET(u8, 3);
|
||||
if (model >= MAX_LOADED_GRAPH_NODES) { model = MODEL_NONE; }
|
||||
spawnInfo = alloc_only_pool_alloc(sLevelPool, sizeof(struct SpawnInfo));
|
||||
|
@ -1010,7 +1010,7 @@ static void level_cmd_place_object_ext2(void) {
|
|||
return;
|
||||
}
|
||||
|
||||
if (sCurrAreaIndex != -1 && ((CMD_GET(u8, 2) & val7) || CMD_GET(u8, 2) == 0x1F)) {
|
||||
if (sCurrAreaIndex != -1 && (gLevelValues.disableActs || (CMD_GET(u8, 2) & val7) || CMD_GET(u8, 2) == 0x1F)) {
|
||||
spawnInfo = alloc_only_pool_alloc(sLevelPool, sizeof(struct SpawnInfo));
|
||||
|
||||
spawnInfo->startPos[0] = CMD_GET(s16, 4);
|
||||
|
|
|
@ -1874,6 +1874,10 @@ s32 lvl_set_current_level(UNUSED s16 arg0, s32 levelNum) {
|
|||
return hookUseActSelect;
|
||||
}
|
||||
|
||||
if (gLevelValues.disableActs) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (gCurrCourseNum > COURSE_STAGES_MAX || warpCheckpointActive) {
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue