CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature_derpstances

Browse Source
This commit is contained in:
Jan Dalheimer
2014-01-22 14:06:58 +01:00
parent 13ac46bc18 c46c508fc6
commit d166b48072
5 changed files with 137 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
logic/DerpInstance.cpp
View File

@ -226,6 +226,11 @@ MinecraftProcess *DerpInstance::prepareForLaunch(MojangAccountPtr account)
}
QDir natives_dir(PathCombine(instanceRoot(), "natives/"));
launchScript += "windowTitle " + windowTitle() + "\n";
for(auto native: version->getActiveNativeLibs())
{
QFileInfo finfo(PathCombine("libraries", native->storagePath()));
launchScript += "ext " + finfo.absoluteFilePath() + "\n";
}
launchScript += "natives " + natives_dir.absolutePath() + "\n";
launchScript += "launch onesix\n";

7
logic/DerpUpdate.cpp
View File

@ -349,11 +349,6 @@ void DerpUpdate::prepareForLaunch()
return;
}
/*
* emitFailed("Could not create the native library folder:\n" + natives_dir_raw +
"\nMake sure MultiMC has appropriate permissions and there is enough
space "
"on the storage device.");
*/
for (auto lib : version->getActiveNativeLibs())
{
if (!lib->filesExist())
@ -372,6 +367,6 @@ void DerpUpdate::prepareForLaunch()
return;
}
}
*/
emitSucceeded();
}