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

Merge branch 'feature_yggdrasil' into develop

Browse Source 
Conflicts:
	gui/MainWindow.cpp
	logic/OneSixInstance.h

Fix missing session id functionality for legacy and old onesix.
This commit is contained in:
Petr Mrázek
2013-11-24 18:41:35 +01:00
parent ca297fca79 75e7932607
commit 82225a21e1
24 changed files with 1849 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
logic/BaseInstance.h
View File

@ -22,7 +22,7 @@
#include "inifile.h"
#include "lists/BaseVersionList.h"
#include "net/LoginTask.h"
#include "logic/auth/MojangAccount.h"
class QDialog;
class Task;
@ -153,8 +153,8 @@ public:
/// returns a valid update task if update is needed, NULL otherwise
virtual Task *doUpdate() = 0;
/// returns a valid minecraft process, ready for launch
virtual MinecraftProcess *prepareForLaunch(LoginResponse response) = 0;
/// returns a valid minecraft process, ready for launch with the given account.
virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account) = 0;
/// do any necessary cleanups after the instance finishes. also runs before
/// 'prepareForLaunch'