Skip to content

Commit fddaa3e

Browse files
Undo formatting
1 parent 85e207c commit fddaa3e

1 file changed

Lines changed: 16 additions & 17 deletions

File tree

src/OMODFrameworkWrapper.cpp

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ fs::path getPluginFolder()
4343
HMODULE hm = NULL;
4444

4545
if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
46-
GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
47-
(LPCWSTR)&getPluginFolder, &hm) == 0)
46+
GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
47+
(LPCWSTR)&getPluginFolder, &hm) == 0)
4848
{
4949
return {};
5050
}
@@ -136,8 +136,7 @@ ref class InstallInAnotherThreadHelper
136136
, mOwner(owner)
137137
, mExceptionPtr(new std::exception_ptr)
138138
, mHasResult(false)
139-
{
140-
}
139+
{}
141140

142141
~InstallInAnotherThreadHelper()
143142
{
@@ -301,7 +300,7 @@ OMODFrameworkWrapper::EInstallResult OMODFrameworkWrapper::install(MOBase::Guess
301300

302301
System::String^ dataPath = omod.GetDataFiles();
303302
System::String^ pluginsPath = omod.GetPlugins();
304-
OMODFramework::ScriptReturnData^ scriptData = OMODFramework::Scripting::ScriptRunner::RunScript(% omod, scriptFunctions, dataPath, pluginsPath);
303+
OMODFramework::ScriptReturnData^ scriptData = OMODFramework::Scripting::ScriptRunner::RunScript(%omod, scriptFunctions, dataPath, pluginsPath);
305304
if (!scriptData)
306305
throw std::runtime_error("OMOD script returned no result. This isn't supposed to happen.");
307306
if (scriptData->CancelInstall)
@@ -395,7 +394,7 @@ OMODFrameworkWrapper::EInstallResult OMODFrameworkWrapper::install(MOBase::Guess
395394
}
396395
}
397396

398-
scriptData->Pretty(% omod, dataPath, pluginsPath);
397+
scriptData->Pretty(%omod, dataPath, pluginsPath);
399398
// no compatability between auto and var makes me :angery:
400399
System::Collections::Generic::HashSet<System::String^>^ installedPlugins = gcnew System::Collections::Generic::HashSet<System::String^>(System::StringComparer::InvariantCultureIgnoreCase);
401400
for each (OMODFramework::InstallFile file in scriptData->InstallFiles)
@@ -552,11 +551,11 @@ void OMODFrameworkWrapper::onInstallationEnd(EInstallResult status, MOBase::IMod
552551
if (!omodsPendingPostInstall.empty() && !(mMoInfo->modList()->state(mod->name()) & MOBase::IModList::STATE_ACTIVE))
553552
{
554553
auto response = QMessageBox::question(mParentWidget, tr("Activate mod?"),
555-
/*: %1 is the left-pane mod name.
556-
%2 is the name from the metadata of an OMOD.
557-
*/
558-
tr("%1 contains the OMOD %2. OMODs may have post-installation actions like activating ESPs. Would you like to enable the mod so this can happen now?").arg(mod->name()).arg(omodsPendingPostInstall[0]),
559-
QMessageBox::Yes | QMessageBox::No);
554+
/*: %1 is the left-pane mod name.
555+
%2 is the name from the metadata of an OMOD.
556+
*/
557+
tr("%1 contains the OMOD %2. OMODs may have post-installation actions like activating ESPs. Would you like to enable the mod so this can happen now?").arg(mod->name()).arg(omodsPendingPostInstall[0]),
558+
QMessageBox::Yes | QMessageBox::No);
560559

561560
if (response == QMessageBox::StandardButton::Yes)
562561
mMoInfo->modList()->setActive(mod->name(), true);
@@ -665,12 +664,12 @@ void OMODFrameworkWrapper::onInstallationEnd(EInstallResult status, MOBase::IMod
665664
{
666665
MOBase::log::debug("OMOD wants to register BSAs. We can't do that.");
667666
QMessageBox::warning(mParentWidget, tr("Register BSAs"),
668-
/*: %1 is the OMOD name
669-
<ul><li>%2</li></ul> becomes a list of BSA files
670-
*/
671-
tr("%1 wants to register the following BSA archives, but Mod Organizer 2 can't do that yet due to technical limitations:<ul><li>%2</li></ul>For now, your options include adding the BSA names to <code>sResourceArchiveList</code> in the game INI, creating a dummy ESP with the same name, or extracting the BSA, all of which have drawbacks.")
672-
.arg(omodName).arg(registeredBSAs.join("</li><li>"))
673-
);
667+
/*: %1 is the OMOD name
668+
<ul><li>%2</li></ul> becomes a list of BSA files
669+
*/
670+
tr("%1 wants to register the following BSA archives, but Mod Organizer 2 can't do that yet due to technical limitations:<ul><li>%2</li></ul>For now, your options include adding the BSA names to <code>sResourceArchiveList</code> in the game INI, creating a dummy ESP with the same name, or extracting the BSA, all of which have drawbacks.")
671+
.arg(omodName).arg(registeredBSAs.join("</li><li>"))
672+
);
674673
}
675674
}
676675

0 commit comments

Comments
 (0)