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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/nact_sys2.cpp
+36 -180
View File
@@ -70,11 +70,7 @@ void NACT_Sys2::cmd_calc()
}
var[index] = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\n!var[%d]:%d!", index, var[index]);
output_console(log);
#endif
output_console("\n!var[%d]:%d!", index, var[index]);
}
void NACT_Sys2::cmd_branch()
@@ -236,11 +232,7 @@ void NACT_Sys2::cmd_branch()
}
}
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\n{%d:", condition);
output_console(log);
#endif
output_console("\n{%d:", condition);
}
void NACT_Sys2::cmd_label_jump()
@@ -248,22 +240,14 @@ void NACT_Sys2::cmd_label_jump()
int next_addr = getw();
scenario_addr = next_addr;
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\n@%x:", next_addr);
output_console(log);
#endif
output_console("\n@%x:", next_addr);
}
void NACT_Sys2::cmd_label_call()
{
int next_addr = getw();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\n\\%x:", next_addr);
output_console(log);
#endif
output_console("\n\\%x:", next_addr);
if(next_addr == 0) {
// リターン
@@ -285,22 +269,14 @@ void NACT_Sys2::cmd_page_jump()
scenario_page = next_page;
scenario_addr = 2;
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\n&%d:", next_page);
output_console(log);
#endif
output_console("\n&%d:", next_page);
}
void NACT_Sys2::cmd_page_call()
{
int next_page = cali(), next_addr;
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\n%%%d:", next_page);
output_console(log);
#endif
output_console("\n%%%d:", next_page);
if(next_page == 0) {
// リターン
@@ -327,11 +303,7 @@ void NACT_Sys2::cmd_set_menu()
ags->menu_dest_y += ags->menu_font_size + 2;
ags->draw_menu = false;
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "$");
output_console(log);
#endif
output_console("$");
} else {
if(!menu_index) {
ags->clear_menu_window();
@@ -342,21 +314,13 @@ void NACT_Sys2::cmd_set_menu()
ags->menu_dest_y += 2;
ags->draw_menu = true;
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\n$%x,", menu_addr[menu_index - 1]);
output_console(log);
#endif
output_console("\n$%x,", menu_addr[menu_index - 1]);
}
}
void NACT_Sys2::cmd_open_menu()
{
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\n]");
output_console(log);
#endif
output_console("\n]");
if(!menu_index) {
scenario_addr = scenario_data[0] | (scenario_data[1] << 8);
@@ -468,11 +432,7 @@ void NACT_Sys2::cmd_set_verbobj()
menu_obj[menu_index++] = obj;
verb_obj = true;
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\n[%x,%s,%s:", addr, caption_verb[verb], caption_obj[obj]);
output_console(log);
#endif
output_console("\n[%x,%s,%s:", addr, caption_verb[verb], caption_obj[obj]);
}
void NACT_Sys2::cmd_set_verbobj2()
@@ -489,21 +449,13 @@ void NACT_Sys2::cmd_set_verbobj2()
}
verb_obj = true;
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\n:%d,%x,%s,%s:", condition, addr, caption_verb[verb], caption_obj[obj]);
output_console(log);
#endif
output_console("\n:%d,%x,%s,%s:", condition, addr, caption_verb[verb], caption_obj[obj]);
}
void NACT_Sys2::cmd_open_verb()
{
// 動詞メニューの表示
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nopen verb-obj menu");
output_console(log);
#endif
output_console("\nopen verb-obj menu");
verb_obj = false;
// 表示する動詞のチェック
@@ -773,11 +725,7 @@ void NACT_Sys2::cmd_open_obj(int verb)
void NACT_Sys2::cmd_a()
{
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "A\n");
output_console(log);
#endif
output_console("A\n");
if(!text_skip_enb) {
// Pushマークの表示
@@ -821,11 +769,7 @@ void NACT_Sys2::cmd_b()
int p4 = cali();
int p5 = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nB %d,%d,%d,%d,%d,%d,%d:", cmd, index, p1, p2, p3, p4, p5);
output_console(log);
#endif
output_console("\nB %d,%d,%d,%d,%d,%d,%d:", cmd, index, p1, p2, p3, p4, p5);
if(cmd == 1) {
ags->menu_w[index - 1].sx = p1 * 8;
@@ -889,11 +833,7 @@ void NACT_Sys2::cmd_d()
int p7 = cali();
int p8 = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nD %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
output_console(log);
#endif
output_console("\nD %d,%d,%d,%d,%d,%d,%d,%d:", p1, p2, p3, p4, p5, p6, p7, p8);
}
void NACT_Sys2::cmd_e()
@@ -902,20 +842,12 @@ void NACT_Sys2::cmd_e()
int p2 = cali();
int p3 = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nE %d,%d,%d:", p1, p2, p3);
output_console(log);
#endif
output_console("\nE %d,%d,%d:", p1, p2, p3);
}
void NACT_Sys2::cmd_f()
{
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nF");
output_console(log);
#endif
output_console("\nF");
scenario_addr = 2;
}
@@ -924,11 +856,7 @@ void NACT_Sys2::cmd_g()
{
int page = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nG %d:", page);
output_console(log);
#endif
output_console("\nG %d:", page);
if(crc32 == CRC32_SDPS_TONO || crc32 == CRC32_SDPS_KAIZOKU) {
if(20 <= page && page <= 100) {
@@ -943,11 +871,7 @@ void NACT_Sys2::cmd_h()
int length = getd();
int val = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nH %d,%d:", length, val);
output_console(log);
#endif
output_console("\nH %d,%d:", length, val);
// 8桁の文字列を生成
char tmp[8];
@@ -989,11 +913,7 @@ void NACT_Sys2::cmd_i()
int p2 = cali();
int p3 = getd();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nI %d,%d,%d:", p1, p2, p3);
output_console(log);
#endif
output_console("\nI %d,%d,%d:", p1, p2, p3);
}
void NACT_Sys2::cmd_j()
@@ -1001,11 +921,7 @@ void NACT_Sys2::cmd_j()
int p1 = cali();
int p2 = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nJ %d,%d:", p1, p2);
output_console(log);
#endif
output_console("\nJ %d,%d:", p1, p2);
}
void NACT_Sys2::cmd_k()
@@ -1018,11 +934,7 @@ void NACT_Sys2::cmd_l()
{
int index = getd();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nL %d:", index);
output_console(log);
#endif
output_console("\nL %d:", index);
if(1 <= index && index <= 26) {
// ASLEEP_A.DAT - ASLEEP_Z.DAT
@@ -1136,11 +1048,7 @@ void NACT_Sys2::cmd_m()
}
string[p] = '\0';
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nM %s:", string);
output_console(log);
#endif
output_console("\nM %s:", string);
if(1 <= tvar_index && tvar_index <= 10) {
memcpy(tvar[tvar_index - 1], string, 22);
@@ -1152,11 +1060,7 @@ void NACT_Sys2::cmd_n()
int p1 = cali();
int p2 = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nN %d,%d:", p1, p2);
output_console(log);
#endif
output_console("\nN %d,%d:", p1, p2);
}
void NACT_Sys2::cmd_o()
@@ -1165,11 +1069,7 @@ void NACT_Sys2::cmd_o()
int width = cali();
int height = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nO %d,%d,%d:", st, width, height);
output_console(log);
#endif
output_console("\nO %d,%d,%d:", st, width, height);
// white mesh
int sx = (st % 80) * 8;
@@ -1183,11 +1083,7 @@ void NACT_Sys2::cmd_p()
ags->text_font_color = (uint8)((param & 0x7) + 16);
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nP %d:", param);
output_console(log);
#endif
output_console("\nP %d:", param);
}
#define FWRITE(data, size) { \
@@ -1214,11 +1110,7 @@ void NACT_Sys2::cmd_q()
int index = getd();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nQ %d:", index);
output_console(log);
#endif
output_console("\nQ %d:", index);
if(1 <= index && index <= 26) {
// ASLEEP_A.DAT - ASLEEP_Z.DAT
@@ -1295,11 +1187,7 @@ void NACT_Sys2::cmd_q()
void NACT_Sys2::cmd_r()
{
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "R\n");
output_console(log);
#endif
output_console("R\n");
// ウィンドウの表示範囲外の場合は改ページ
if(ags->return_text_line(text_window)) {
@@ -1311,11 +1199,7 @@ void NACT_Sys2::cmd_s()
{
int page = getd();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nS %d:", page);
output_console(log);
#endif
output_console("\nS %d:", page);
if(page) {
mako->play_music(page);
@@ -1330,11 +1214,7 @@ void NACT_Sys2::cmd_t()
int p2 = cali();
int p3 = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nT %d,%d,%d:", p1, p2, p3);
output_console(log);
#endif
output_console("\nT %d,%d,%d:", p1, p2, p3);
}
void NACT_Sys2::cmd_u()
@@ -1342,11 +1222,7 @@ void NACT_Sys2::cmd_u()
int page = getd();
int transparent = getd();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nU %d,%d:", page, transparent);
output_console(log);
#endif
output_console("\nU %d,%d:", page, transparent);
ags->load_cg(page, transparent);
}
@@ -1356,11 +1232,7 @@ void NACT_Sys2::cmd_v()
int p1 = cali();
int p2 = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nV %d,%d:", p1, p2);
output_console(log);
#endif
output_console("\nV %d,%d:", p1, p2);
}
void NACT_Sys2::cmd_w()
@@ -1370,22 +1242,14 @@ void NACT_Sys2::cmd_w()
int p3 = cali();
int p4 = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nW %d,%d,%d,%d:", p1, p2, p3, p4);
output_console(log);
#endif
output_console("\nW %d,%d,%d,%d:", p1, p2, p3, p4);
}
void NACT_Sys2::cmd_x()
{
int index = getd();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nX %d:", index);
output_console(log);
#endif
output_console("\nX %d:", index);
if(1 <= index && index <= 10) {
ags->draw_text(tvar[index - 1]);
@@ -1397,11 +1261,7 @@ void NACT_Sys2::cmd_y()
int cmd = cali();
int param = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nY %d,%d:", cmd, param);
output_console(log);
#endif
output_console("\nY %d,%d:", cmd, param);
switch(cmd) {
case 1:
@@ -1560,11 +1420,7 @@ void NACT_Sys2::cmd_z()
int cmd = cali();
int param = cali();
#if defined(_DEBUG_CONSOLE)
char log[128];
sprintf_s(log, 128, "\nZ %d,%d:", cmd, param);
output_console(log);
#endif
output_console("\nZ %d,%d:", cmd, param);
// Z1
// Z2