Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-09-06 15:28:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: not exiting shooting gallery when clicking activity close button

Browse Source 
Fixes #436
Fixes crash when replaying as well
This commit is contained in:
Aaron Kimbre
2023-05-10 19:26:04 -05:00
parent bf0ae6f181
commit 5af5b0f1c1
8 changed files with 70 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.h
View File

@@ -63,12 +63,11 @@ public:
void OnStartup(Entity* self) override;
void OnPlayerLoaded(Entity* self, Entity* player) override;
void OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2, int32_t param3) override;
void OnActivityStateChangeRequest(Entity* self, LWOOBJID senderID, int32_t value1,
int32_t value2, const std::u16string& stringValue) override;
void OnMessageBoxResponse(Entity* self, Entity* sender, int32_t button, const std::u16string& identifier,
const std::u16string& userData) override;
void OnActivityStateChangeRequest(Entity* self, LWOOBJID senderID, int32_t value1, int32_t value2, const std::u16string& stringValue) override;
void OnMessageBoxResponse(Entity* self, Entity* sender, int32_t button, const std::u16string& identifier, const std::u16string& userData) override;
void OnActivityTimerDone(Entity* self, const std::string& name) override;
void OnActivityTimerUpdate(Entity* self, const std::string& name, float_t timeRemaining, float_t elapsedTime) override;
void OnRequestActivityExit(Entity* self, LWOOBJID player, bool canceled);
private:
static std::vector<std::vector<SGEnemy>> GetWaves();
static SGConstants GetConstants();