diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-12 22:17:14 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-12 22:17:14 +0100 |
| commit | b589a12d1765f8df616779c53e614adef2e4c48e (patch) | |
| tree | 83cdd87d532a36df1177987547c57058fd4f1777 /logic/MinecraftProcess.h | |
| parent | 498520446fcd10003226822f5ada9c2fe90e8c63 (diff) | |
| parent | fca4441229808891f460d5fbc4affd51e8896aa5 (diff) | |
| download | MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.tar MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.tar.gz MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.tar.lz MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.tar.xz MultiMC-b589a12d1765f8df616779c53e614adef2e4c48e.zip | |
Merge branch 'feature_better_launch' into develop
Diffstat (limited to 'logic/MinecraftProcess.h')
| -rw-r--r-- | logic/MinecraftProcess.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/logic/MinecraftProcess.h b/logic/MinecraftProcess.h index bd0151cc..5d1a2b71 100644 --- a/logic/MinecraftProcess.h +++ b/logic/MinecraftProcess.h @@ -18,7 +18,7 @@ #pragma once #include <QProcess> - +#include <QString> #include "BaseInstance.h" /** @@ -65,7 +65,15 @@ public: void setWorkdir(QString path); - void setArguments(QStringList args); + void setLaunchScript(QString script) + { + launchScript = script; + } + + void setNativeFolder(QString natives) + { + m_nativeFolder = natives; + } void killMinecraft(); @@ -104,12 +112,13 @@ signals: protected: BaseInstance *m_instance = nullptr; - QStringList m_args; QString m_err_leftover; QString m_out_leftover; QProcess m_prepostlaunchprocess; bool killed = false; MojangAccountPtr m_account; + QString launchScript; + QString m_nativeFolder; protected slots: |