From 002136ac63a6a3a3e81c1cc9c05f1b4f0c34b9cf Mon Sep 17 00:00:00 2001
From: scatterflower <marisaposs@gameboyprinter.moe>
Date: Wed, 2 Sep 2020 08:31:27 -0500
Subject: [PATCH] add default config files

---
 .gitignore                            | 3 +--
 {config => bin/config}/areas.ini      | 0
 {config => bin/config}/characters.txt | 0
 {config => bin/config}/config.ini     | 0
 {config => bin/config}/music.txt      | 0
 src/server.cpp                        | 4 ++--
 6 files changed, 3 insertions(+), 4 deletions(-)
 rename {config => bin/config}/areas.ini (100%)
 rename {config => bin/config}/characters.txt (100%)
 rename {config => bin/config}/config.ini (100%)
 rename {config => bin/config}/music.txt (100%)

diff --git a/.gitignore b/.gitignore
index 4b0c703..feaffc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,5 @@ Thumbs.db
 *.dll
 *.exe
 
-bin/
 build/
-
+bin/akashi
diff --git a/config/areas.ini b/bin/config/areas.ini
similarity index 100%
rename from config/areas.ini
rename to bin/config/areas.ini
diff --git a/config/characters.txt b/bin/config/characters.txt
similarity index 100%
rename from config/characters.txt
rename to bin/config/characters.txt
diff --git a/config/config.ini b/bin/config/config.ini
similarity index 100%
rename from config/config.ini
rename to bin/config/config.ini
diff --git a/config/music.txt b/bin/config/music.txt
similarity index 100%
rename from config/music.txt
rename to bin/config/music.txt
diff --git a/src/server.cpp b/src/server.cpp
index 33a98b4..127d9b3 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -43,14 +43,14 @@ void Server::start()
     if(ws_port != -1)
         proxy->start();
 
-    QFile char_list("characters.txt");
+    QFile char_list("config/characters.txt");
     char_list.open(QIODevice::ReadOnly | QIODevice::Text);
     while (!char_list.atEnd()) {
         characters.append(char_list.readLine().trimmed());
     }
     char_list.close();
 
-    QFile music_file("music.txt");
+    QFile music_file("config/music.txt");
     music_file.open(QIODevice::ReadOnly | QIODevice::Text);
     while (!music_file.atEnd()) {
         music_list.append(music_file.readLine().trimmed());