diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-11-25 00:46:52 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-11-25 00:46:52 +0100 |
| commit | 088b039cf7de6b217a289499a8efe5a47e861829 (patch) | |
| tree | 7fe8861cc33e5bf3ca9a0347b04604a9f9883d81 /logic/LegacyInstance.h | |
| parent | 82225a21e1b7f1671a42c1511032c59ecda0503f (diff) | |
| download | MultiMC-088b039cf7de6b217a289499a8efe5a47e861829.tar MultiMC-088b039cf7de6b217a289499a8efe5a47e861829.tar.gz MultiMC-088b039cf7de6b217a289499a8efe5a47e861829.tar.lz MultiMC-088b039cf7de6b217a289499a8efe5a47e861829.tar.xz MultiMC-088b039cf7de6b217a289499a8efe5a47e861829.zip | |
Detect java bitness on launch, use appropriate libraries
Fixes problems with latest snapshot
Diffstat (limited to 'logic/LegacyInstance.h')
| -rw-r--r-- | logic/LegacyInstance.h | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/logic/LegacyInstance.h b/logic/LegacyInstance.h index 3d35521e..a17ef281 100644 --- a/logic/LegacyInstance.h +++ b/logic/LegacyInstance.h @@ -48,7 +48,7 @@ public: QString loaderModsDir() const; QString coreModsDir() const; QString resourceDir() const; - virtual QString instanceConfigFolder() const; + virtual QString instanceConfigFolder() const override; /*! * Whether or not the instance's minecraft.jar needs to be rebuilt. @@ -58,37 +58,35 @@ public: bool shouldRebuild() const; void setShouldRebuild(bool val); - virtual QString currentVersionId() const; - virtual void setCurrentVersionId(QString val); + virtual QString currentVersionId() const override; //! The version of LWJGL that this instance uses. QString lwjglVersion() const; /// st the version of LWJGL libs this instance will use void setLWJGLVersion(QString val); - virtual QString intendedVersionId() const; - virtual bool setIntendedVersionId(QString version); + virtual QString intendedVersionId() const override; + virtual bool setIntendedVersionId(QString version) override; // the `version' of Legacy instances is defined by the launcher code. // in contrast with OneSix, where `version' is described in a json file virtual bool versionIsCustom() override { return false; } - ; - virtual bool shouldUpdate() const; - virtual void setShouldUpdate(bool val); - virtual Task *doUpdate(); + virtual bool shouldUpdate() const override; + virtual void setShouldUpdate(bool val) override; + virtual Task *doUpdate(bool prepare_for_launch) override; - virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account); - virtual void cleanupAfterRun(); - virtual QDialog *createModEditDialog(QWidget *parent); + virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account) override; + virtual void cleanupAfterRun() override; + virtual QDialog *createModEditDialog(QWidget *parent) override; - virtual QString defaultBaseJar() const; - virtual QString defaultCustomBaseJar() const; + virtual QString defaultBaseJar() const override; + virtual QString defaultCustomBaseJar() const override; bool menuActionEnabled(QString action_name) const; - virtual QString getStatusbarDescription(); + virtual QString getStatusbarDescription() override; protected slots: |