josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Script: Code style.

Browse Source 
WaypointReached(uint32 i) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 uiPointId) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*point*/) -> WaypointReached(uint32 /*waypointId*/)
WaypointReached(uint32 uiI) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*i*/) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 uiWPointId) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*wp*/) -> WaypointReached(uint32 waypointId)
WaypointReached(uint32 /*point*/) -> WaypointReached(uint32 waypointId)

Signed-off-by: Gyx <[email protected]>
This commit is contained in:
Gyx
2012-03-29 15:44:24 +08:00
parent 5b7493fc66
commit 391d68be20
67 changed files with 660 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
+2 -2
View File
@@ -227,9 +227,9 @@ class npc_onyx_flamecaller : public CreatureScript
zarithrian->AI()->JustSummoned(me);
}
void WaypointReached(uint32 pointId)
void WaypointReached(uint32 waypointId)
{
if (pointId == MAX_PATH_FLAMECALLER_WAYPOINTS || pointId == MAX_PATH_FLAMECALLER_WAYPOINTS*2)
if (waypointId == MAX_PATH_FLAMECALLER_WAYPOINTS || waypointId == MAX_PATH_FLAMECALLER_WAYPOINTS*2)
{
DoZoneInCombat();
SetEscortPaused(true);
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+2 -2
View File
@@ -447,9 +447,9 @@ public:
uint8 uiWaypoint;
void WaypointReached(uint32 uiPoint)
void WaypointReached(uint32 waypointId)
{
if (uiPoint == 0)
if (waypointId == 0)
{
switch (uiWaypoint)
{
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+1 -1
View File
@@ -356,7 +356,7 @@ public:
Start(false, true, 0, NULL);
}
void WaypointReached(uint32 /*i*/)
void WaypointReached(uint32 /*waypointId*/)
{
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+7 -5
View File
@@ -203,17 +203,19 @@ public:
Start(false, true, 0, NULL);
}
void WaypointReached(uint32 i)
void WaypointReached(uint32 waypointId)
{
switch (i)
if (!instance)
return;
switch (waypointId)
{
case 2:
if (instance && (uiWaypointPath == 3 || uiWaypointPath == 2))
if (uiWaypointPath == 3 || uiWaypointPath == 2)
instance->SetData(DATA_MOVEMENT_DONE, instance->GetData(DATA_MOVEMENT_DONE)+1);
break;
case 3:
if (instance)
instance->SetData(DATA_MOVEMENT_DONE, instance->GetData(DATA_MOVEMENT_DONE)+1);
instance->SetData(DATA_MOVEMENT_DONE, instance->GetData(DATA_MOVEMENT_DONE)+1);
break;
}
}
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+2 -1
View File
@@ -963,8 +963,9 @@ public:
// we dont do melee damage!
}
void WaypointReached(uint32 /*i*/)
void WaypointReached(uint32 /*waypointId*/)
{
}
private:
src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp
+2 -2
View File
@@ -346,9 +346,9 @@ public:
lDwarfGUIDList.clear();
}
void WaypointReached(uint32 uiPointId)
void WaypointReached(uint32 waypointId)
{
switch (uiPointId)
switch (waypointId)
{
case 7:
if (Creature* creature = GetClosestCreatureWithEntry(me, CREATURE_TRIBUNAL_OF_THE_AGES, 100.0f))
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+2 -1
View File
@@ -964,8 +964,9 @@ public:
me->SetReactState(REACT_PASSIVE);
}
void WaypointReached(uint32 /*i*/)
void WaypointReached(uint32 /*waypointId*/)
{
}
void Reset()
src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+14 -14
View File
@@ -447,32 +447,32 @@ public:
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
void WaypointReached(uint32 uiWPointId)
void WaypointReached(uint32 waypointId)
{
switch (uiBoss)
{
case 1:
if (uiWPointId == 2)
if (waypointId == 2)
FinishPointReached();
break;
case 2:
if (uiWPointId == 2)
if (waypointId == 2)
FinishPointReached();
break;
case 3:
if (uiWPointId == 1)
if (waypointId == 1)
FinishPointReached();
break;
case 4:
if (uiWPointId == 0)
if (waypointId == 0)
FinishPointReached();
break;
case 5:
if (uiWPointId == 0)
if (waypointId == 0)
FinishPointReached();
break;
case 6:
if (uiWPointId == 4)
if (waypointId == 4)
FinishPointReached();
break;
}
@@ -690,32 +690,32 @@ struct violet_hold_trashAI : public npc_escortAI
uint32 portalLocationID;
uint32 secondPortalRouteID;
void WaypointReached(uint32 uiPointId)
void WaypointReached(uint32 waypointId)
{
switch (portalLocationID)
{
case 0:
if (uiPointId == 5)
if (waypointId == 5)
CreatureStartAttackDoor();
break;
case 1:
if ((uiPointId == 8 && secondPortalRouteID == 0) || (uiPointId == 7 && secondPortalRouteID == 1))
if ((waypointId == 8 && secondPortalRouteID == 0) || (waypointId == 7 && secondPortalRouteID == 1))
CreatureStartAttackDoor();
break;
case 2:
if (uiPointId == 7)
if (waypointId == 7)
CreatureStartAttackDoor();
break;
case 3:
if (uiPointId == 8)
if (waypointId == 8)
CreatureStartAttackDoor();
break;
case 4:
if (uiPointId == 5)
if (waypointId == 5)
CreatureStartAttackDoor();
break;
case 5:
if (uiPointId == 3)
if (waypointId == 3)
CreatureStartAttackDoor();
break;
}
src/server/scripts/Northrend/borean_tundra.cpp
+27 -30
View File
@@ -716,9 +716,9 @@ public:
}
}
void WaypointReached(uint32 i)
void WaypointReached(uint32 waypointId)
{
switch (i)
switch (waypointId)
{
case 0:
IntroPhase = 1;
@@ -1012,13 +1012,13 @@ public:
uiPhaseTimer = 0;
}
void WaypointReached(uint32 uiPointId)
void WaypointReached(uint32 waypointId)
{
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (uiPointId)
switch (waypointId)
{
case 3:
SetEscortPaused(true);
@@ -1038,7 +1038,6 @@ public:
}
me->SetWalk(false);
break;
case 4:
SetEscortPaused(true);
uiPhase = 7;
@@ -1851,34 +1850,33 @@ public:
player->FailQuest(QUEST_ESCAPING_THE_MIST);
}
void WaypointReached(uint32 i)
void WaypointReached(uint32 waypointId)
{
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (i)
switch (waypointId)
{
case 10:
me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION);
DoScriptText(SAY_2, me);
break;
case 12:
DoScriptText(SAY_3, me);
me->HandleEmoteCommand(EMOTE_ONESHOT_LOOT);
break;
case 16:
DoScriptText(SAY_4, me);
me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION);
break;
case 20:
me->SetPhaseMask(1, true);
DoScriptText(SAY_5, me);
me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION);
player->GroupEventHappens(QUEST_ESCAPING_THE_MIST, me);
SetRun(true);
break;
case 10:
me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION);
DoScriptText(SAY_2, me);
break;
case 12:
DoScriptText(SAY_3, me);
me->HandleEmoteCommand(EMOTE_ONESHOT_LOOT);
break;
case 16:
DoScriptText(SAY_4, me);
me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION);
break;
case 20:
me->SetPhaseMask(1, true);
DoScriptText(SAY_5, me);
me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION);
player->GroupEventHappens(QUEST_ESCAPING_THE_MIST, me);
SetRun(true);
break;
}
}
};
@@ -1951,14 +1949,13 @@ public:
else Bonker_agro=0;
}
void WaypointReached(uint32 i)
void WaypointReached(uint32 waypointId)
{
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (i)
switch (waypointId)
{
case 29:
player->GroupEventHappens(QUEST_GET_ME_OUTA_HERE, me);
src/server/scripts/Northrend/grizzly_hills.cpp
+2 -2
View File
@@ -74,13 +74,13 @@ public:
summoned->AI()->AttackStart(me->getVictim());
}
void WaypointReached(uint32 i)
void WaypointReached(uint32 waypointId)
{
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (i)
switch (waypointId)
{
case 9:
if (Creature* Mrfloppy = GetClosestCreatureWithEntry(me, NPC_MRFLOPPY, 100.0f))
src/server/scripts/Northrend/howling_fjord.cpp
+2 -2
View File
@@ -97,13 +97,13 @@ public:
DoMeleeAttackIfReady();
}
void WaypointReached(uint32 i)
void WaypointReached(uint32 waypointId)
{
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (i)
switch (waypointId)
{
case 1:
me->SetReactState(REACT_AGGRESSIVE);
src/server/scripts/Northrend/sholazar_basin.cpp
+31 -29
View File
@@ -70,39 +70,40 @@ public:
}
}
void WaypointReached(uint32 i)
void WaypointReached(uint32 waypointId)
{
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (i)
switch (waypointId)
{
case 1: SetRun(); break;
case 10:
case 11:
case 12:
case 13:
case 14:
case 15:
case 16:
case 17:
case 18:
me->RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_FALLING);
me->SetSpeed(MOVE_SWIM, 0.85f, true);
me->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_DISABLE_GRAVITY);
break;
case 19:
me->SetUnitMovementFlags(MOVEMENTFLAG_FALLING);
break;
case 28:
player->GroupEventHappens(QUEST_FORTUNATE_MISUNDERSTANDINGS, me);
// me->RestoreFaction();
DoScriptText(SAY_END_IRO, me);
SetRun(false);
break;
case 1:
SetRun();
break;
case 10:
case 11:
case 12:
case 13:
case 14:
case 15:
case 16:
case 17:
case 18:
me->RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_FALLING);
me->SetSpeed(MOVE_SWIM, 0.85f, true);
me->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_DISABLE_GRAVITY);
break;
case 19:
me->SetUnitMovementFlags(MOVEMENTFLAG_FALLING);
break;
case 28:
player->GroupEventHappens(QUEST_FORTUNATE_MISUNDERSTANDINGS, me);
// me->RestoreFaction();
DoScriptText(SAY_END_IRO, me);
SetRun(false);
break;
}
}
@@ -359,10 +360,11 @@ public:
uint32 m_uiChatTimer;
void WaypointReached(uint32 i)
void WaypointReached(uint32 waypointId)
{
Player* player = GetPlayerForEscort();
switch (i)
switch (waypointId)
{
case 0:
DoScriptText(SAY_WP_2, me);
src/server/scripts/Northrend/storm_peaks.cpp
+3 -4
View File
@@ -374,18 +374,17 @@ public:
{
npc_injured_goblinAI(Creature* creature) : npc_escortAI(creature) { }
void WaypointReached(uint32 i)
void WaypointReached(uint32 waypointId)
{
Player* player = GetPlayerForEscort();
if (!player)
return;
switch (i)
switch (waypointId)
{
case 26:
DoScriptText(SAY_END_WP_REACHED, me, player);
break;
case 27:
player->GroupEventHappens(QUEST_BITTER_DEPARTURE, me);
break;
@@ -672,7 +671,7 @@ public:
}
}
void WaypointReached(uint32 /*wp*/)
void WaypointReached(uint32 /*waypointId*/)
{
}
src/server/scripts/Northrend/zuldrak.cpp
+4 -4
View File
@@ -740,9 +740,9 @@ public:
bEnrage = false;
}
void WaypointReached(uint32 uiI)
void WaypointReached(uint32 waypointId)
{
switch (uiI)
switch (waypointId)
{
case 6:
me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0);
@@ -934,9 +934,9 @@ public:
bThunderClap = false;
}
void WaypointReached(uint32 uiI)
void WaypointReached(uint32 waypointId)
{
switch (uiI)
switch (waypointId)
{
case 7:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);