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

Replace NACT::fatal() with global sys_error()

Browse Source
This commit is contained in:
kichikuou
2024-12-10 07:54:56 +09:00
parent 5483d1932f
commit e79f24d8b9
10 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/nact_sys1.cpp
+18 -18
View File
@@ -222,9 +222,9 @@ void NACT_Sys1::cmd_branch()
sco.ungetd();
sco.skip(encoding->mblen(sco.ptr()));
} else if (cmd >= 0x20 && cmd < 0x7f) {
fatal("Unknown Command: '%c' at page = %d, addr = %d", cmd, sco.page(), prev_addr);
sys_error("Unknown Command: '%c' at page = %d, addr = %d", cmd, sco.page(), prev_addr);
} else {
fatal("Unknown Command: %02x at page = %d, addr = %d", cmd, sco.page(), prev_addr);
sys_error("Unknown Command: %02x at page = %d, addr = %d", cmd, sco.page(), prev_addr);
}
}
}
@@ -605,19 +605,19 @@ void NACT_Sys1::cmd_a()
void NACT_Sys1::cmd_b()
{
// 未使用
fatal("Unknown Command: 'B' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'B' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_d()
{
// 未使用
fatal("Unknown Command: 'D' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'D' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_e()
{
// 未使用
fatal("Unknown Command: 'E' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'E' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_f()
@@ -655,25 +655,25 @@ void NACT_Sys1::cmd_g()
void NACT_Sys1::cmd_h()
{
// 未使用
fatal("Unknown Command: 'H' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'H' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_i()
{
// 未使用
fatal("Unknown Command: 'I' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'I' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_j()
{
// 未使用
fatal("Unknown Command: 'J' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'J' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_k()
{
// 未使用
fatal("Unknown Command: 'K' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'K' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_l()
@@ -777,19 +777,19 @@ void NACT_Sys1::cmd_l()
void NACT_Sys1::cmd_m()
{
// 未使用
fatal("Unknown Command: 'M' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'M' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_n()
{
// 未使用
fatal("Unknown Command: 'N' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'N' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_o()
{
// 未使用
fatal("Unknown Command: 'O' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'O' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_p()
@@ -925,7 +925,7 @@ void NACT_Sys1::cmd_s()
void NACT_Sys1::cmd_t()
{
// 未使用
fatal("Unknown Command: 'T' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'T' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_u()
@@ -949,13 +949,13 @@ void NACT_Sys1::cmd_u()
void NACT_Sys1::cmd_v()
{
// 未使用
fatal("Unknown Command: 'V' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'V' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_w()
{
// 未使用
fatal("Unknown Command: 'W' at page = %d, addr = %d", sco.page(), prev_addr);
sys_error("Unknown Command: 'W' at page = %d, addr = %d", sco.page(), prev_addr);
}
void NACT_Sys1::cmd_x()
@@ -1353,7 +1353,7 @@ uint16 NACT_Sys1::cali()
}
}
if (!ok) {
fatal("cali: invalid expression at %d:%04x", sco.page(), sco.addr());
sys_error("cali: invalid expression at %d:%04x", sco.page(), sco.addr());
}
return (uint16)(cali[1] & 0xffff);
}
@@ -1368,10 +1368,10 @@ uint16 NACT_Sys1::cali2()
} else if(0xc0 <= dat && dat <= 0xff) {
val = ((dat & 0x3f) << 8) | sco.getd();
} else {
fatal("cali2: invalid expression at %d:%04x", sco.page(), sco.addr());
sys_error("cali2: invalid expression at %d:%04x", sco.page(), sco.addr());
}
if (sco.getd() != 0x7f) {
fatal("cali2: invalid expression at %d:%04x", sco.page(), sco.addr());
sys_error("cali2: invalid expression at %d:%04x", sco.page(), sco.addr());
}
return val;
}