mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 23:33:04 +01:00
Code Issues Releases Wiki Activity

format new files

Browse Source 
Since many of the changes were made before the clang-format changes went live, the new source files used a different format still. This PR applies the new style to all the new source files.
This commit is contained in:
Hielke Morsink
2018-07-31 17:59:48 +02:00
committed by Ted John
parent c37d7d859e
commit e8bdb95f13
24 changed files with 409 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/openrct2/scripting/ScriptEngine.cpp
View File

@@ -8,28 +8,29 @@
*****************************************************************************/
#include "ScriptEngine.h"
#include "../PlatformEnvironment.h"
#include "../core/FileScanner.h"
#include "../core/Path.hpp"
#include "../interface/InteractiveConsole.h"
#include "../platform/Platform2.h"
#include "../PlatformEnvironment.h"
#include <dukglue/dukglue.h>
#include <duktape.h>
#include <iostream>
#include <stdexcept>
#include "ScConsole.hpp"
#include "ScContext.hpp"
#include "ScDisposable.hpp"
#include "ScMap.hpp"
#include "ScPark.hpp"
#include "ScTile.hpp"
#include "ScThing.hpp"
#include "ScTile.hpp"
#include <dukglue/dukglue.h>
#include <duktape.h>
#include <iostream>
#include <stdexcept>
using namespace OpenRCT2;
using namespace OpenRCT2::Scripting;
static std::string Stringify(duk_context * ctx, duk_idx_t idx);
static std::string Stringify(duk_context* ctx, duk_idx_t idx);
DukContext::DukContext()
{
@@ -45,10 +46,10 @@ DukContext::~DukContext()
duk_destroy_heap(_context);
}
ScriptEngine::ScriptEngine(InteractiveConsole& console, IPlatformEnvironment& env) :
_console(console),
_env(env),
_hookEngine(_execInfo)
ScriptEngine::ScriptEngine(InteractiveConsole& console, IPlatformEnvironment& env)
: _console(console)
, _env(env)
, _hookEngine(_execInfo)
{
}
@@ -88,7 +89,7 @@ void ScriptEngine::LoadPlugins()
plugin->Load();
_plugins.push_back(std::move(plugin));
}
catch (const std::exception &e)
catch (const std::exception& e)
{
_console.WriteLineError(e.what());
}
@@ -98,12 +99,10 @@ void ScriptEngine::LoadPlugins()
{
// Enable hot reloading
_pluginFileWatcher = std::make_unique<FileWatcher>(base);
_pluginFileWatcher->OnFileChanged =
[this](const std::string &path)
{
std::lock_guard<std::mutex> guard(_changedPluginFilesMutex);
_changedPluginFiles.push_back(path);
};
_pluginFileWatcher->OnFileChanged = [this](const std::string& path) {
std::lock_guard<std::mutex> guard(_changedPluginFilesMutex);
_changedPluginFiles.push_back(path);
};
}
catch (const std::exception& e)
{
@@ -118,11 +117,9 @@ void ScriptEngine::AutoReloadPlugins()
std::lock_guard<std::mutex> guard(_changedPluginFilesMutex);
for (auto& path : _changedPluginFiles)
{
auto findResult = std::find_if(_plugins.begin(), _plugins.end(),
[&path](const std::shared_ptr<Plugin>& plugin)
{
return Path::Equals(path, plugin->GetPath());
});
auto findResult = std::find_if(_plugins.begin(), _plugins.end(), [&path](const std::shared_ptr<Plugin>& plugin) {
return Path::Equals(path, plugin->GetPath());
});
if (findResult != _plugins.end())
{
auto& plugin = *findResult;
@@ -134,7 +131,7 @@ void ScriptEngine::AutoReloadPlugins()
plugin->Load();
plugin->Start();
}
catch (const std::exception &e)
catch (const std::exception& e)
{
_console.WriteLineError(e.what());
}
@@ -153,7 +150,7 @@ void ScriptEngine::StartPlugins()
{
plugin->Start();
}
catch (const std::exception &e)
catch (const std::exception& e)
{
_console.WriteLineError(e.what());
}
@@ -196,7 +193,7 @@ void ScriptEngine::Update()
}
}
std::future<void> ScriptEngine::Eval(const std::string &s)
std::future<void> ScriptEngine::Eval(const std::string& s)
{
std::promise<void> barrier;
auto future = barrier.get_future();
@@ -204,7 +201,7 @@ std::future<void> ScriptEngine::Eval(const std::string &s)
return future;
}
static std::string Stringify(duk_context * ctx, duk_idx_t idx)
static std::string Stringify(duk_context* ctx, duk_idx_t idx)
{
auto type = duk_get_type(ctx, idx);
if (type == DUK_TYPE_OBJECT && !duk_is_function(ctx, idx))