Subversion Repositories spk

Rev

Rev 223 | Rev 226 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 223 Rev 224
Line 310... Line 310...
310 
	gui->UpdatePackages();
 310 
	gui->UpdatePackages();
311 
	gui->StartCheckTimer();
 311 
	gui->StartCheckTimer();
312 
	gui->FindPackages();
 312 
	gui->FindPackages();
313 
 
 313 
 
314 
	System::String ^mod = PluginManager::ReadRegistryValue(packages.getModKey());
 314 
	System::String ^mod = PluginManager::ReadRegistryValue(packages.getModKey());
315 
	packages.setMod(_S(mod));
 315 
	packages.setMod(_WS(mod));
316 
 
 316 
 
317 
	gui->CheckProtectedDir();
 317 
	gui->CheckProtectedDir();
318 
	Application::Run(gui);
 318 
	Application::Run(gui);
319 
 
 319 
 
320 
	// close directory
320 
	// close directory
Line 393... Line 393...
393 
				System::Diagnostics::ProcessStartInfo ^info = gcnew System::Diagnostics::ProcessStartInfo(dir + "\\GameLauncher.exe");
 393 
				System::Diagnostics::ProcessStartInfo ^info = gcnew System::Diagnostics::ProcessStartInfo(dir + "\\GameLauncher.exe");
394 
				if ( info )
 394 
				if ( info )
395 
				{
 395 
				{
396 
					if ( packages.GetCurrentGameFlags() & EXEFLAG_ADDON ) {
 396 
					if ( packages.GetCurrentGameFlags() & EXEFLAG_ADDON ) {
397 
						CPackages p;
 397 
						CPackages p;
398 
						p.startup(".", _S(tempDir), _S(mydoc), "");
 398 
						p.startup(L".", _WS(tempDir), _WS(mydoc), L"");
399 
						Utils::WString baseDir = CFileIO(_S(gui->GetRunFile())).dir();
 399 
						Utils::WString baseDir = CFileIO(_WS(gui->GetRunFile())).dir();
400 
						if ( p.read(baseDir.toString()) ) {
 400 
						if ( p.read(baseDir) ) {
401 
							if ( !p.IsVanilla() ) {
 401 
							if ( !p.IsVanilla() ) {
402 
								p.SetVanilla(true);
 402 
								p.SetVanilla(true);
403 
								p.PrepareDisableForVanilla();
 403 
								p.PrepareDisableForVanilla();
404 
								p.enablePreparedPackages(0, 0, 0);
 404 
								p.enablePreparedPackages(0, 0, 0);
405 
								restoreModified.pushBack(baseDir);
 405 
								restoreModified.pushBack(baseDir);
Line 439... Line 439...
439 
 
 439 
 
440 
		Utils::WString exe = CFileIO(packages.GetGameExe()->gameRunExe((*itr)->str)).fullFilename();
 440 
		Utils::WString exe = CFileIO(packages.GetGameExe()->gameRunExe((*itr)->str)).fullFilename();
441 
		writeLines.push_back(L"DirExe:" + data + L"|" + exe);
 441 
		writeLines.push_back(L"DirExe:" + data + L"|" + exe);
442 
 
 442 
 
443 
		// do the log files
 443 
		// do the log files
444 
		writeLines.push_back(L"GameLog:" + packages.logDirectory(exe.toString()) + "|" + exe);
 444 
		writeLines.push_back(L"GameLog:" + packages.logDirectory(exe) + L"|" + exe);
445 
 
 445 
 
446 
	}
 446 
	}
447 
	for (auto itr = remDirList.begin(); itr != remDirList.end(); itr++)
 447 
	for (auto itr = remDirList.begin(); itr != remDirList.end(); itr++)
448 
		writeLines.push_back(L"RemDir:" + (*itr)->str);
 448 
		writeLines.push_back(L"RemDir:" + (*itr)->str);
449 
	if ( gui->IsExperimental() )
 449 
	if ( gui->IsExperimental() )