From 03f8af224136fabf83780a1627381ea687fa3fc2 Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Sun, 12 Jul 2020 14:25:34 +0900
Subject: [PATCH] Simplify registerGameFiles()

---
 src/ald_manager.c | 11 +++++------
 src/xsystem35.c   | 25 +++++--------------------
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/ald_manager.c b/src/ald_manager.c
index e54dd9d..6e3d626 100644
--- a/src/ald_manager.c
+++ b/src/ald_manager.c
@@ -104,11 +104,10 @@ void ald_freedata(dridata *data) {
  *   mmap: mmap file or not
 */
 void ald_init(int type, const char **file, int cnt, boolean mmap) {
-	/* check wrong type */
-	if (type < DRIFILETYPEMAX) {
-		dri[type] = dri_init(file, cnt, mmap);
-		if (!dri[type]->mmapped) {
-			cacheid = cache_new(ald_free);
-		}
+	if (type >= DRIFILETYPEMAX || cnt <= 0)
+		return;
+	dri[type] = dri_init(file, cnt, mmap);
+	if (!dri[type]->mmapped) {
+		cacheid = cache_new(ald_free);
 	}
 }
diff --git a/src/xsystem35.c b/src/xsystem35.c
index 5062d2e..a8fae33 100644
--- a/src/xsystem35.c
+++ b/src/xsystem35.c
@@ -565,27 +565,12 @@ static void init_signalhandler() {
 #endif
 
 static void registerGameFiles(void) {
-	GameResource *gr = &nact->files;
-	if (gr->cnt[DRIFILE_SCO] == 0) {
+	if (nact->files.cnt[DRIFILE_SCO] == 0)
 		SYSERROR("No Scenario data available\n");
-	}
-	if (gr->cnt[DRIFILE_SCO] > 0)
-		ald_init(DRIFILE_SCO, gr->game_fname[DRIFILE_SCO], gr->cnt[DRIFILE_SCO], TRUE);
-	if (gr->cnt[DRIFILE_CG] > 0)
-		ald_init(DRIFILE_CG,  gr->game_fname[DRIFILE_CG], gr->cnt[DRIFILE_CG], TRUE);
-	if (gr->cnt[DRIFILE_WAVE] > 0)
-		ald_init(DRIFILE_WAVE, gr->game_fname[DRIFILE_WAVE], gr->cnt[DRIFILE_WAVE], TRUE);
-	if (gr->cnt[DRIFILE_MIDI] > 0)
-		ald_init(DRIFILE_MIDI, gr->game_fname[DRIFILE_MIDI], gr->cnt[DRIFILE_MIDI], TRUE);
-	if (gr->cnt[DRIFILE_DATA] > 0)
-		ald_init(DRIFILE_DATA, gr->game_fname[DRIFILE_DATA], gr->cnt[DRIFILE_DATA], TRUE);
-	if (gr->cnt[DRIFILE_RSC] > 0)
-		ald_init(DRIFILE_RSC, gr->game_fname[DRIFILE_RSC], gr->cnt[DRIFILE_RSC], TRUE);
-	if (gr->cnt[DRIFILE_BGM] > 0)
-		ald_init(DRIFILE_BGM, gr->game_fname[DRIFILE_BGM], gr->cnt[DRIFILE_BGM], TRUE);
-
-	if (gr->save_path)
-		fc_init(gr->save_path);
+	for (int type = 0; type < DRIFILETYPEMAX; type++)
+		ald_init(type, nact->files.game_fname[type], nact->files.cnt[type], TRUE);
+	if (nact->files.save_path)
+		fc_init(nact->files.save_path);
 }
 
 int main(int argc, char **argv) {