mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2026-01-24 07:14:31 +01:00
Adopt existing namespaces into OpenRCT2 namespace (#22368)
* Put all of TitleSequenceManager into the same namespace * Move RideConstructionState into the OpenRCT2 namespace * Adopt existing namespaces into OpenRCT2 namespace This adds `using namespace OpenRCT2` to compilation units where appropriate, as a means to get the codebase to compile until these units have been placed in a namespace of their own.
This commit is contained in:
@@ -22,8 +22,6 @@
|
||||
# pragma warning(disable : 4996)
|
||||
#endif
|
||||
|
||||
using namespace OpenRCT2;
|
||||
|
||||
void StdInOutConsole::Start()
|
||||
{
|
||||
// Only start if stdin/stdout is a TTY
|
||||
@@ -70,7 +68,7 @@ void StdInOutConsole::Start()
|
||||
std::future<void> StdInOutConsole::Eval(const std::string& s)
|
||||
{
|
||||
#ifdef ENABLE_SCRIPTING
|
||||
auto& scriptEngine = GetContext()->GetScriptEngine();
|
||||
auto& scriptEngine = OpenRCT2::GetContext()->GetScriptEngine();
|
||||
return scriptEngine.Eval(s);
|
||||
#else
|
||||
// Push on-demand evaluations onto a queue so that it can be processed deterministically
|
||||
@@ -125,7 +123,7 @@ void StdInOutConsole::WriteLine(const std::string& s, FormatToken colourFormat)
|
||||
break;
|
||||
}
|
||||
|
||||
if (!Platform::IsColourTerminalSupported())
|
||||
if (!OpenRCT2::Platform::IsColourTerminalSupported())
|
||||
{
|
||||
std::printf("%s\n", s.c_str());
|
||||
std::fflush(stdout);
|
||||
|
||||
Reference in New Issue
Block a user