yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename some defines

Browse Source
This commit is contained in:
Elmsroth
2020-11-14 17:30:47 +01:00
parent 69a7b14d72
commit 8e3b74e9b1
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GlobalMethods.h
View File

@@ -1572,7 +1572,7 @@ namespace LuaGlobalFunctions
pCreature->SetActiveObjectState(false); pCreature->SetActiveObjectState(false);
// Also initializes the AI and MMGen // Also initializes the AI and MMGen
pCreature->Summon(durorresptime ? TEMPSUMMON_TIMED_OR_DEAD_DESPAWN : TEMPSUMMON_MANUAL_DESPAWN, durorresptime); pCreature->Summon(durorresptime ? TEMPSPAWN_TIMED_OR_DEAD_DESPAWN : TEMPSPAWN_MANUAL_DESPAWN, durorresptime);
// Creature Linking, Initial load is handled like respawn // Creature Linking, Initial load is handled like respawn
if (pCreature->IsLinkingEventTrigger()) if (pCreature->IsLinkingEventTrigger())

26
WorldObjectMethods.h
View File

@@ -736,8 +736,8 @@ namespace LuaWorldObject
* TEMPSUMMON_TIMED_DESPAWN = 3, // despawns after a specified time * TEMPSUMMON_TIMED_DESPAWN = 3, // despawns after a specified time
* TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT = 4, // despawns after a specified time after the creature is out of combat * TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT = 4, // despawns after a specified time after the creature is out of combat
* TEMPSUMMON_CORPSE_DESPAWN = 5, // despawns instantly after death * TEMPSUMMON_CORPSE_DESPAWN = 5, // despawns instantly after death
* TEMPSUMMON_CORPSE_TIMED_DESPAWN = 6, // despawns after a specified time after death * TEMPSPAWN_CORPSE_TIMED_DESPAWN = 6, // despawns after a specified time after death
* TEMPSUMMON_DEAD_DESPAWN = 7, // despawns when the creature disappears * TEMPSPAWN_DEAD_DESPAWN = 7, // despawns when the creature disappears
* TEMPSUMMON_MANUAL_DESPAWN = 8, // despawns when UnSummon() is called * TEMPSUMMON_MANUAL_DESPAWN = 8, // despawns when UnSummon() is called
* TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN = 9, // despawns after a specified time (OOC) OR when the creature dies * TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN = 9, // despawns after a specified time (OOC) OR when the creature dies
* TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN = 10 // despawns after a specified time (OOC) OR when the creature disappears * TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN = 10 // despawns after a specified time (OOC) OR when the creature disappears
@@ -762,43 +762,43 @@ namespace LuaWorldObject
uint32 spawnType = Eluna::CHECKVAL<uint32>(L, 7, 8); uint32 spawnType = Eluna::CHECKVAL<uint32>(L, 7, 8);
uint32 despawnTimer = Eluna::CHECKVAL<uint32>(L, 8, 0); uint32 despawnTimer = Eluna::CHECKVAL<uint32>(L, 8, 0);
TempSummonType type; TempSpawnType type;
switch (spawnType) switch (spawnType)
{ {
case 1: case 1:
type = TEMPSUMMON_TIMED_OR_DEAD_DESPAWN; type = TEMPSPAWN_TIMED_OR_DEAD_DESPAWN;
break; break;
case 2: case 2:
type = TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN; type = TEMPSPAWN_TIMED_OR_CORPSE_DESPAWN;
break; break;
case 3: case 3:
type = TEMPSUMMON_TIMED_DESPAWN; type = TEMPSPAWN_TIMED_DESPAWN;
break; break;
case 4: case 4:
#if defined TRINITY || AZEROTHCORE #if defined TRINITY || AZEROTHCORE
type = TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT; type = TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT;
#else #else
type = TEMPSUMMON_TIMED_OOC_DESPAWN; type = TEMPSPAWN_TIMED_OOC_DESPAWN;
#endif #endif
break; break;
case 5: case 5:
type = TEMPSUMMON_CORPSE_DESPAWN; type = TEMPSPAWN_CORPSE_DESPAWN;
break; break;
case 6: case 6:
type = TEMPSUMMON_CORPSE_TIMED_DESPAWN; type = TEMPSPAWN_CORPSE_TIMED_DESPAWN;
break; break;
case 7: case 7:
type = TEMPSUMMON_DEAD_DESPAWN; type = TEMPSPAWN_DEAD_DESPAWN;
break; break;
case 8: case 8:
type = TEMPSUMMON_MANUAL_DESPAWN; type = TEMPSPAWN_MANUAL_DESPAWN;
break; break;
#if !defined TRINITY && !AZEROTHCORE #if !defined TRINITY && !AZEROTHCORE
case 9: case 9:
type = TEMPSUMMON_TIMED_OOC_OR_CORPSE_DESPAWN; type = TEMPSPAWN_TIMED_OOC_OR_CORPSE_DESPAWN;
break; break;
case 10: case 10:
type = TEMPSUMMON_TIMED_OOC_OR_DEAD_DESPAWN; type = TEMPSPAWN_TIMED_OOC_OR_DEAD_DESPAWN;
break; break;
#endif #endif
default: default: