From 40b4ddcca115539577e1dc00c3f1a927b2a6b855 Mon Sep 17 00:00:00 2001
From: jballou <jballou@stats.jballou.com>
Date: Mon, 9 May 2016 15:20:43 -0400
Subject: [PATCH] Updated gamedata functions to use new hierarchy

---
 functions/game_settings.sh | 5 ++---
 gamedata/__mod_list        | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 gamedata/__mod_list

diff --git a/functions/game_settings.sh b/functions/game_settings.sh
index 26818907d..78d203a94 100644
--- a/functions/game_settings.sh
+++ b/functions/game_settings.sh
@@ -181,7 +181,7 @@ fn_flush_game_settings
 settings_file_md5="$(fn_get_md5sum "${settings_file}")"
 
 # Import this game's settings
-fn_import_game_settings $selfname
+fn_import_game_settings "games/${selfname}/gamedata"
 
 # Compare the original MD5 hash with the settings file now that we have processed all gamedata.\
 # If there is a change or the config is missing, rebuild the default config
@@ -200,8 +200,7 @@ if [ ! -f $cfg_file_instance ]; then fn_create_config instance; else source $cfg
 
 # Import mod
 if [ "${game_mod}" != "" ]; then
-	modfile="mods/${selfname}/${game_mod}"
-	echo $modfile
+	modfile="games/${selfname}/mods/${game_mod}"
 	fn_set_game_setting settings "game_mod" "${game_mod}"
 	fn_import_game_settings "${modfile}"
 fi
diff --git a/gamedata/__mod_list b/gamedata/__mod_list
deleted file mode 100644
index 7441c46cd..000000000
--- a/gamedata/__mod_list
+++ /dev/null
@@ -1 +0,0 @@
-insserver/dayofinfamy "Day of Infamy"