Changeset 396

Timestamp:

Jul 6, 2009, 9:18:00 PM (15 years ago)

Author:

gumby

Message:

Fixed split Globalization log

File:

• AE/Installer/trunk/source/main_window.cpp (modified) (3 diffs)

AE/Installer/trunk/source/main_window.cpp

@@ -76 +76 @@
         string escape_me = "& ;()|<>\"'\\#*?$";
         for(int i = 0; i < input.size(); i++)  {
-                for(int j = 0; j < escape_me.size(); j++) if (input[i] == escape_me[j]) output += '\\';
+                for(int j = 0; j < escape_me.size(); j++) if (input[i] == escape_me[j]) output += '//';
                 output += input[i];
         }
@@ -319 +319 @@
                                 + levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log").c_str() << '\n';
                         string sys_str = (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final packages/VanillaDats/level" + levels[i] + "_Final/level"
-                                + levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize2.log");
+                                + levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log");
                                 system(sys_str.c_str() );
                         setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
@@ -367 +367 @@
                    If there are no Oni prefs (only possible if Oni has not been run even once), then the above line will fail silently, no harm done,
                    and when the user does run Oni for the first time, using the copy of the app in the AE GDF, Oni will set the prefs to use that GDF at that point */
-                string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for Installer
+                path fullAEpath = system_complete("."); // get full path for Installer
                 char prefsCommand[300] = "defaults write com.godgames.oni RetailInstallationPath -string '";
-                strcat(prefsCommand, fullAEpath.c_str()); // get path of edition/ folder (Oni wants the folder that *contains* the GDF)
+                strcat(prefsCommand, fullAEpath.parent_path().parent_path().string().c_str()); // get path of edition/ folder (Oni wants the folder that *contains* the GDF)
                 strcat(prefsCommand, "'"); // path string is enclosed in single quotes to avoid the need to escape UNIX-unfriendly characters
                 system(prefsCommand);