Core/Entities: Rename UNIT_FLAG_OOC_NOT_ATTACKABLE and UNIT_FLAG_PASSIVE to UNIT_FLAG_IMMUNE_TO_PC and UNIT_FLAG_IMMUNE_TO_NPC respectively. New names tell much more about what those flags do.
This commit is contained in:
1 parent
08be716ef8
commit
c7ea952a47
56 files changed
+162
-162
No files matched your search
@@ -264,7 +264,7 @@ public:
|
||||
m_uiValrothGUID = summoned->GetGUID();
|
||||
|
||||
summoned->AddThreat(me, 0.0f);
|
||||
summoned->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
summoned->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
}
|
||||
|
||||
void SummonAcolyte(uint32 uiAmount)
|
||||
@@ -605,7 +605,7 @@ public:
|
||||
ExecuteSpeech_Counter = 0;
|
||||
PlayerGUID = 0;
|
||||
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
}
|
||||
|
||||
bool MeetQuestCondition(Unit* player)
|
||||
@@ -702,7 +702,7 @@ public:
|
||||
case 9:
|
||||
DoScriptText(SAY_EXEC_TIME_6, me, player);
|
||||
me->SetStandState(UNIT_STAND_STATE_KNEEL);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
break;
|
||||
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
|
||||
case 11:
|
||||
@@ -730,7 +730,7 @@ public:
|
||||
case 9:
|
||||
DoScriptText(SAY_EXEC_TIME_8, me, player);
|
||||
me->SetStandState(UNIT_STAND_STATE_KNEEL);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
break;
|
||||
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
|
||||
case 11:
|
||||
@@ -758,7 +758,7 @@ public:
|
||||
case 9:
|
||||
DoScriptText(SAY_EXEC_TIME_3, me, player);
|
||||
me->SetStandState(UNIT_STAND_STATE_KNEEL);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
break;
|
||||
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
|
||||
case 11:
|
||||
@@ -786,7 +786,7 @@ public:
|
||||
case 9:
|
||||
DoScriptText(SAY_EXEC_TIME_7, me, player);
|
||||
me->SetStandState(UNIT_STAND_STATE_KNEEL);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
break;
|
||||
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
|
||||
case 11:
|
||||
@@ -814,7 +814,7 @@ public:
|
||||
case 9:
|
||||
DoScriptText(SAY_EXEC_TIME_4, me, player);
|
||||
me->SetStandState(UNIT_STAND_STATE_KNEEL);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
break;
|
||||
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
|
||||
case 11:
|
||||
@@ -842,7 +842,7 @@ public:
|
||||
case 9:
|
||||
DoScriptText(SAY_EXEC_TIME_9, me, player);
|
||||
me->SetStandState(UNIT_STAND_STATE_KNEEL);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
break;
|
||||
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
|
||||
case 11:
|
||||
@@ -870,7 +870,7 @@ public:
|
||||
case 9:
|
||||
DoScriptText(SAY_EXEC_TIME_5, me, player);
|
||||
me->SetStandState(UNIT_STAND_STATE_KNEEL);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
break;
|
||||
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
|
||||
case 11:
|
||||
@@ -898,7 +898,7 @@ public:
|
||||
case 9:
|
||||
DoScriptText(SAY_EXEC_TIME_10, me, player);
|
||||
me->SetStandState(UNIT_STAND_STATE_KNEEL);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
break;
|
||||
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
|
||||
case 11:
|
||||
@@ -926,7 +926,7 @@ public:
|
||||
case 9:
|
||||
DoScriptText(SAY_EXEC_TIME_1, me, player);
|
||||
me->SetStandState(UNIT_STAND_STATE_KNEEL);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
break;
|
||||
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
|
||||
case 11:
|
||||
@@ -954,7 +954,7 @@ public:
|
||||
case 9:
|
||||
DoScriptText(SAY_EXEC_TIME_2, me, player);
|
||||
me->SetStandState(UNIT_STAND_STATE_KNEEL);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
|
||||
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
|
||||
break;
|
||||
case 10: DoScriptText(SAY_EXEC_WAITING, me, player); break;
|
||||
case 11:
|
||||
|
||||
Reference in new issue
Block a user