From afd800afc0bad0dd034eb732354ed25c81621d2e Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Sat, 25 May 2024 16:31:32 -0600 Subject: Fixed possible conflicts with LUS --- src/factories/sm64/LevelScriptFactory.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/factories/sm64/LevelScriptFactory.cpp') diff --git a/src/factories/sm64/LevelScriptFactory.cpp b/src/factories/sm64/LevelScriptFactory.cpp index 013feb6..dc5e68e 100644 --- a/src/factories/sm64/LevelScriptFactory.cpp +++ b/src/factories/sm64/LevelScriptFactory.cpp @@ -126,7 +126,7 @@ ExportResult SM64::LevelScriptBinaryExporter::Export(std::ostream &write, std::s auto writer = LUS::BinaryWriter(); const auto commands = std::static_pointer_cast(raw)->mCommands; - WriteHeader(writer, LUS::ResourceType::LevelScript, 0); + WriteHeader(writer, Torch::ResourceType::LevelScript, 0); writer.Write((uint32_t)commands.size()); @@ -240,7 +240,7 @@ std::optional> SM64::LevelScriptFactory::parse(std: cmd += 0x4 << CMD_SIZE_SHIFT; break; } - case LevelOpcode::SLEEP: + case LevelOpcode::SLEEP: case LevelOpcode::SLEEP_BEFORE_EXIT: { auto frames = cur_level_cmd_s16(0x02); arguments.emplace_back(frames); @@ -310,8 +310,8 @@ std::optional> SM64::LevelScriptFactory::parse(std: break; } case LevelOpcode::SKIP: - case LevelOpcode::SKIP_NOP: { - cmd += 0x4 << CMD_SIZE_SHIFT; + case LevelOpcode::SKIP_NOP: { + cmd += 0x4 << CMD_SIZE_SHIFT; break; } case LevelOpcode::CALL: -- cgit v1.2.3