Changeset 396 for AE/Installer


Ignore:
Timestamp:
Jul 6, 2009, 9:18:00 PM (10 years ago)
Author:
gumby
Message:

Fixed split Globalization log

File:
1 edited

Legend:

Unmodified
Added
Removed
  • AE/Installer/trunk/source/main_window.cpp

    r394 r396  
    7676        string escape_me = "& ;()|<>\"'\\#*?$";
    7777        for(int i = 0; i < input.size(); i++)  {
    78                 for(int j = 0; j < escape_me.size(); j++) if (input[i] == escape_me[j]) output += '\\';
     78                for(int j = 0; j < escape_me.size(); j++) if (input[i] == escape_me[j]) output += '//';
    7979                output += input[i];
    8080        }
     
    319319                                + levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log").c_str() << '\n';
    320320                        string sys_str = (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final packages/VanillaDats/level" + levels[i] + "_Final/level"
    321                                 + levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize2.log");
     321                                + levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log");
    322322                                system(sys_str.c_str() );
    323323                        setProgressBar( (int)(1000 * (float)(parts_done) / (float)(total_steps) ));
     
    367367                   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,
    368368                   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 */
    369                 string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for Installer
     369                path fullAEpath = system_complete("."); // get full path for Installer
    370370                char prefsCommand[300] = "defaults write com.godgames.oni RetailInstallationPath -string '";
    371                 strcat(prefsCommand, fullAEpath.c_str()); // get path of edition/ folder (Oni wants the folder that *contains* the GDF)
     371                strcat(prefsCommand, fullAEpath.parent_path().parent_path().string().c_str()); // get path of edition/ folder (Oni wants the folder that *contains* the GDF)
    372372                strcat(prefsCommand, "'"); // path string is enclosed in single quotes to avoid the need to escape UNIX-unfriendly characters
    373373                system(prefsCommand);
Note: See TracChangeset for help on using the changeset viewer.