summaryrefslogtreecommitdiff
path: root/ZAPD/ZCutscene.cpp
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2021-04-01 19:04:43 -0300
committerGitHub <noreply@github.com>2021-04-01 18:04:43 -0400
commit7a35712e998448324da955bac203040d6361991e (patch)
tree728d24859acf52b7afdad26c4b3761db1a42b308 /ZAPD/ZCutscene.cpp
parentca4458d0ca12134df8c8c92ebbcd22c0f7c21a71 (diff)
Unmangle backtrace (#100)
* its kinda functional Signed-off-by: angie <angheloalf95@gmail.com> * Looks nicer now Signed-off-by: angie <angheloalf95@gmail.com> * cleanup the makefile Signed-off-by: angie <angheloalf95@gmail.com> * Fix small issues with error handling Signed-off-by: angie <angheloalf95@gmail.com> * fix order of dependencies of main.cpp in makefile Signed-off-by: Angie <angheloalf95@gmail.com> * Add varname to the intersection warning Signed-off-by: angie <angheloalf95@gmail.com> * run clang-format Signed-off-by: angie <angheloalf95@gmail.com> * Don't print the backtrace two times Signed-off-by: angie <angheloalf95@gmail.com>
Diffstat (limited to 'ZAPD/ZCutscene.cpp')
-rw-r--r--ZAPD/ZCutscene.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ZAPD/ZCutscene.cpp b/ZAPD/ZCutscene.cpp
index f84be29..5537c88 100644
--- a/ZAPD/ZCutscene.cpp
+++ b/ZAPD/ZCutscene.cpp
@@ -356,7 +356,7 @@ CutsceneCommands ZCutscene::GetCommandFromID(int id)
return CutsceneCommands::Unknown;
}
- printf("WARNING: Could not identify cutscene command ID 0x%04X\n", id);
+ fprintf(stderr, "WARNING: Could not identify cutscene command ID 0x%04X\n", id);
return CutsceneCommands::Error;
}
@@ -1106,7 +1106,7 @@ string CutsceneCommandSpecialAction::GenerateSourceCode(const std::string& roomN
{
result += StringHelper::Sprintf(
"\t\tCS_MISC(0x%04X, %i, %i, 0x%04X, 0x%04X, 0x%04X, %i, %i, %i, %i, %i, %i, %i, "
- "%i),\n",
+ "%i),\n",
entries[i]->base, entries[i]->startFrame, entries[i]->endFrame, entries[i]->unused0,
entries[i]->unused1, entries[i]->unused2, entries[i]->unused3, entries[i]->unused4,
entries[i]->unused5, entries[i]->unused6, entries[i]->unused7, entries[i]->unused8,