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

Add scenario address to cali parse error messages

Browse Source
This commit is contained in:
kichikuou
2024-12-03 11:08:51 +09:00
parent f28612bd44
commit 8eaaec8e16
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/nact_sys1.cpp
+3 -3
View File
@@ -1362,7 +1362,7 @@ uint16 NACT_Sys1::cali()
}
}
if (!ok) {
fatal("cali: invalid expression");
fatal("cali: invalid expression at %d:%04x", scenario_page, scenario_addr);
}
return (uint16)(cali[1] & 0xffff);
}
@@ -1377,10 +1377,10 @@ uint16 NACT_Sys1::cali2()
} else if(0xc0 <= dat && dat <= 0xff) {
val = ((dat & 0x3f) << 8) | getd();
} else {
fatal("cali2: invalid expression");
fatal("cali2: invalid expression at %d:%04x", scenario_page, scenario_addr);
}
if(getd() != 0x7f) {
fatal("cali2: invalid expression");
fatal("cali2: invalid expression at %d:%04x", scenario_page, scenario_addr);
}
return val;
}
src/sys/nact_sys2.cpp
+3 -3
View File
@@ -1342,7 +1342,7 @@ uint16 NACT_Sys2::cali()
}
}
if (!ok) {
fatal("cali: invalid expression");
fatal("cali: invalid expression at %d:%04x", scenario_page, scenario_addr);
}
return (uint16)(cali[1] & 0xffff);
}
@@ -1357,10 +1357,10 @@ uint16 NACT_Sys2::cali2()
} else if(0xc0 <= dat && dat <= 0xff) {
val = ((dat & 0x3f) << 8) | getd();
} else {
fatal("cali2: invalid expression");
fatal("cali2: invalid expression at %d:%04x", scenario_page, scenario_addr);
}
if(getd() != 0x7f) {
fatal("cali2: invalid expression");
fatal("cali2: invalid expression at %d:%04x", scenario_page, scenario_addr);
}
return val;
}
src/sys/nact_sys3.cpp
+3 -3
View File
@@ -1501,7 +1501,7 @@ uint16 NACT_Sys3::cali()
}
}
if (!ok) {
fatal("cali: invalid expression");
fatal("cali: invalid expression at %d:%04x", scenario_page, scenario_addr);
}
return (uint16)(cali[1] & 0xffff);
}
@@ -1516,10 +1516,10 @@ uint16 NACT_Sys3::cali2()
} else if(0xc0 <= dat && dat <= 0xff) {
val = ((dat & 0x3f) << 8) | getd();
} else {
fatal("cali2: invalid expression");
fatal("cali2: invalid expression at %d:%04x", scenario_page, scenario_addr);
}
if(getd() != 0x7f) {
fatal("cali2: invalid expression");
fatal("cali2: invalid expression at %d:%04x", scenario_page, scenario_addr);
}
return val;
}