Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-08-04 09:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scripts: Fix ambiguous base class (#1216)

Browse Source
This commit is contained in:
David Markowitz
2023-10-09 13:31:25 -07:00
committed by GitHub
parent 094797881b
commit 500ae4d6e5
9 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dScripts/02_server/Enemy/General/BaseEnemyApe.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include "CppScripts.h"
class BaseEnemyApe : public CppScripts::Script {
class BaseEnemyApe : virtual public CppScripts::Script {
public:
void OnStartup(Entity* self) override;
void OnDie(Entity* self, Entity* killer) override;

2
dScripts/02_server/Map/AG_Spider_Queen/ZoneAgSpiderQueen.h
View File

@@ -2,7 +2,7 @@
#include "ActivityManager.h"
#include "ZoneAgProperty.h"
class ZoneAgSpiderQueen : ZoneAgProperty, ActivityManager {
class ZoneAgSpiderQueen : public ZoneAgProperty, ActivityManager {
public:
void OnStartup(Entity* self) override;
void OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2,

2
dScripts/02_server/Map/njhub/NjNPCMissionSpinjitzuServer.h
View File

@@ -17,7 +17,7 @@ static std::map<std::u16string, uint32_t> ElementMissions = {
{u"fire", 1962},
};
class NjNPCMissionSpinjitzuServer : public CppScripts::Script {
class NjNPCMissionSpinjitzuServer : virtual public CppScripts::Script {
public:
void OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) override;
private: