From 088b039cf7de6b217a289499a8efe5a47e861829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 25 Nov 2013 00:46:52 +0100 Subject: Detect java bitness on launch, use appropriate libraries Fixes problems with latest snapshot --- logic/OneSixInstance.h | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'logic/OneSixInstance.h') diff --git a/logic/OneSixInstance.h b/logic/OneSixInstance.h index e30ca7ca..042c104b 100644 --- a/logic/OneSixInstance.h +++ b/logic/OneSixInstance.h @@ -37,23 +37,22 @@ public: ////// Directories ////// QString resourcePacksDir() const; QString loaderModsDir() const; - virtual QString instanceConfigFolder() const; + virtual QString instanceConfigFolder() const override; - virtual Task *doUpdate(); - virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account); + virtual Task *doUpdate(bool prepare_for_launch) override; + virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account) override; - virtual void cleanupAfterRun(); + virtual void cleanupAfterRun() override; - virtual QString intendedVersionId() const; - virtual bool setIntendedVersionId(QString version); + virtual QString intendedVersionId() const override; + virtual bool setIntendedVersionId(QString version) override; - virtual QString currentVersionId() const; - // virtual void setCurrentVersionId ( QString val ) {}; + virtual QString currentVersionId() const override; - virtual bool shouldUpdate() const; - virtual void setShouldUpdate(bool val); + virtual bool shouldUpdate() const override; + virtual void setShouldUpdate(bool val) override; - virtual QDialog *createModEditDialog(QWidget *parent); + virtual QDialog *createModEditDialog(QWidget *parent) override; /// reload the full version json file. return true on success! bool reloadFullVersion(); @@ -66,11 +65,11 @@ public: /// is the current version original, or custom? virtual bool versionIsCustom() override; - virtual QString defaultBaseJar() const; - virtual QString defaultCustomBaseJar() const; + virtual QString defaultBaseJar() const override; + virtual QString defaultCustomBaseJar() const override; - virtual bool menuActionEnabled(QString action_name) const; - virtual QString getStatusbarDescription(); + virtual bool menuActionEnabled(QString action_name) const override; + virtual QString getStatusbarDescription() override; private: QStringList processMinecraftArgs(MojangAccountPtr account); -- cgit v1.2.3