From 788cc5afada952667f927f181715b7dd4af793e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Sun, 9 Jun 2024 13:29:50 +0200 Subject: [PATCH] Format files and add .gitattributes and .clang-format. --- .clang-format | 41 ++++ .gitattributes | 7 + src/gameoblivion.cpp | 382 ++++++++++++++++---------------- src/gameoblivion.h | 103 +++++---- src/oblivionbsainvalidation.cpp | 33 ++- src/oblivionbsainvalidation.h | 43 ++-- src/obliviondataarchives.cpp | 72 +++--- src/obliviondataarchives.h | 53 +++-- src/oblivionmoddatachecker.cpp | 8 +- src/oblivionmoddatachecker.h | 31 +-- src/oblivionmoddatacontent.h | 13 +- src/oblivionsavegame.cpp | 47 ++-- src/oblivionsavegame.h | 14 +- src/oblivionscriptextender.cpp | 43 ++-- src/oblivionscriptextender.h | 37 ++-- 15 files changed, 483 insertions(+), 444 deletions(-) create mode 100644 .clang-format create mode 100644 .gitattributes diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..6098e1f --- /dev/null +++ b/.clang-format @@ -0,0 +1,41 @@ +--- +# We'll use defaults from the LLVM style, but with 4 columns indentation. +BasedOnStyle: LLVM +IndentWidth: 2 +--- +Language: Cpp +DeriveLineEnding: false +UseCRLF: true +DerivePointerAlignment: false +PointerAlignment: Left +AlignConsecutiveAssignments: true +AllowShortFunctionsOnASingleLine: Inline +AllowShortIfStatementsOnASingleLine: Never +AllowShortLambdasOnASingleLine: Empty +AlwaysBreakTemplateDeclarations: Yes +AccessModifierOffset: -2 +AlignTrailingComments: true +SpacesBeforeTrailingComments: 2 +NamespaceIndentation: Inner +MaxEmptyLinesToKeep: 1 +BreakBeforeBraces: Custom +BraceWrapping: + AfterCaseLabel: false + AfterClass: true + AfterControlStatement: false + AfterEnum: true + AfterFunction: true + AfterNamespace: true + AfterStruct: true + AfterUnion: true + AfterExternBlock: true + BeforeCatch: false + BeforeElse: false + BeforeLambdaBody: false + BeforeWhile: false + IndentBraces: false + SplitEmptyFunction: false + SplitEmptyRecord: false + SplitEmptyNamespace: true +ColumnLimit: 88 +ForEachMacros: ['Q_FOREACH', 'foreach'] diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f869712 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,7 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +*.cpp text eol=crlf +*.h text eol=crlf diff --git a/src/gameoblivion.cpp b/src/gameoblivion.cpp index 6d8a1e9..537948d 100644 --- a/src/gameoblivion.cpp +++ b/src/gameoblivion.cpp @@ -1,189 +1,193 @@ -#include "gameoblivion.h" - -#include "oblivionbsainvalidation.h" -#include "obliviondataarchives.h" -#include "oblivionscriptextender.h" -#include "oblivionmoddatachecker.h" -#include "oblivionmoddatacontent.h" -#include "oblivionsavegame.h" - -#include "pluginsetting.h" -#include "executableinfo.h" -#include -#include -#include -#include - -#include -#include -#include - -#include - -using namespace MOBase; - -GameOblivion::GameOblivion() -{ -} - -bool GameOblivion::init(IOrganizer *moInfo) -{ - if (!GameGamebryo::init(moInfo)) { - return false; - } - - auto dataArchives = std::make_shared(myGamesPath()); - registerFeature(std::make_shared(this)); - registerFeature(dataArchives); - registerFeature(std::make_shared(dataArchives.get(), this)); - registerFeature(std::make_shared(this)); - registerFeature(std::make_shared(myGamesPath(), "oblivion.ini")); - registerFeature(std::make_shared(this)); - registerFeature(std::make_shared(m_Organizer->gameFeatures())); - registerFeature(std::make_shared(moInfo)); - registerFeature(std::make_shared(this)); - return true; -} - -QString GameOblivion::gameName() const -{ - return "Oblivion"; -} - -QList GameOblivion::executables() const -{ - return QList() - << ExecutableInfo("Oblivion", findInGameFolder(binaryName())) - << ExecutableInfo("Oblivion Launcher", findInGameFolder(getLauncherName())) - << ExecutableInfo("Oblivion Mod Manager", findInGameFolder("OblivionModManager.exe")) - << ExecutableInfo("BOSS", findInGameFolder("BOSS/BOSS.exe")) - << ExecutableInfo("LOOT", QFileInfo(getLootPath())).withArgument("--game=\"Oblivion\"") - << ExecutableInfo("Construction Set", findInGameFolder("TESConstructionSet.exe")) - ; -} - -QList GameOblivion::executableForcedLoads() const -{ - return QList() - << ExecutableForcedLoadSetting("Oblivion.exe", "obse_1_2_416.dll").withForced().withEnabled() - << ExecutableForcedLoadSetting("TESConstructionSet.exe", "obse_editor_1_2.dll").withForced().withEnabled() - ; -} - -QString GameOblivion::name() const -{ - return "Oblivion Support Plugin"; -} - -QString GameOblivion::localizedName() const -{ - return tr("Oblivion Support Plugin"); -} - -QString GameOblivion::author() const -{ - return "Tannin & MO2 Team"; -} - -QString GameOblivion::description() const -{ - return tr("Adds support for the game Oblivion"); -} - -MOBase::VersionInfo GameOblivion::version() const -{ - return VersionInfo(1, 6, 1, VersionInfo::RELEASE_FINAL); -} - -QList GameOblivion::settings() const -{ - return { - PluginSetting("nehrim_downloads", "allow Nehrim downloads", QVariant(false)) - }; -} - -void GameOblivion::initializeProfile(const QDir &path, ProfileSettings settings) const -{ - if (settings.testFlag(IPluginGame::MODS)) { - copyToProfile(localAppFolder() + "/Oblivion", path, "plugins.txt"); - } - - if (settings.testFlag(IPluginGame::CONFIGURATION)) { - if (settings.testFlag(IPluginGame::PREFER_DEFAULTS) - || !QFileInfo(myGamesPath() + "/oblivion.ini").exists()) { - copyToProfile(gameDirectory().absolutePath(), path, "oblivion_default.ini", "oblivion.ini"); - } else { - copyToProfile(myGamesPath(), path, "oblivion.ini"); - } - - copyToProfile(myGamesPath(), path, "oblivionprefs.ini"); - } -} - -QString GameOblivion::savegameExtension() const -{ - return "ess"; -} - -QString GameOblivion::savegameSEExtension() const -{ - return "obse"; -} - -std::shared_ptr GameOblivion::makeSaveGame(QString filePath) const -{ - return std::make_shared(filePath, this); -} - -QString GameOblivion::steamAPPId() const -{ - return "22330"; -} - -QStringList GameOblivion::primaryPlugins() const -{ - return { "oblivion.esm", "update.esm" }; -} - -QString GameOblivion::gameShortName() const -{ - return "Oblivion"; -} - -QStringList GameOblivion::validShortNames() const -{ - QStringList shortNames; - if (m_Organizer->pluginSetting(name(), "nehrim_downloads").toBool()) { - shortNames.append( "Nehrim" ); - } - return shortNames; -} - -QString GameOblivion::gameNexusName() const -{ - return "Oblivion"; -} - - -QStringList GameOblivion::iniFiles() const -{ - return { "oblivion.ini", "oblivionprefs.ini" }; -} - -QStringList GameOblivion::DLCPlugins() const -{ - return { "DLCBattlehornCastle.esp", "DLCShiveringIsles.esp", "Knights.esp", "DLCFrostcrag.esp", - "DLCSpellTomes.esp", "DLCMehrunesRazor.esp", "DLCOrrery.esp", - "DLCThievesDen.esp", "DLCVileLair.esp", "DLCHorseArmor.esp" }; -} - - -int GameOblivion::nexusModOrganizerID() const -{ - return 38277; -} - -int GameOblivion::nexusGameID() const -{ - return 101; -} +#include "gameoblivion.h" + +#include "oblivionbsainvalidation.h" +#include "obliviondataarchives.h" +#include "oblivionmoddatachecker.h" +#include "oblivionmoddatacontent.h" +#include "oblivionsavegame.h" +#include "oblivionscriptextender.h" + +#include "executableinfo.h" +#include "pluginsetting.h" +#include +#include +#include +#include + +#include +#include +#include + +#include + +using namespace MOBase; + +GameOblivion::GameOblivion() {} + +bool GameOblivion::init(IOrganizer* moInfo) +{ + if (!GameGamebryo::init(moInfo)) { + return false; + } + + auto dataArchives = std::make_shared(myGamesPath()); + registerFeature(std::make_shared(this)); + registerFeature(dataArchives); + registerFeature(std::make_shared(dataArchives.get(), this)); + registerFeature(std::make_shared(this)); + registerFeature( + std::make_shared(myGamesPath(), "oblivion.ini")); + registerFeature(std::make_shared(this)); + registerFeature( + std::make_shared(m_Organizer->gameFeatures())); + registerFeature(std::make_shared(moInfo)); + registerFeature(std::make_shared(this)); + return true; +} + +QString GameOblivion::gameName() const +{ + return "Oblivion"; +} + +QList GameOblivion::executables() const +{ + return QList() + << ExecutableInfo("Oblivion", findInGameFolder(binaryName())) + << ExecutableInfo("Oblivion Launcher", findInGameFolder(getLauncherName())) + << ExecutableInfo("Oblivion Mod Manager", + findInGameFolder("OblivionModManager.exe")) + << ExecutableInfo("BOSS", findInGameFolder("BOSS/BOSS.exe")) + << ExecutableInfo("LOOT", QFileInfo(getLootPath())) + .withArgument("--game=\"Oblivion\"") + << ExecutableInfo("Construction Set", + findInGameFolder("TESConstructionSet.exe")); +} + +QList GameOblivion::executableForcedLoads() const +{ + return QList() + << ExecutableForcedLoadSetting("Oblivion.exe", "obse_1_2_416.dll") + .withForced() + .withEnabled() + << ExecutableForcedLoadSetting("TESConstructionSet.exe", "obse_editor_1_2.dll") + .withForced() + .withEnabled(); +} + +QString GameOblivion::name() const +{ + return "Oblivion Support Plugin"; +} + +QString GameOblivion::localizedName() const +{ + return tr("Oblivion Support Plugin"); +} + +QString GameOblivion::author() const +{ + return "Tannin & MO2 Team"; +} + +QString GameOblivion::description() const +{ + return tr("Adds support for the game Oblivion"); +} + +MOBase::VersionInfo GameOblivion::version() const +{ + return VersionInfo(1, 6, 1, VersionInfo::RELEASE_FINAL); +} + +QList GameOblivion::settings() const +{ + return {PluginSetting("nehrim_downloads", "allow Nehrim downloads", QVariant(false))}; +} + +void GameOblivion::initializeProfile(const QDir& path, ProfileSettings settings) const +{ + if (settings.testFlag(IPluginGame::MODS)) { + copyToProfile(localAppFolder() + "/Oblivion", path, "plugins.txt"); + } + + if (settings.testFlag(IPluginGame::CONFIGURATION)) { + if (settings.testFlag(IPluginGame::PREFER_DEFAULTS) || + !QFileInfo(myGamesPath() + "/oblivion.ini").exists()) { + copyToProfile(gameDirectory().absolutePath(), path, "oblivion_default.ini", + "oblivion.ini"); + } else { + copyToProfile(myGamesPath(), path, "oblivion.ini"); + } + + copyToProfile(myGamesPath(), path, "oblivionprefs.ini"); + } +} + +QString GameOblivion::savegameExtension() const +{ + return "ess"; +} + +QString GameOblivion::savegameSEExtension() const +{ + return "obse"; +} + +std::shared_ptr +GameOblivion::makeSaveGame(QString filePath) const +{ + return std::make_shared(filePath, this); +} + +QString GameOblivion::steamAPPId() const +{ + return "22330"; +} + +QStringList GameOblivion::primaryPlugins() const +{ + return {"oblivion.esm", "update.esm"}; +} + +QString GameOblivion::gameShortName() const +{ + return "Oblivion"; +} + +QStringList GameOblivion::validShortNames() const +{ + QStringList shortNames; + if (m_Organizer->pluginSetting(name(), "nehrim_downloads").toBool()) { + shortNames.append("Nehrim"); + } + return shortNames; +} + +QString GameOblivion::gameNexusName() const +{ + return "Oblivion"; +} + +QStringList GameOblivion::iniFiles() const +{ + return {"oblivion.ini", "oblivionprefs.ini"}; +} + +QStringList GameOblivion::DLCPlugins() const +{ + return {"DLCBattlehornCastle.esp", "DLCShiveringIsles.esp", "Knights.esp", + "DLCFrostcrag.esp", "DLCSpellTomes.esp", "DLCMehrunesRazor.esp", + "DLCOrrery.esp", "DLCThievesDen.esp", "DLCVileLair.esp", + "DLCHorseArmor.esp"}; +} + +int GameOblivion::nexusModOrganizerID() const +{ + return 38277; +} + +int GameOblivion::nexusGameID() const +{ + return 101; +} diff --git a/src/gameoblivion.h b/src/gameoblivion.h index 48b54f5..f68620d 100644 --- a/src/gameoblivion.h +++ b/src/gameoblivion.h @@ -1,53 +1,50 @@ -#ifndef GAMEOBLIVION_H -#define GAMEOBLIVION_H - -#include "gamegamebryo.h" - -#include -#include - -class GameOblivion : public GameGamebryo -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.tannin.GameOblivion" FILE "gameoblivion.json") - -public: - - GameOblivion(); - - virtual bool init(MOBase::IOrganizer *moInfo) override; - -public: // IPluginGame interface - - virtual QString gameName() const override; - virtual QList executables() const override; - virtual QList executableForcedLoads() const override; - virtual void initializeProfile(const QDir &path, ProfileSettings settings) const override; - virtual QString steamAPPId() const override; - virtual QStringList primaryPlugins() const override; - virtual QString gameShortName() const override; - virtual QStringList validShortNames() const override; - virtual QString gameNexusName() const override; - virtual QStringList iniFiles() const override; - virtual QStringList DLCPlugins() const override; - virtual int nexusModOrganizerID() const override; - virtual int nexusGameID() const override; - -public: // IPlugin interface - - virtual QString name() const override; - virtual QString localizedName() const override; - virtual QString author() const override; - virtual QString description() const override; - virtual MOBase::VersionInfo version() const override; - virtual QList settings() const override; - -protected: - - std::shared_ptr makeSaveGame(QString filePath) const override; - QString savegameExtension() const override; - QString savegameSEExtension() const override; - -}; - -#endif // GAMEOBLIVION_H +#ifndef GAMEOBLIVION_H +#define GAMEOBLIVION_H + +#include "gamegamebryo.h" + +#include +#include + +class GameOblivion : public GameGamebryo +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.tannin.GameOblivion" FILE "gameoblivion.json") + +public: + GameOblivion(); + + virtual bool init(MOBase::IOrganizer* moInfo) override; + +public: // IPluginGame interface + virtual QString gameName() const override; + virtual QList executables() const override; + virtual QList + executableForcedLoads() const override; + virtual void initializeProfile(const QDir& path, + ProfileSettings settings) const override; + virtual QString steamAPPId() const override; + virtual QStringList primaryPlugins() const override; + virtual QString gameShortName() const override; + virtual QStringList validShortNames() const override; + virtual QString gameNexusName() const override; + virtual QStringList iniFiles() const override; + virtual QStringList DLCPlugins() const override; + virtual int nexusModOrganizerID() const override; + virtual int nexusGameID() const override; + +public: // IPlugin interface + virtual QString name() const override; + virtual QString localizedName() const override; + virtual QString author() const override; + virtual QString description() const override; + virtual MOBase::VersionInfo version() const override; + virtual QList settings() const override; + +protected: + std::shared_ptr makeSaveGame(QString filePath) const override; + QString savegameExtension() const override; + QString savegameSEExtension() const override; +}; + +#endif // GAMEOBLIVION_H diff --git a/src/oblivionbsainvalidation.cpp b/src/oblivionbsainvalidation.cpp index 8000d08..864d37c 100644 --- a/src/oblivionbsainvalidation.cpp +++ b/src/oblivionbsainvalidation.cpp @@ -1,17 +1,16 @@ -#include "oblivionbsainvalidation.h" - - -OblivionBSAInvalidation::OblivionBSAInvalidation(MOBase::DataArchives *dataArchives, MOBase::IPluginGame const *game) - : GamebryoBSAInvalidation(dataArchives, "oblivion.ini", game) -{ -} - -QString OblivionBSAInvalidation::invalidationBSAName() const -{ - return "Oblivion - Invalidation.bsa"; -} - -unsigned long OblivionBSAInvalidation::bsaVersion() const -{ - return 0x67; -} +#include "oblivionbsainvalidation.h" + +OblivionBSAInvalidation::OblivionBSAInvalidation(MOBase::DataArchives* dataArchives, + MOBase::IPluginGame const* game) + : GamebryoBSAInvalidation(dataArchives, "oblivion.ini", game) +{} + +QString OblivionBSAInvalidation::invalidationBSAName() const +{ + return "Oblivion - Invalidation.bsa"; +} + +unsigned long OblivionBSAInvalidation::bsaVersion() const +{ + return 0x67; +} diff --git a/src/oblivionbsainvalidation.h b/src/oblivionbsainvalidation.h index 91bd4d1..6804748 100644 --- a/src/oblivionbsainvalidation.h +++ b/src/oblivionbsainvalidation.h @@ -1,23 +1,20 @@ -#ifndef OBLIVIONBSAINVALIDATION_H -#define OBLIVIONBSAINVALIDATION_H - - -#include "gamebryobsainvalidation.h" -#include "obliviondataarchives.h" - -#include - -class OblivionBSAInvalidation : public GamebryoBSAInvalidation -{ -public: - - OblivionBSAInvalidation(MOBase::DataArchives *dataArchives, MOBase::IPluginGame const *game); - -private: - - virtual QString invalidationBSAName() const override; - virtual unsigned long bsaVersion() const override; - -}; - -#endif // OBLIVIONBSAINVALIDATION_H +#ifndef OBLIVIONBSAINVALIDATION_H +#define OBLIVIONBSAINVALIDATION_H + +#include "gamebryobsainvalidation.h" +#include "obliviondataarchives.h" + +#include + +class OblivionBSAInvalidation : public GamebryoBSAInvalidation +{ +public: + OblivionBSAInvalidation(MOBase::DataArchives* dataArchives, + MOBase::IPluginGame const* game); + +private: + virtual QString invalidationBSAName() const override; + virtual unsigned long bsaVersion() const override; +}; + +#endif // OBLIVIONBSAINVALIDATION_H diff --git a/src/obliviondataarchives.cpp b/src/obliviondataarchives.cpp index 51d35e1..cb44de1 100644 --- a/src/obliviondataarchives.cpp +++ b/src/obliviondataarchives.cpp @@ -1,36 +1,36 @@ -#include "obliviondataarchives.h" -#include - -OblivionDataArchives::OblivionDataArchives(const QDir &myGamesDir) : - GamebryoDataArchives(myGamesDir) -{ -} - -QStringList OblivionDataArchives::vanillaArchives() const -{ - return { "Oblivion - Misc.bsa" - , "Oblivion - Textures - Compressed.bsa" - , "Oblivion - Meshes.bsa" - , "Oblivion - Sounds.bsa" - , "Oblivion - Voices1.bsa" - , "Oblivion - Voices2.bsa" - }; -} - -QStringList OblivionDataArchives::archives(const MOBase::IProfile *profile) const -{ - QStringList result; - - QString iniFile = profile->localSettingsEnabled() ? QDir(profile->absolutePath()).absoluteFilePath("oblivion.ini") : m_LocalGameDir.absoluteFilePath("oblivion.ini"); - result.append(getArchivesFromKey(iniFile, "SArchiveList")); - - return result; -} - -void OblivionDataArchives::writeArchiveList(MOBase::IProfile *profile, const QStringList &before) -{ - QString list = before.join(", "); - - QString iniFile = profile->localSettingsEnabled() ? QDir(profile->absolutePath()).absoluteFilePath("oblivion.ini") : m_LocalGameDir.absoluteFilePath("oblivion.ini"); - setArchivesToKey(iniFile, "SArchiveList", list); -} +#include "obliviondataarchives.h" +#include + +OblivionDataArchives::OblivionDataArchives(const QDir& myGamesDir) + : GamebryoDataArchives(myGamesDir) +{} + +QStringList OblivionDataArchives::vanillaArchives() const +{ + return {"Oblivion - Misc.bsa", "Oblivion - Textures - Compressed.bsa", + "Oblivion - Meshes.bsa", "Oblivion - Sounds.bsa", + "Oblivion - Voices1.bsa", "Oblivion - Voices2.bsa"}; +} + +QStringList OblivionDataArchives::archives(const MOBase::IProfile* profile) const +{ + QStringList result; + + QString iniFile = profile->localSettingsEnabled() + ? QDir(profile->absolutePath()).absoluteFilePath("oblivion.ini") + : m_LocalGameDir.absoluteFilePath("oblivion.ini"); + result.append(getArchivesFromKey(iniFile, "SArchiveList")); + + return result; +} + +void OblivionDataArchives::writeArchiveList(MOBase::IProfile* profile, + const QStringList& before) +{ + QString list = before.join(", "); + + QString iniFile = profile->localSettingsEnabled() + ? QDir(profile->absolutePath()).absoluteFilePath("oblivion.ini") + : m_LocalGameDir.absoluteFilePath("oblivion.ini"); + setArchivesToKey(iniFile, "SArchiveList", list); +} diff --git a/src/obliviondataarchives.h b/src/obliviondataarchives.h index c266831..a89e2c5 100644 --- a/src/obliviondataarchives.h +++ b/src/obliviondataarchives.h @@ -1,28 +1,25 @@ -#ifndef OBLIVIONDATAARCHIVES_H -#define OBLIVIONDATAARCHIVES_H - - -#include -#include -#include -#include -#include - -class OblivionDataArchives : public GamebryoDataArchives -{ - -public: - OblivionDataArchives(const QDir &myGamesDir); - -public: - - virtual QStringList vanillaArchives() const override; - virtual QStringList archives(const MOBase::IProfile *profile) const override; - -private: - - virtual void writeArchiveList(MOBase::IProfile *profile, const QStringList &before) override; - -}; - -#endif // OBLIVIONDATAARCHIVES_H +#ifndef OBLIVIONDATAARCHIVES_H +#define OBLIVIONDATAARCHIVES_H + +#include +#include +#include +#include +#include + +class OblivionDataArchives : public GamebryoDataArchives +{ + +public: + OblivionDataArchives(const QDir& myGamesDir); + +public: + virtual QStringList vanillaArchives() const override; + virtual QStringList archives(const MOBase::IProfile* profile) const override; + +private: + virtual void writeArchiveList(MOBase::IProfile* profile, + const QStringList& before) override; +}; + +#endif // OBLIVIONDATAARCHIVES_H diff --git a/src/oblivionmoddatachecker.cpp b/src/oblivionmoddatachecker.cpp index 58c4870..30a74ee 100644 --- a/src/oblivionmoddatachecker.cpp +++ b/src/oblivionmoddatachecker.cpp @@ -1,7 +1,7 @@ #include "oblivionmoddatachecker.h" MOBase::ModDataChecker::CheckReturn OblivionModDataChecker::dataLooksValid( - std::shared_ptr fileTree) const + std::shared_ptr fileTree) const { // Check with Gamebryo stuff: auto check = GamebryoModDataChecker::dataLooksValid(fileTree); @@ -19,12 +19,12 @@ MOBase::ModDataChecker::CheckReturn OblivionModDataChecker::dataLooksValid( return CheckReturn::FIXABLE; } -std::shared_ptr OblivionModDataChecker::fix( - std::shared_ptr fileTree) const +std::shared_ptr +OblivionModDataChecker::fix(std::shared_ptr fileTree) const { // If we arrive here, it means all files starts with OBSE. auto data = fileTree->createOrphanTree(); auto obse = data->addDirectory("OBSE/Plugins"); obse->merge(fileTree); return data; -} \ No newline at end of file +} diff --git a/src/oblivionmoddatachecker.h b/src/oblivionmoddatachecker.h index 5159dc0..f62d015 100644 --- a/src/oblivionmoddatachecker.h +++ b/src/oblivionmoddatachecker.h @@ -8,25 +8,28 @@ class OblivionModDataChecker : public GamebryoModDataChecker public: using GamebryoModDataChecker::GamebryoModDataChecker; - CheckReturn dataLooksValid(std::shared_ptr fileTree) const override; - std::shared_ptr fix(std::shared_ptr fileTree) const override; + CheckReturn + dataLooksValid(std::shared_ptr fileTree) const override; + std::shared_ptr + fix(std::shared_ptr fileTree) const override; protected: - virtual const FileNameSet& possibleFolderNames() const override { - static FileNameSet result{ - "fonts", "interface", "menus", "meshes", "music", "scripts", "shaders", - "sound", "strings", "textures", "trees", "video", "facegen", - "obse", "distantlod", "asi", "distantland", "mits", "dllplugins", "CalienteTools", - "NetScriptFramework" - }; + virtual const FileNameSet& possibleFolderNames() const override + { + static FileNameSet result{"fonts", "interface", "menus", + "meshes", "music", "scripts", + "shaders", "sound", "strings", + "textures", "trees", "video", + "facegen", "obse", "distantlod", + "asi", "distantland", "mits", + "dllplugins", "CalienteTools", "NetScriptFramework"}; return result; } - virtual const FileNameSet& possibleFileExtensions() const override { - static FileNameSet result{ - "esp", "esm", "bsa", "modgroups", "ini" - }; + virtual const FileNameSet& possibleFileExtensions() const override + { + static FileNameSet result{"esp", "esm", "bsa", "modgroups", "ini"}; return result; } }; -#endif // OBLIVION_MODATACHECKER_H +#endif // OBLIVION_MODATACHECKER_H diff --git a/src/oblivionmoddatacontent.h b/src/oblivionmoddatacontent.h index 75f22bf..4e412d0 100644 --- a/src/oblivionmoddatacontent.h +++ b/src/oblivionmoddatacontent.h @@ -4,18 +4,19 @@ #include #include -class OblivionModDataContent : public GamebryoModDataContent { +class OblivionModDataContent : public GamebryoModDataContent +{ public: - /** * */ - OblivionModDataContent(const MOBase::IGameFeatures* gameFeatures) : GamebryoModDataContent(gameFeatures) { + OblivionModDataContent(const MOBase::IGameFeatures* gameFeatures) + : GamebryoModDataContent(gameFeatures) + { // Just need to disable some contents: - m_Enabled[CONTENT_MCM] = false; + m_Enabled[CONTENT_MCM] = false; m_Enabled[CONTENT_SKYPROC] = false; } - }; -#endif // OBLIVION_MODDATACONTENT_H +#endif // OBLIVION_MODDATACONTENT_H diff --git a/src/oblivionsavegame.cpp b/src/oblivionsavegame.cpp index 52089e8..01520db 100644 --- a/src/oblivionsavegame.cpp +++ b/src/oblivionsavegame.cpp @@ -2,31 +2,32 @@ #include -OblivionSaveGame::OblivionSaveGame(QString const &fileName, GameOblivion const *game) : - GamebryoSaveGame(fileName, game) +OblivionSaveGame::OblivionSaveGame(QString const& fileName, GameOblivion const* game) + : GamebryoSaveGame(fileName, game) { FileWrapper file(getFilepath(), "TES4SAVEGAME"); file.setPluginString(GamebryoSaveGame::StringType::TYPE_BSTRING); SYSTEMTIME creationTime; - fetchInformationFields(file, m_SaveNumber, m_PCName, m_PCLevel, m_PCLocation, creationTime); + fetchInformationFields(file, m_SaveNumber, m_PCName, m_PCLevel, m_PCLocation, + creationTime); setCreationTime(creationTime); } void OblivionSaveGame::fetchInformationFields(FileWrapper& file, - unsigned long& saveNumber, - QString& playerName, - unsigned short& playerLevel, - QString& playerLocation, - SYSTEMTIME& creationTime) const + unsigned long& saveNumber, + QString& playerName, + unsigned short& playerLevel, + QString& playerLocation, + SYSTEMTIME& creationTime) const { - file.skip(); //Major version - file.skip(); //Minor version + file.skip(); // Major version + file.skip(); // Minor version file.skip(); // exe last modified (!) - file.skip(); //Header version - file.skip(); //Header size + file.skip(); // Header version + file.skip(); // Header size file.read(saveNumber); @@ -34,13 +35,13 @@ void OblivionSaveGame::fetchInformationFields(FileWrapper& file, file.read(playerLevel); file.read(playerLocation); - file.skip(); //game days - file.skip(); //game ticks + file.skip(); // game days + file.skip(); // game ticks - //there is a save time stored here. So use it rather than the file time, which - //could have been copied. - //Note: This says it uses getlocaltime api to obtain it which is u/s - if so - //we should ignore this. + // there is a save time stored here. So use it rather than the file time, which + // could have been copied. + // Note: This says it uses getlocaltime api to obtain it which is u/s - if so + // we should ignore this. file.read(creationTime); } @@ -57,13 +58,13 @@ std::unique_ptr OblivionSaveGame::fetchDataFields( unsigned long dummySaveNumber; SYSTEMTIME dummyTime; - fetchInformationFields(file, dummySaveNumber, dummyName, dummyLevel, - dummyLocation, dummyTime); + fetchInformationFields(file, dummySaveNumber, dummyName, dummyLevel, dummyLocation, + dummyTime); } - //Note that screenshot size, width, height and data are apparently the same - //structure - file.skip(); //Screenshot size. + // Note that screenshot size, width, height and data are apparently the same + // structure + file.skip(); // Screenshot size. fields->Screenshot = file.readImage(); diff --git a/src/oblivionsavegame.h b/src/oblivionsavegame.h index 0c9de37..de7bfd1 100644 --- a/src/oblivionsavegame.h +++ b/src/oblivionsavegame.h @@ -7,19 +7,15 @@ class OblivionSaveGame : public GamebryoSaveGame { public: - OblivionSaveGame(QString const &fileName, GameOblivion const *game); + OblivionSaveGame(QString const& fileName, GameOblivion const* game); protected: - // Fetch easy-to-access information. - void fetchInformationFields(FileWrapper& wrapper, - unsigned long& saveNumber, - QString& playerName, - unsigned short& playerLevel, - QString& playerLocation, - SYSTEMTIME& creationTime) const; + void fetchInformationFields(FileWrapper& wrapper, unsigned long& saveNumber, + QString& playerName, unsigned short& playerLevel, + QString& playerLocation, SYSTEMTIME& creationTime) const; std::unique_ptr fetchDataFields() const override; }; -#endif // OBLIVIONSAVEGAME_H +#endif // OBLIVIONSAVEGAME_H diff --git a/src/oblivionscriptextender.cpp b/src/oblivionscriptextender.cpp index 8d18c1d..f021a2e 100644 --- a/src/oblivionscriptextender.cpp +++ b/src/oblivionscriptextender.cpp @@ -1,23 +1,20 @@ -#include "oblivionscriptextender.h" - -#include -#include - -OblivionScriptExtender::OblivionScriptExtender(GameGamebryo const *game) : - GamebryoScriptExtender(game) -{ -} - -OblivionScriptExtender::~OblivionScriptExtender() -{ -} - -QString OblivionScriptExtender::BinaryName() const -{ - return "obse_loader.exe"; -} - -QString OblivionScriptExtender::PluginPath() const -{ - return "obse/plugins"; -} +#include "oblivionscriptextender.h" + +#include +#include + +OblivionScriptExtender::OblivionScriptExtender(GameGamebryo const* game) + : GamebryoScriptExtender(game) +{} + +OblivionScriptExtender::~OblivionScriptExtender() {} + +QString OblivionScriptExtender::BinaryName() const +{ + return "obse_loader.exe"; +} + +QString OblivionScriptExtender::PluginPath() const +{ + return "obse/plugins"; +} diff --git a/src/oblivionscriptextender.h b/src/oblivionscriptextender.h index 5155b55..1044bfa 100644 --- a/src/oblivionscriptextender.h +++ b/src/oblivionscriptextender.h @@ -1,19 +1,18 @@ -#ifndef OBLIVIONSCRIPTEXTENDER_H -#define OBLIVIONSCRIPTEXTENDER_H - -#include "gamebryoscriptextender.h" - -class GameGamebryo; - -class OblivionScriptExtender : public GamebryoScriptExtender -{ -public: - OblivionScriptExtender(const GameGamebryo *game); - ~OblivionScriptExtender(); - - virtual QString BinaryName() const override; - virtual QString PluginPath() const override; - -}; - -#endif // OBLIVIONSCRIPTEXTENDER_H +#ifndef OBLIVIONSCRIPTEXTENDER_H +#define OBLIVIONSCRIPTEXTENDER_H + +#include "gamebryoscriptextender.h" + +class GameGamebryo; + +class OblivionScriptExtender : public GamebryoScriptExtender +{ +public: + OblivionScriptExtender(const GameGamebryo* game); + ~OblivionScriptExtender(); + + virtual QString BinaryName() const override; + virtual QString PluginPath() const override; +}; + +#endif // OBLIVIONSCRIPTEXTENDER_H