Core: Fix more warnings
--HG-- branch : trunk
This commit is contained in:
@@ -171,7 +171,7 @@ void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(uint32 team)
|
||||
else
|
||||
ct=EP_EWT_Summons_H;
|
||||
|
||||
for (int i = 0; i < EP_EWT_NUM_CREATURES; ++i)
|
||||
for (uint8 i = 0; i < EP_EWT_NUM_CREATURES; ++i)
|
||||
{
|
||||
DelCreature(i);
|
||||
AddCreature(i,ct[i].entry,ct[i].teamval,ct[i].map,ct[i].x,ct[i].y,ct[i].z,ct[i].o,1000000);
|
||||
@@ -623,7 +623,7 @@ OutdoorPvPEP::OutdoorPvPEP()
|
||||
|
||||
bool OutdoorPvPEP::SetupOutdoorPvP()
|
||||
{
|
||||
for (int i = 0; i < EPBuffZonesNum; ++i)
|
||||
for (uint8 i = 0; i < EPBuffZonesNum; ++i)
|
||||
RegisterZone(EPBuffZones[i]);
|
||||
|
||||
AddCapturePoint(new OPvPCapturePointEP_EWT(this));
|
||||
|
||||
@@ -30,7 +30,7 @@ const uint32 EP_GraveYardZone = 139;
|
||||
|
||||
const uint32 EP_GraveYardId = 927;
|
||||
|
||||
const uint32 EPBuffZonesNum = 3;
|
||||
const uint8 EPBuffZonesNum = 3;
|
||||
|
||||
const uint32 EP_EWT_CM = 17690;
|
||||
const uint32 EP_CGT_CM = 17689;
|
||||
@@ -149,8 +149,8 @@ const uint32 EPTowerPlayerEnterEvents[EP_TOWER_NUM] = {10691,10699,10701,10705};
|
||||
|
||||
const uint32 EPTowerPlayerLeaveEvents[EP_TOWER_NUM] = {10692,10698,10700,10704};
|
||||
|
||||
const uint32 EP_NUM_CREATURES = 6;
|
||||
const uint32 EP_EWT_NUM_CREATURES = 5;
|
||||
const uint8 EP_NUM_CREATURES = 6;
|
||||
const uint8 EP_EWT_NUM_CREATURES = 5;
|
||||
|
||||
// one lordaeron commander, 4 soldiers
|
||||
// should be spawned at EWT and follow a path, but trans-grid pathing isn't safe, so summon them directly at NPT
|
||||
|
||||
@@ -412,7 +412,7 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj
|
||||
|
||||
int32 OPvPCapturePointNA::HandleOpenGo(Player *plr, uint64 guid)
|
||||
{
|
||||
uint32 retval = OPvPCapturePoint::HandleOpenGo(plr, guid);
|
||||
int32 retval = OPvPCapturePoint::HandleOpenGo(plr, guid);
|
||||
if (retval >= 0)
|
||||
{
|
||||
const go_type * gos = NULL;
|
||||
|
||||
@@ -58,7 +58,7 @@ void OutdoorPvPSI::UpdateWorldState()
|
||||
|
||||
bool OutdoorPvPSI::SetupOutdoorPvP()
|
||||
{
|
||||
for (int i = 0; i < OutdoorPvPSIBuffZonesNum; ++i)
|
||||
for (uint8 i = 0; i < OutdoorPvPSIBuffZonesNum; ++i)
|
||||
RegisterZone(OutdoorPvPSIBuffZones[i]);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ enum OutdoorPvPSISpells
|
||||
|
||||
const uint32 SI_MAX_RESOURCES = 200;
|
||||
|
||||
const uint32 OutdoorPvPSIBuffZonesNum = 3;
|
||||
const uint8 OutdoorPvPSIBuffZonesNum = 3;
|
||||
|
||||
const uint32 OutdoorPvPSIBuffZones[OutdoorPvPSIBuffZonesNum] = { 1377, 3428, 3429 };
|
||||
|
||||
|
||||
@@ -222,7 +222,7 @@ bool OutdoorPvPTF::SetupOutdoorPvP()
|
||||
first_digit = 0;
|
||||
|
||||
// add the zones affected by the pvp buff
|
||||
for (int i = 0; i < OutdoorPvPTFBuffZonesNum; ++i)
|
||||
for (uint8 i = 0; i < OutdoorPvPTFBuffZonesNum; ++i)
|
||||
RegisterZone(OutdoorPvPTFBuffZones[i]);
|
||||
|
||||
AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_NW));
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "OutdoorPvP.h"
|
||||
|
||||
const uint32 OutdoorPvPTFBuffZonesNum = 5;
|
||||
const uint8 OutdoorPvPTFBuffZonesNum = 5;
|
||||
|
||||
const uint32 OutdoorPvPTFBuffZones[OutdoorPvPTFBuffZonesNum] =
|
||||
{
|
||||
|
||||
@@ -180,7 +180,7 @@ bool OutdoorPvPZM::SetupOutdoorPvP()
|
||||
m_HordeTowersControlled = 0;
|
||||
|
||||
// add the zones affected by the pvp buff
|
||||
for (int i = 0; i < OutdoorPvPZMBuffZonesNum; ++i)
|
||||
for (uint8 i = 0; i < OutdoorPvPZMBuffZonesNum; ++i)
|
||||
RegisterZone(OutdoorPvPZMBuffZones[i]);
|
||||
|
||||
AddCapturePoint(new OPvPCapturePointZM_Beacon(this,ZM_BEACON_WEST));
|
||||
@@ -211,7 +211,7 @@ bool OPvPCapturePointZM_GraveYard::Update(uint32 /*diff*/)
|
||||
|
||||
int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player *plr, uint64 guid)
|
||||
{
|
||||
uint32 retval = OPvPCapturePoint::HandleOpenGo(plr, guid);
|
||||
int32 retval = OPvPCapturePoint::HandleOpenGo(plr, guid);
|
||||
if (retval >= 0)
|
||||
{
|
||||
if (plr->HasAura(ZM_BATTLE_STANDARD_A) && m_GraveYardState != ZM_GRAVEYARD_A)
|
||||
@@ -327,7 +327,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction)
|
||||
UpdateTowerState();
|
||||
}
|
||||
|
||||
bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipMenuItems gso)
|
||||
bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipMenuItems /*gso*/)
|
||||
{
|
||||
uint64 guid = c->GetGUID();
|
||||
std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid);
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "Language.h"
|
||||
#include "OutdoorPvP.h"
|
||||
|
||||
const uint32 OutdoorPvPZMBuffZonesNum = 5;
|
||||
const uint8 OutdoorPvPZMBuffZonesNum = 5;
|
||||
|
||||
// the buff is cast in these zones
|
||||
const uint32 OutdoorPvPZMBuffZones[OutdoorPvPZMBuffZonesNum] = {3521,3607,3717,3715,3716};
|
||||
|
||||
Reference in New Issue
Block a user