From 4ae7e9e7aa06c15a33c5b1001def65cb42312b3f Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Sun, 23 Feb 2020 14:40:57 +0900
Subject: [PATCH] Move SYSTEM1 initialization code to NACT_Sys1 constructor

---
 src/sys/nact.cpp      | 21 ---------------------
 src/sys/nact.h        | 18 ++++++++----------
 src/sys/nact_sys1.cpp | 17 +++++++++++++++++
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/src/sys/nact.cpp b/src/sys/nact.cpp
index 4bc0868..d4a5c15 100644
--- a/src/sys/nact.cpp
+++ b/src/sys/nact.cpp
@@ -84,27 +84,6 @@ NACT::NACT(int sys_ver, uint32 crc32, const char* font_file, const char* playlis
 	pcm_index = 0;
 	memset(pcm, 0, sizeof(pcm));
 
-	if (sys_ver == 1) {
-		// SYETEM1 初期化
-		menu_max = 6;
-		switch (crc32) {
-		case CRC32_DPS:
-			text_refresh = false;
-			strcpy_s(tvar[0], 22, "カスタム");
-			strcpy_s(tvar[1], 22, "リーナス");
-			strcpy_s(tvar[2], 22, "かつみ");
-			strcpy_s(tvar[3], 22, "由美子");
-			strcpy_s(tvar[4], 22, "いつみ");
-			strcpy_s(tvar[5], 22, "ひとみ");
-			strcpy_s(tvar[6], 22, "真理子");
-			break;
-		case CRC32_INTRUDER:
-			menu_max = 11;
-			paint_x = paint_y = map_page = 0;
-			break;
-		}
-	}
-
 	// 各種クラス生成
 	ags = new AGS(this, font_file);
 	mako = new MAKO(this, playlist);
diff --git a/src/sys/nact.h b/src/sys/nact.h
index bb6b724..5aa8c49 100644
--- a/src/sys/nact.h
+++ b/src/sys/nact.h
@@ -85,7 +85,7 @@ class NACT
 public:
 	static NACT* create(const char* game_id, const char* font_file, const char* playlist);
 	NACT(int sys_ver, uint32 crc32, const char* font_file, const char* playlist);
-	~NACT();
+	virtual ~NACT();
 
 protected:
 	AGS* ags;
@@ -121,18 +121,9 @@ protected:
 	char tvar_stack[30][10][22];
 //	int tvar_index;
 
-	// SYSTEM1 ----
-	int menu_max;	// メニューの改ページ
-
 	// DPS
 	bool text_refresh;
 
-	// Intruder Zコマンド
-	int paint_x;
-	int paint_y;
-	int map_page;
-	// ------------
-
 	bool column;		// 座標モード
 	bool wait_keydown;	// ウェイト時のキー受付
 	int text_wait_time;	// テキスト表示のウェイト
@@ -263,6 +254,13 @@ public:
 private:
 	uint16 cali();
 	uint16 cali2();
+
+	int menu_max;	// メニューの改ページ
+
+	// Intruder Zコマンド
+	int paint_x;
+	int paint_y;
+	int map_page;
 };
 
 class NACT_Sys2 : public NACT {
diff --git a/src/sys/nact_sys1.cpp b/src/sys/nact_sys1.cpp
index 97ec943..da10ced 100644
--- a/src/sys/nact_sys1.cpp
+++ b/src/sys/nact_sys1.cpp
@@ -63,6 +63,23 @@
 NACT_Sys1::NACT_Sys1(uint32 crc32, const char* font_file, const char* playlist)
 	: NACT(1, crc32, font_file, playlist)
 {
+	menu_max = 6;
+	switch (crc32) {
+	case CRC32_DPS:
+		text_refresh = false;
+		strcpy_s(tvar[0], 22, "カスタム");
+		strcpy_s(tvar[1], 22, "リーナス");
+		strcpy_s(tvar[2], 22, "かつみ");
+		strcpy_s(tvar[3], 22, "由美子");
+		strcpy_s(tvar[4], 22, "いつみ");
+		strcpy_s(tvar[5], 22, "ひとみ");
+		strcpy_s(tvar[6], 22, "真理子");
+		break;
+	case CRC32_INTRUDER:
+		menu_max = 11;
+		paint_x = paint_y = map_page = 0;
+		break;
+	}
 }
 
 void NACT_Sys1::opening()