From 406a7fe106ef64fda0b1f20370c7b8bedd782331 Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Thu, 21 May 2020 23:24:54 +0900
Subject: [PATCH] Merge upstream changes: output_console() takes printf-style
 arguments

---
 src/linux/nact_linux.cpp |   8 +-
 src/sys/nact.cpp         |   5 -
 src/sys/nact.h           |   2 +-
 src/sys/nact_sys1.cpp    | 144 +++++--------------------
 src/sys/nact_sys2.cpp    | 216 +++++++------------------------------
 src/sys/nact_sys3.cpp    | 222 +++++++--------------------------------
 src/win/nact_win.cpp     |   8 +-
 7 files changed, 110 insertions(+), 495 deletions(-)

diff --git a/src/linux/nact_linux.cpp b/src/linux/nact_linux.cpp
index 56c2b22..9367d02 100644
--- a/src/linux/nact_linux.cpp
+++ b/src/linux/nact_linux.cpp
@@ -35,9 +35,13 @@ void NACT::release_console()
 {
 }
 
-void NACT::output_console(char log[])
+void NACT::output_console(const char *format, ...)
 {
 #if defined(_DEBUG_CONSOLE)
-	fputs(log, stderr);
+	va_list ap;
+
+	va_start(ap, format);
+	vfprintf(stdout, format, ap);
+	va_end(ap);
 #endif
 }
diff --git a/src/sys/nact.cpp b/src/sys/nact.cpp
index c08ca75..2675169 100644
--- a/src/sys/nact.cpp
+++ b/src/sys/nact.cpp
@@ -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);
 			}
diff --git a/src/sys/nact.h b/src/sys/nact.h
index af478c9..aa92a35 100644
--- a/src/sys/nact.h
+++ b/src/sys/nact.h
@@ -206,7 +206,7 @@ public:
 	int tvar_index, tvar_maxlen;
 
 	// デバッグログ
-	void output_console(char log[]);
+	void output_console(const char *format, ...);
 
 	int get_scenario_page() const { return scenario_page; }
 
diff --git a/src/sys/nact_sys1.cpp b/src/sys/nact_sys1.cpp
index 80720cb..34766cd 100644
--- a/src/sys/nact_sys1.cpp
+++ b/src/sys/nact_sys1.cpp
@@ -117,11 +117,7 @@ void NACT_Sys1::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_Sys1::cmd_branch()
@@ -219,11 +215,7 @@ void NACT_Sys1::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_Sys1::cmd_label_jump()
@@ -231,22 +223,14 @@ void NACT_Sys1::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_Sys1::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) {
 		// リターン
@@ -268,22 +252,14 @@ void NACT_Sys1::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_Sys1::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) {
 		// リターン
@@ -310,11 +286,7 @@ void NACT_Sys1::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();
@@ -325,21 +297,13 @@ void NACT_Sys1::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_Sys1::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);
@@ -455,11 +419,7 @@ void NACT_Sys1::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_Sys1::cmd_set_verbobj2()
@@ -476,21 +436,13 @@ void NACT_Sys1::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_Sys1::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;
 
 	// 表示する動詞のチェック
@@ -841,11 +793,7 @@ top2:
 
 void NACT_Sys1::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マークの表示
@@ -899,11 +847,7 @@ void NACT_Sys1::cmd_e()
 
 void NACT_Sys1::cmd_f()
 {
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nF");
-	output_console(log);
-#endif
+	output_console("\nF");
 
 	scenario_addr = 2;
 }
@@ -912,11 +856,7 @@ void NACT_Sys1::cmd_g()
 {
 	int page = getd();
 
-#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_INTRUDER) {
 		page = (page == 97) ? 96 : (page == 98) ? 97 : page;
@@ -958,11 +898,7 @@ void NACT_Sys1::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
@@ -1081,11 +1017,7 @@ void NACT_Sys1::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) { \
@@ -1112,11 +1044,7 @@ void NACT_Sys1::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
@@ -1193,11 +1121,7 @@ void NACT_Sys1::cmd_q()
 
 void NACT_Sys1::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)) {
@@ -1209,11 +1133,7 @@ void NACT_Sys1::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);
@@ -1232,11 +1152,7 @@ void NACT_Sys1::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);
 
 	if (crc32 == CRC32_INTRUDER) {
 		ags->load_cg(page, 11);
@@ -1263,11 +1179,7 @@ void NACT_Sys1::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]);
@@ -1279,11 +1191,7 @@ void NACT_Sys1::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 (crc32) {
 	case CRC32_BUNKASAI:
@@ -1448,11 +1356,7 @@ void NACT_Sys1::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);
 
 	switch (crc32) {
 	case CRC32_INTRUDER:
diff --git a/src/sys/nact_sys2.cpp b/src/sys/nact_sys2.cpp
index f6e024f..50ce7c8 100644
--- a/src/sys/nact_sys2.cpp
+++ b/src/sys/nact_sys2.cpp
@@ -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
diff --git a/src/sys/nact_sys3.cpp b/src/sys/nact_sys3.cpp
index aa5dede..96ff1ea 100644
--- a/src/sys/nact_sys3.cpp
+++ b/src/sys/nact_sys3.cpp
@@ -28,11 +28,7 @@ void NACT_Sys3::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_Sys3::cmd_branch()
@@ -44,11 +40,7 @@ void NACT_Sys3::cmd_branch()
 	// sigmarion3 最適化誤爆の対策
 	scenario_addr = condition ? t_addr : f_addr;
 
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\n{%d: T:%4x, F:%4x", condition, t_addr, f_addr);
-	output_console(log);
-#endif
+	output_console("\n{%d: T:%4x, F:%4x", condition, t_addr, f_addr);
 }
 
 void NACT_Sys3::cmd_label_jump()
@@ -56,22 +48,14 @@ void NACT_Sys3::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_Sys3::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) {
 		// リターン
@@ -93,22 +77,14 @@ void NACT_Sys3::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_Sys3::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) {
 		// リターン
@@ -135,11 +111,7 @@ void NACT_Sys3::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();
@@ -150,11 +122,7 @@ void NACT_Sys3::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]);
 	}
 }
 
@@ -260,11 +228,7 @@ int NACT_Sys3::menu_select(int num_items)
 
 void NACT_Sys3::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);
@@ -292,11 +256,7 @@ void NACT_Sys3::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_Sys3::cmd_set_verbobj2()
@@ -313,21 +273,13 @@ void NACT_Sys3::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_Sys3::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;
 
 	// 表示する動詞のチェック
@@ -431,11 +383,7 @@ void NACT_Sys3::cmd_a()
 {
 	texthook_nextpage();
 
-#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マークの表示
@@ -479,11 +427,7 @@ void NACT_Sys3::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) {
 		// あゆみちゃん物語
@@ -556,11 +500,7 @@ void NACT_Sys3::cmd_e()
 	int ex = cali();
 	int ey = cali();
 
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nE %d,%d,%d,%d,%d,%d:", index, color, sx, sy, ex, ey);
-	output_console(log);
-#endif
+	output_console("\nE %d,%d,%d,%d,%d,%d:", index, color, sx, sy, ex, ey);
 
 	ags->box[index - 1].color = color;
 	ags->box[index - 1].sx = column ? sx * 8 : sx;
@@ -571,11 +511,7 @@ void NACT_Sys3::cmd_e()
 
 void NACT_Sys3::cmd_f()
 {
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nF");
-	output_console(log);
-#endif
+	output_console("\nF");
 
 	scenario_addr = 2;
 }
@@ -584,11 +520,7 @@ void NACT_Sys3::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);
 
 	ags->load_cg(page, -1);
 }
@@ -598,11 +530,7 @@ void NACT_Sys3::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);
 
 	// 隠しコマンド？
 	if(length >= 9) {
@@ -653,11 +581,7 @@ void NACT_Sys3::cmd_i()
 	int dx = cali();
 	int dy = cali();
 
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nI %d,%d,%d,%d,%d,%d:", sx, sy, ex, ey, dx, dy);
-	output_console(log);
-#endif
+	output_console("\nI %d,%d,%d,%d,%d,%d:", sx, sy, ex, ey, dx, dy);
 
 	// X方向はカラム単位で切り捨て
 	sx = column ? sx * 8 : sx & 0xfff8;
@@ -671,11 +595,7 @@ void NACT_Sys3::cmd_j()
 	int x = cali();
 	int y = cali();
 
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nJ %d,%d:", x, y);
-	output_console(log);
-#endif
+	output_console("\nJ %d,%d:", x, y);
 
 	// x方向はカラム単位で切り捨て
 	ags->cg_dest_x = column ? x * 8 : x & 0xfff8;
@@ -687,11 +607,7 @@ void NACT_Sys3::cmd_k()
 {
 	int cmd = getd(), val;
 
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nK %d:", cmd);
-	output_console(log);
-#endif
+	output_console("\nK %d:", cmd);
 
 	// K6の場合は、すぐに返る
 	if(cmd == 6) {
@@ -764,11 +680,7 @@ void NACT_Sys3::cmd_l()
 {
 	int index = cali();
 
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nL %d:", index);
-	output_console(log);
-#endif
+	output_console("\nL %d:", index);
 
 	if(index == 0) {
 		// 特殊セーブ
@@ -910,11 +822,7 @@ void NACT_Sys3::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);
@@ -935,11 +843,7 @@ void NACT_Sys3::cmd_n()
 	int src = cali();
 	int dest = cali();
 
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nN %d,%d,%d:", cmd, src, dest);
-	output_console(log);
-#endif
+	output_console("\nN %d,%d,%d:", cmd, src, dest);
 }
 
 void NACT_Sys3::cmd_o()
@@ -964,11 +868,7 @@ void NACT_Sys3::cmd_o()
 		B15 = (val & 0x4000) ? 1 : 0;
 		B16 = (val & 0x8000) ? 1 : 0;
 
-#if defined(_DEBUG_CONSOLE)
-		char log[128];
-		sprintf_s(log, 128, "\nO %d,%d:", cmd, val);
-		output_console(log);
-#endif
+		output_console("\nO %d,%d:", cmd, val);
 	} else {
 		uint16 val = 0;
 		val |= B01 ? 0x0001 : 0;
@@ -990,11 +890,7 @@ void NACT_Sys3::cmd_o()
 		int index = cali2();
 		var[index] = val;
 
-#if defined(_DEBUG_CONSOLE)
-		char log[128];
-		sprintf_s(log, 128, "\nO %d,var[%d]:", cmd, index);
-		output_console(log);
-#endif
+		output_console("\nO %d,var[%d]:", cmd, index);
 	}
 }
 
@@ -1005,11 +901,7 @@ void NACT_Sys3::cmd_p()
 	int g = cali();
 	int b = cali();
 
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nP %d,%d,%d,%d:", index, r, g, b);
-	output_console(log);
-#endif
+	output_console("\nP %d,%d,%d,%d:", index, r, g, b);
 
 	ags->set_palette(index, r, g, b);
 	set_palette = true;
@@ -1051,11 +943,7 @@ void NACT_Sys3::cmd_q()
 
 	int index = cali();
 
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nQ %d:", index);
-	output_console(log);
-#endif
+	output_console("\nQ %d:", index);
 
 	if(index == 0) {
 		// 特殊セーブ
@@ -1149,11 +1037,7 @@ void NACT_Sys3::cmd_r()
 {
 	texthook_newline();
 
-#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)) {
@@ -1165,11 +1049,7 @@ void NACT_Sys3::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);
@@ -1183,11 +1063,7 @@ void NACT_Sys3::cmd_t()
 	int x = cali();
 	int y = cali();
 
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nT %d,%d:", x, y);
-	output_console(log);
-#endif
+	output_console("\nT %d,%d:", x, y);
 
 	// x方向はカラム単位で切り捨て
 	ags->text_dest_x = column ? x * 8 : x & 0xfff8;
@@ -1199,11 +1075,7 @@ void NACT_Sys3::cmd_u()
 	int page = cali();
 	int transparent = cali();
 
-#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);
 
 	if(crc32 == CRC32_RANCE41 || crc32 == CRC32_RANCE42) {
 		transparent = (transparent == 28) ? 12 : transparent;
@@ -1216,11 +1088,7 @@ void NACT_Sys3::cmd_v()
 	int cmd = cali();
 	int index = cali();
 
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nV %d,%d:", cmd, index);
-	output_console(log);
-#endif
+	output_console("\nV %d,%d:", cmd, index);
 
 	if(cmd == 0) {
 		for(int i = 0; i < 20; i++) {
@@ -1245,11 +1113,7 @@ void NACT_Sys3::cmd_w()
 	int y = cali();
 	uint8 color = (uint8)cali();
 
-#if defined(_DEBUG_CONSOLE)
-	char log[128];
-	sprintf_s(log, 128, "\nW %d,%d,%d", x, y, color);
-	output_console(log);
-#endif
+	output_console("\nW %d,%d,%d", x, y, color);
 
 	ags->paint(x, y, color);
 }
@@ -1258,11 +1122,7 @@ void NACT_Sys3::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]);
@@ -1274,11 +1134,7 @@ void NACT_Sys3::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:
@@ -1660,11 +1516,7 @@ void NACT_Sys3::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);
 
 	if(cmd == 0) {
 		ags->palette_bank = (uint8)(param & 0xff);
diff --git a/src/win/nact_win.cpp b/src/win/nact_win.cpp
index 4ca2e08..0d7d7ac 100644
--- a/src/win/nact_win.cpp
+++ b/src/win/nact_win.cpp
@@ -92,9 +92,13 @@ void NACT::release_console()
 #endif
 }
 
-void NACT::output_console(char log[])
+void NACT::output_console(const char *format, ...)
 {
 #if defined(_DEBUG_CONSOLE)
-	fputs(log, stdout);
+	va_list ap;
+
+	va_start(ap, format);
+	vfprintf(stdout, format, ap);
+	va_end(ap);
 #endif
 }