From 923633ae61b255c64dee9cf011382086453286d8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 9 Jan 2014 22:18:59 +0300
Subject: add mods loading based on settings.

---
 src/client.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index 443c156fb..649c1f08c 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1176,6 +1176,10 @@ int Client::gameExec()
                 Net::getPartyHandler()->clear();
                 if (chatLogger)
                     chatLogger->clear();
+                if (mOptions.dataPath.empty())
+                    UpdaterWindow::unloadMods(mOldUpdates);
+                else
+                    UpdaterWindow::unloadMods(mOptions.dataPath);
             }
 
             mOldState = mState;
@@ -1372,6 +1376,7 @@ int Client::gameExec()
                     {
                         mState = STATE_LOAD_DATA;
                         mOldUpdates = "";
+                        UpdaterWindow::loadDirMods(mOptions.dataPath);
                     }
                     else if (loginData.updateType & LoginData::Upd_Skip)
                     {
@@ -1456,7 +1461,7 @@ int Client::gameExec()
                     NPCDB::load();
                     PETDB::load();
                     EmoteDB::load();
-                    ModDB::load();
+//                    ModDB::load();
                     StatusEffect::load();
                     Units::loadUnits();
 
-- 
cgit v1.2.3-70-g09d2