Changeset 320 for AE

Timestamp:

May 5, 2009, 8:56:20 PM (16 years ago)

Author:

gumby

Message:

 

File:

• AE/Installer/trunk/source/subs.cpp (modified) (9 diffs)

AE/Installer/trunk/source/subs.cpp

@@ -43 +43 @@
 using namespace std;
 
-string strInstallCfg = "../GameDataFolder/Install.cfg";
+string strInstallCfg = "../GameDataFolder/Add.cfg";
 
 
@@ -49 +49 @@
 {
         if ( exists( "../GameDataFolder/level0_Final.sep" ) ) splitInstances = NOT_SPLIT;
-        else splitInstances = SPLIT;
+        else splitInstances = NOT_SPLIT;
         //      SetConsoleTitle("AE Installer"); windows junk, convert to SDL
 #ifdef WIN32    
@@ -68 +68 @@
         {
                 if( exists( "../GameDataFolder" ) ) {
-                        cout << "\n1. Install new packages\n";
-                        cout << "2. Uninstall packages\n";
+                        cout << "\n1. Add new packages\n";
+                        cout << "2. Remove packages\n";
                         cout << "3. See what is installed\n";
                         cout << "4. Globalize data\n";
@@ -341 +341 @@
                                  << (*package_iter).readme << "\n\n"
                                  << "Please enter a number choice\n"
-                                 << " 1. Install\n"
-                                 << " 2. Don't Install\n"
+                                 << " 1. Add\n"
+                                 << " 2. Don't Add\n"
                                  << "";
                         index++;
@@ -373 +373 @@
         if (installed_something == 0)
         {
-                cout << "Warning: You didn't install anything!\n";
+                cout << "Warning: You didn't add anything!\n";
                 //would you like to recombine your data?
                 return 0;
@@ -424 +424 @@
                                  << (*package_iter).readme << "\n\n"
                                  << "Please enter a number choice\n"
-                                 << " 1. Uninstall\n"
-                                 << " 2. Don't Uninstall\n"
+                                 << " 1. Remove\n"
+                                 << " 2. Don't Remove\n"
                                  << "";
                         
@@ -457 +457 @@
                 else
                 {
-                        cout << "\nWarning: You didn't uninstall anything!";
+                        cout << "\nWarning: You didn't remove anything!";
                 }
                                 //would you like to recombine your data?
@@ -674 +674 @@
                         cout << "Warning, exception " << ex.what() << "!\n"
                         << "You probably need to re-globalize.";
-                        create_directory( "./packages/VanillaDats" );
+                        //create_directory( "./packages/VanillaDats" );
                 }
                 
@@ -688 +688 @@
                                 if ( is_directory( dir_itr->status() ) )
                                 {
-                                        system((strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " " + "../GameDataFolder/" + dir_itr->path().filename()
-                                                        + ".dat").c_str());
+                                        importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " " + "../GameDataFolder/" + dir_itr->path().filename()
+                                                        + ".dat";
+                                        for (int i = 0; i < installedMods.size(); ++i) {
+                                        if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename()  ))
+                                                importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename();
+                                        }
+                                        importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat";
+                                        system(importCommand.c_str());
                                 }
                         }