diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-09 01:22:34 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-12 21:57:34 +0100 |
| commit | fca4441229808891f460d5fbc4affd51e8896aa5 (patch) | |
| tree | 842b0e559c233399b0994697ff87321d93603121 /logic/MinecraftProcess.h | |
| parent | c51a993ff741074ac88bbc901ebfad9da636eeaa (diff) | |
| download | MultiMC-fca4441229808891f460d5fbc4affd51e8896aa5.tar MultiMC-fca4441229808891f460d5fbc4affd51e8896aa5.tar.gz MultiMC-fca4441229808891f460d5fbc4affd51e8896aa5.tar.lz MultiMC-fca4441229808891f460d5fbc4affd51e8896aa5.tar.xz MultiMC-fca4441229808891f460d5fbc4affd51e8896aa5.zip | |
Replace old launcher part with a shiny new one. No more garbage on the command line.
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: |