Skip to content

Commit cd9a661

Browse files
committed
chore(TriggerEvent): removed virtual
1 parent e6ef8a4 commit cd9a661

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

src/plugins/Plugin.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "Plugin.h"
2+
#include "lua/LuaPlugin.h"
23

34
Plugin::Plugin(std::string m_name, PluginKind_t m_kind)
45
{
@@ -37,3 +38,9 @@ void Plugin::SetLoadError(std::string error)
3738
{
3839
this->loadError = error;
3940
}
41+
42+
EventResult Plugin::TriggerEvent(std::string invokedBy, std::string eventName, std::string eventPayload, PluginEvent* event)
43+
{
44+
if (this->GetKind() == PluginKind_t::Lua) return ((LuaPlugin*)this)->PluginTriggerEvent(invokedBy, eventName, eventPayload, event);
45+
else return EventResult::Continue;
46+
}

src/plugins/Plugin.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class Plugin
4646
virtual std::string GetVersion() = 0;
4747
virtual std::string GetPlName() = 0;
4848

49-
virtual EventResult TriggerEvent(std::string invokedBy, std::string eventName, std::string eventPayload, PluginEvent* event) = 0;
49+
EventResult TriggerEvent(std::string invokedBy, std::string eventName, std::string eventPayload, PluginEvent* event);
5050
};
5151

5252
#endif

src/plugins/lua/LuaPlugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ void LuaPlugin::RegisterEventHandling(std::string eventName)
232232
this->eventHandlers.insert({ eventName, true });
233233
}
234234

235-
EventResult LuaPlugin::TriggerEvent(std::string invokedBy, std::string eventName, std::string eventPayload, PluginEvent* event)
235+
EventResult LuaPlugin::PluginTriggerEvent(std::string invokedBy, std::string eventName, std::string eventPayload, PluginEvent* event)
236236
{
237237
if (this->GetPluginState() == PluginState_t::Stopped && eventName != "OnPluginStart" && eventName != "OnAllPluginsLoaded")
238238
return EventResult::Continue;

src/plugins/lua/LuaPlugin.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ class PluginEvent;
2626
class LuaPlugin : public Plugin
2727
{
2828
private:
29-
lua_State *state;
30-
luabridge::LuaRef *globalEventHandler;
29+
lua_State* state;
30+
luabridge::LuaRef* globalEventHandler;
3131
std::map<std::string, bool> eventHandlers;
3232

3333
public:
@@ -38,20 +38,20 @@ class LuaPlugin : public Plugin
3838
bool ExecuteStart();
3939
void ExecuteStop();
4040

41-
void ExecuteCommand(void *functionPtr, std::string name, int slot, std::vector<std::string> args, bool silent, std::string prefix);
41+
void ExecuteCommand(void* functionPtr, std::string name, int slot, std::vector<std::string> args, bool silent, std::string prefix);
4242

43-
void RegisterEventHandler(void *functionPtr);
43+
void RegisterEventHandler(void* functionPtr);
4444
void RegisterEventHandling(std::string eventName);
45-
EventResult TriggerEvent(std::string invokedBy, std::string eventName, std::string eventPayload, PluginEvent *event);
45+
EventResult PluginTriggerEvent(std::string invokedBy, std::string eventName, std::string eventPayload, PluginEvent* event);
4646

4747
std::string GetAuthor();
4848
std::string GetWebsite();
4949
std::string GetVersion();
5050
std::string GetPlName();
5151

52-
lua_State *GetState() { return this->state; }
52+
lua_State* GetState() { return this->state; }
5353
};
5454

55-
luabridge::LuaRef LuaSerializeData(std::any data, lua_State *state);
55+
luabridge::LuaRef LuaSerializeData(std::any data, lua_State* state);
5656

5757
#endif

0 commit comments

Comments
 (0)