ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/AE/Installer/trunk/source/main_window.cpp

Comparing AE/Installer/trunk/source/main_window.cpp (file contents):
Revision 400 by gumby, Mon Jul 6 23:53:24 2009 UTC vs.
Revision 409 by iritscen, Tue Jul 7 12:48:37 2009 UTC

#	Line 357 | Line 357 | int globalizeData(void)
357		copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
358		setProgressBar( 1000 );
359
360	<	copy("../../persist.dat","..");
361	<	copy("../../key_config.txt","..");
360	>	if(!exists("../persist.dat"))
361	>	copy("../../persist.dat","..");
362	>	if(!exists("../key_config.txt"))
363	>	copy("../../key_config.txt","..");
364
365		#ifndef WIN32
366		/* On Mac only, set the current GDF to the AE GDF by writing to Oni's global preferences file (thankfully a standard OS X ".plist" XML file).
#	Line 1139 | Line 1141 | void MainWindow::CreateControls()
1141		// Connect events and objects
1142		Mods_CheckboxList->Connect(Mods_CheckboxList1, wxEVT_CREATE, wxWindowCreateEventHandler(MainWindow::ModList_OnCreate), NULL, this);
1143		////@end MainWindow content construction
1144	<
1144	>	#ifdef WIN32
1145		Handle = (HWND)GetHWND();
1146		::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&pTaskbarList);
1147	+	#endif
1148
1149	<
1147	<	if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
1149	>	/*if ( exists( "../../GameDataFolder/level0_Final.sep" ) ) {
1150		strImportOption = "-import:sep";
1151		splitInstances = NOT_SPLIT;
1152		}
1153		else {
1154		strImportOption = "-import:nosep";
1155		splitInstances = SPLIT;
1156	<	}
1156	>	}*/
1157	>
1158	>	#ifndef WIN32
1159	>	strImportOption = "-import:sep";
1160	>	splitInstances = NOT_SPLIT;
1161	>	#else
1162	>	strImportOption = "-import:nosep";
1163	>	splitInstances = SPLIT;
1164	>	#endif
1165
1166		globalPackages = getPackages();
1167		globalInstalledMods = getInstallString();

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)