Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-11 01:48:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into scripting-lua

Browse Source
This commit is contained in:
wincent
2022-04-13 19:51:28 +02:00
parent 5f689104af e92cdc4f14
commit e8f9ea9cf1
29 changed files with 215 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dScripts/AmDrawBridge.h
View File

@@ -7,7 +7,7 @@ public:
void OnStartup(Entity* self) override;
void OnUse(Entity* self, Entity* user) override;
void OnTimerDone(Entity* self, std::string timerName) override;
void OnNotifyObject(Entity *self, Entity *sender, const std::string& name, int32_t param1 = 0, int32_t param2 = 0);
void OnNotifyObject(Entity *self, Entity *sender, const std::string& name, int32_t param1 = 0, int32_t param2 = 0) override;
void MoveBridgeDown(Entity* self, Entity* bridge, bool down);
void NotifyDie(Entity* self, Entity* other);

2
dScripts/BaseConsoleTeleportServer.cpp
View File

@@ -25,7 +25,7 @@ void BaseConsoleTeleportServer::BaseOnMessageBoxResponse(Entity* self, Entity* s
if (rocketLaunchComponent == nullptr)
{
rocketLaunchComponent;
return;
}
const auto& teleportZone = self->GetVar<std::u16string>(u"transferZoneID");

8
dScripts/GfCampfire.h
View File

@@ -4,11 +4,11 @@
class GfCampfire : public CppScripts::Script
{
public:
void OnStartup(Entity* self);
void OnStartup(Entity* self) override;
void OnFireEventServerSide(Entity *self, Entity *sender, std::string args, int32_t param1, int32_t param2,
int32_t param3);
void OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status);
void OnTimerDone(Entity* self, std::string timerName);
int32_t param3) override;
void OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) override;
void OnTimerDone(Entity* self, std::string timerName) override;
void OnSkillEventFired(Entity *self, Entity *caster, const std::string &message) override;
private:
int32_t m_skillCastId = 43;