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

Breakout rest of the enums from dCommonVars and clean it up (#1061)

Browse Source 
* Breakout rest of the enums from dcommonvars
so we don't have to deal with merge conflicts
ePlayerFlags is not a scoped enum, yet, due to it's complexity

* address feedback

* make player flag types consistent

* fix typo
This commit is contained in:
Aaron Kimbrell
2023-05-02 17:39:21 -05:00
committed by GitHub
parent e8590a5853
commit 6aa90ad5b2
161 changed files with 960 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dScripts/02_server/Pets/DamagingPets.cpp
View File

@@ -3,6 +3,7 @@
#include "DestroyableComponent.h"
#include "BaseCombatAIComponent.h"
#include "RenderComponent.h"
#include "ePetTamingNotifyType.h"
void DamagingPets::OnStartup(Entity* self) {
@@ -33,15 +34,15 @@ void DamagingPets::OnPlayerLoaded(Entity* self, Entity* player) {
});
}
void DamagingPets::OnNotifyPetTamingMinigame(Entity* self, Entity* tamer, eNotifyType type) {
void DamagingPets::OnNotifyPetTamingMinigame(Entity* self, Entity* tamer, ePetTamingNotifyType type) {
switch (type) {
case NOTIFY_TYPE_SUCCESS:
case NOTIFY_TYPE_BEGIN:
case ePetTamingNotifyType::SUCCESS:
case ePetTamingNotifyType::BEGIN:
self->CancelAllTimers();
ClearEffects(self);
break;
case NOTIFY_TYPE_FAILED:
case NOTIFY_TYPE_QUIT:
case ePetTamingNotifyType::FAILED:
case ePetTamingNotifyType::QUIT:
{
self->SetNetworkVar<bool>(u"bIAmTamable", false);
self->AddTimer("GoEvil", 1.0f);