Max/kichikuou_system3-sdl2
1
0
Fork 0
mirror of https://github.com/kichikuou/system3-sdl2.git synced 2026-09-28 18:08:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream changes: Improve error messages for unknown commands

Browse Source 
Unlike the upstream, we use fatal() because it generates a message box
even if DEBUG_CONSOLE is disabled.
This commit is contained in:
kichikuou
2020-05-22 09:32:04 +09:00
parent 406a7fe106
commit 131707f9d8
5 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/nact_sys2.cpp
+7 -1
View File
@@ -80,7 +80,9 @@ void NACT_Sys2::cmd_branch()
bool set_menu = false;
if(!condition) {
// 次の'}'命令までスキップする（ネストも考慮する）
for(;;) {
prev_addr = scenario_addr;
uint8 cmd = getd();
if(cmd == '!') {
@@ -226,7 +228,11 @@ void NACT_Sys2::cmd_branch()
// message (2 bytes)
getd();
} else {
fatal("cmd_branch: invalid command %2x", cmd);
if(cmd >= 0x20 && cmd < 0x7f) {
fatal("Unknown Command: '%c' at page = %d, addr = %d", cmd, scenario_page, prev_addr);
} else {
fatal("Unknown Command: %02x at page = %d, addr = %d", cmd, scenario_page, prev_addr);
}
break;
}
}