aboutsummaryrefslogtreecommitdiff
path: root/primedev/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'primedev/plugins')
-rw-r--r--primedev/plugins/interfaces/IPluginId.h1
-rw-r--r--primedev/plugins/interfaces/interface.cpp1
-rw-r--r--primedev/plugins/interfaces/sys/ISys.cpp1
-rw-r--r--primedev/plugins/plugins.cpp11
-rw-r--r--primedev/plugins/plugins.h3
5 files changed, 14 insertions, 3 deletions
diff --git a/primedev/plugins/interfaces/IPluginId.h b/primedev/plugins/interfaces/IPluginId.h
index dc4c548b..0b025224 100644
--- a/primedev/plugins/interfaces/IPluginId.h
+++ b/primedev/plugins/interfaces/IPluginId.h
@@ -18,6 +18,7 @@ enum class PluginString : int
enum class PluginField : int
{
CONTEXT = 0,
+ COLOR = 1,
};
// an interface that is required from every plugin to query data about it
diff --git a/primedev/plugins/interfaces/interface.cpp b/primedev/plugins/interfaces/interface.cpp
index bc900542..e8200560 100644
--- a/primedev/plugins/interfaces/interface.cpp
+++ b/primedev/plugins/interfaces/interface.cpp
@@ -1,4 +1,5 @@
#include <string.h>
+#include "core/tier1.h"
#include "interface.h"
InterfaceReg* s_pInterfaceRegs;
diff --git a/primedev/plugins/interfaces/sys/ISys.cpp b/primedev/plugins/interfaces/sys/ISys.cpp
index 6b0b41dd..948e7d90 100644
--- a/primedev/plugins/interfaces/sys/ISys.cpp
+++ b/primedev/plugins/interfaces/sys/ISys.cpp
@@ -1,3 +1,4 @@
+#include "core/tier1.h"
#include "plugins/interfaces/interface.h"
#include "ISys.h"
#include "plugins/plugins.h"
diff --git a/primedev/plugins/plugins.cpp b/primedev/plugins/plugins.cpp
index 92be9d5c..3e623167 100644
--- a/primedev/plugins/plugins.cpp
+++ b/primedev/plugins/plugins.cpp
@@ -2,7 +2,6 @@
#include "pluginmanager.h"
#include "squirrel/squirrel.h"
#include "util/wininfo.h"
-#include "core/sourceinterface.h"
#include "logging/logging.h"
#include "dedicated/dedicated.h"
@@ -24,6 +23,7 @@ bool isValidSquirrelIdentifier(std::string s)
Plugin::Plugin(std::string path)
: m_location(path)
+ , m_logColor(NS::Colors::PLUGIN)
{
HMODULE pluginModule = GetModuleHandleA(path.c_str());
@@ -70,6 +70,13 @@ Plugin::Plugin(std::string path)
m_runOnServer = context & PluginContext::DEDICATED;
m_runOnClient = context & PluginContext::CLIENT;
+ int64_t logColor = m_pluginId->GetField(PluginField::COLOR);
+ // Apply custom colour if plugin has specified one
+ if ((logColor & 0xFFFFFF) != 0)
+ {
+ m_logColor = Color((int)(logColor & 0xFF), (int)((logColor >> 8) & 0xFF), (int)((logColor >> 16) & 0xFF));
+ }
+
if (!name)
{
NS::log::PLUGINSYS->error("Could not load name of plugin at '{}'", path);
@@ -106,7 +113,7 @@ Plugin::Plugin(std::string path)
return;
}
- m_logger = std::make_shared<ColoredLogger>(m_logName, NS::Colors::PLUGIN);
+ m_logger = std::make_shared<ColoredLogger>(m_logName, m_logColor);
RegisterLogger(m_logger);
if (IsDedicatedServer() && !m_runOnServer)
diff --git a/primedev/plugins/plugins.h b/primedev/plugins/plugins.h
index d004038c..95ec08b5 100644
--- a/primedev/plugins/plugins.h
+++ b/primedev/plugins/plugins.h
@@ -1,5 +1,5 @@
#pragma once
-#include "core/sourceinterface.h"
+#include "core/tier1.h"
#include "plugins/interfaces/interface.h"
#include "plugins/interfaces/IPluginId.h"
#include "plugins/interfaces/IPluginCallbacks.h"
@@ -20,6 +20,7 @@ private:
std::string m_location; // path of the dll
bool m_runOnServer;
bool m_runOnClient;
+ Color m_logColor;
public:
HMODULE m_handle;