Merge upstream changes: output_console() takes printf-style arguments

This commit is contained in:
kichikuou
2020-05-21 23:24:54 +09:00
parent dadf0aa6b5
commit 406a7fe106
7 changed files with 110 additions and 495 deletions
-5
View File
@@ -315,9 +315,7 @@ void NACT::execute(T* impl)
}
}
#if defined(_DEBUG_CONSOLE)
output_console(string);
#endif
} else if((0x81 <= cmd && cmd <= 0x9f) || 0xe0 <= cmd) {
// message (2 bytes)
char string[3];
@@ -345,10 +343,7 @@ void NACT::execute(T* impl)
SDL_Delay(16);
}
}
#if defined(_DEBUG_CONSOLE)
output_console(string);
#endif
} else {
fatal("Unknown command %2x at %d", cmd, scenario_addr);
}