Skip to content

Commit

Permalink
fix compiler warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@insunaa @killerwife
insunaa authored and killerwife committed Sep 15, 2021
1 parent 146fc91 commit ecee1b7
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 15 deletions.
2 changes: 2 additions & 0 deletions src/game/AI/ScriptDevAI/scripts/northrend/ulduar/halls_of_stone/halls_of_stoneScripts.cpp
View file
Expand Up @@ -401,6 +401,8 @@ struct npc_brann_hosAI : public ScriptedAI, private DialogueHelper
case AI_EVENT_CUSTOM_D:
StartSjonnirEvent();
break;
default:
break;
}
}

Expand Down
18 changes: 9 additions & 9 deletions src/game/Battlefield/BattlefieldWG.cpp
View file
Expand Up @@ -109,10 +109,10 @@ void BattlefieldWG::Reset()
if (GetDefender() && GetDefender() != TEAM_NONE)
{
goState = GetDefender() == ALLIANCE ? BF_GO_STATE_ALLIANCE_INTACT : BF_GO_STATE_HORDE_INTACT;
SetGraveYardLinkTeam(i.graveyardId, ZONE_ID_WINTERGRASP, GetDefender(), { 571 });
SetGraveYardLinkTeam(i.graveyardId, ZONE_ID_WINTERGRASP, GetDefender(), 571);
}
else
SetGraveYardLinkTeam(i.graveyardId, ZONE_ID_WINTERGRASP, TEAM_INVALID, { 571 });
SetGraveYardLinkTeam(i.graveyardId, ZONE_ID_WINTERGRASP, TEAM_INVALID, 571);

factory->SetGoState(goState);
factory->SetOwner(GetDefender());
Expand All @@ -135,10 +135,10 @@ void BattlefieldWG::Reset()
Team comparableTeam = i.workshopEntry == GO_WORKSHOP_BROKEN_TEMPLE || i.workshopEntry == GO_WORKSHOP_SUNKEN_RING ? GetDefender() : GetAttacker();
goState = comparableTeam == ALLIANCE ? BF_GO_STATE_ALLIANCE_INTACT : BF_GO_STATE_HORDE_INTACT;

SetGraveYardLinkTeam(i.graveyardId, ZONE_ID_WINTERGRASP, comparableTeam, { 571 });
SetGraveYardLinkTeam(i.graveyardId, ZONE_ID_WINTERGRASP, comparableTeam, 571);
}
else
SetGraveYardLinkTeam(i.graveyardId, ZONE_ID_WINTERGRASP, TEAM_INVALID, { 571 });
SetGraveYardLinkTeam(i.graveyardId, ZONE_ID_WINTERGRASP, TEAM_INVALID, 571);

factory->SetGoState(goState);
factory->SetOwner(comparableTeam);
Expand Down Expand Up @@ -594,7 +594,7 @@ bool BattlefieldWG::HandleCapturePointEvent(uint32 eventId, GameObject* go)
SetBannerVisual(go, wgCapturePointEventData[index][i].bannerArtKit, wgCapturePointEventData[index][i].bannerAnim);

// update graveyard links
SetGraveYardLinkTeam(workshop->GetGraveyardId(), ZONE_ID_WINTERGRASP, wgCapturePointEventData[index][i].team, { 571 });
SetGraveYardLinkTeam(workshop->GetGraveyardId(), ZONE_ID_WINTERGRASP, wgCapturePointEventData[index][i].team, 571);

// change area phasing
// ToDo: needs to be enabled when phase stacking is supported
Expand Down Expand Up @@ -905,7 +905,7 @@ void BattlefieldWG::GetBattlefieldReady(const WorldObject* objRef)
workshop->SetOwner(GetDefender());
workshop->SetGoState(GetDefender() == ALLIANCE ? BF_GO_STATE_ALLIANCE_INTACT : BF_GO_STATE_HORDE_INTACT);
SendUpdateWorldState(workshop->GetWorldState(), workshop->GetGoState());
SetGraveYardLinkTeam(workshop->GetGraveyardId(), ZONE_ID_WINTERGRASP, GetDefender(), { 571 });
SetGraveYardLinkTeam(workshop->GetGraveyardId(), ZONE_ID_WINTERGRASP, GetDefender(), 571);

++m_workshopCount[GetTeamIndexByTeamId(GetDefender())];
}
Expand All @@ -916,7 +916,7 @@ void BattlefieldWG::GetBattlefieldReady(const WorldObject* objRef)
workshop->SetOwner(owner);
workshop->SetGoState(owner == ALLIANCE ? BF_GO_STATE_ALLIANCE_INTACT : BF_GO_STATE_HORDE_INTACT);
SendUpdateWorldState(workshop->GetWorldState(), workshop->GetGoState());
SetGraveYardLinkTeam(workshop->GetGraveyardId(), ZONE_ID_WINTERGRASP, owner, { 571 });
SetGraveYardLinkTeam(workshop->GetGraveyardId(), ZONE_ID_WINTERGRASP, owner, 571);

++m_workshopCount[GetTeamIndexByTeamId(owner)];

Expand Down Expand Up @@ -977,7 +977,7 @@ void BattlefieldWG::GetBattlefieldReady(const WorldObject* objRef)
}

// unlink fortress graveyard
SetGraveYardLinkTeam(GRAVEYARD_ID_FORTRESS_INDOOR, ZONE_ID_WINTERGRASP, TEAM_INVALID, { 571 });
SetGraveYardLinkTeam(GRAVEYARD_ID_FORTRESS_INDOOR, ZONE_ID_WINTERGRASP, TEAM_INVALID, 571);

// ***** Update general stated **** //
SendUpdateGeneralWorldStates();
Expand Down Expand Up @@ -1013,7 +1013,7 @@ void BattlefieldWG::CleanupBattlefield(const WorldObject* objRef, Team winner)
// BuffTeam(GetDefender(), SPELL_ESSENCE_WINTERGRASP_ZONE);

// link fortress graveyard
SetGraveYardLinkTeam(GRAVEYARD_ID_FORTRESS_INDOOR, ZONE_ID_WINTERGRASP, winner, { 571 });
SetGraveYardLinkTeam(GRAVEYARD_ID_FORTRESS_INDOOR, ZONE_ID_WINTERGRASP, winner, 571);

// ***** Reset creatures **** //
// despawn cannons
Expand Down
1 change: 1 addition & 0 deletions src/game/MotionGenerators/MovementHandler.cpp
View file
Expand Up @@ -588,6 +588,7 @@ void WorldSession::HandleMoveFlagChangeOpcode(WorldPacket& recv_data)
case CMSG_MOVE_FEATHER_FALL_ACK: response = MSG_MOVE_FEATHER_FALL; break;
case CMSG_MOVE_WATER_WALK_ACK: response = MSG_MOVE_WATER_WALK; break;
case CMSG_MOVE_SET_CAN_FLY_ACK: response = MSG_MOVE_UPDATE_CAN_FLY; break;
default: break;
}

WorldPacket data(response, 8);
Expand Down
6 changes: 3 additions & 3 deletions src/game/OutdoorPvP/OutdoorPvPEP.cpp
View file
Expand Up @@ -38,7 +38,7 @@ OutdoorPvPEP::OutdoorPvPEP() : OutdoorPvP(),
i = TEAM_NONE;

// initially set graveyard owner to neither faction
SetGraveYardLinkTeam(GRAVEYARD_ID_EASTERN_PLAGUE, GRAVEYARD_ZONE_EASTERN_PLAGUE, TEAM_INVALID, { 0 });
SetGraveYardLinkTeam(GRAVEYARD_ID_EASTERN_PLAGUE, GRAVEYARD_ZONE_EASTERN_PLAGUE, TEAM_INVALID, 0);
}

void OutdoorPvPEP::FillInitialWorldStates(WorldPacket& data, uint32& count)
Expand Down Expand Up @@ -282,7 +282,7 @@ bool OutdoorPvPEP::ProcessCaptureEvent(GameObject* go, uint32 towerId, Team team
RespawnGO(go, team == ALLIANCE ? m_lordaeronShrineAlliance : m_lordaeronShrineHorde, true);
break;
case TOWER_ID_CROWNGUARD:
SetGraveYardLinkTeam(GRAVEYARD_ID_EASTERN_PLAGUE, GRAVEYARD_ZONE_EASTERN_PLAGUE, team, { 0 });
SetGraveYardLinkTeam(GRAVEYARD_ID_EASTERN_PLAGUE, GRAVEYARD_ZONE_EASTERN_PLAGUE, team, 0);
break;
case TOWER_ID_EASTWALL:
// Return false - allow the DB to handle summons
Expand All @@ -304,7 +304,7 @@ bool OutdoorPvPEP::ProcessCaptureEvent(GameObject* go, uint32 towerId, Team team
RespawnGO(go, m_towerOwner[TOWER_ID_NORTHPASS] == ALLIANCE ? m_lordaeronShrineAlliance : m_lordaeronShrineHorde, false);
break;
case TOWER_ID_CROWNGUARD:
SetGraveYardLinkTeam(GRAVEYARD_ID_EASTERN_PLAGUE, GRAVEYARD_ZONE_EASTERN_PLAGUE, TEAM_INVALID, { 0 });
SetGraveYardLinkTeam(GRAVEYARD_ID_EASTERN_PLAGUE, GRAVEYARD_ZONE_EASTERN_PLAGUE, TEAM_INVALID, 0);
break;
case TOWER_ID_EASTWALL:
UnsummonSoldiers(go);
Expand Down
4 changes: 2 additions & 2 deletions src/game/OutdoorPvP/OutdoorPvPNA.cpp
View file
Expand Up @@ -35,7 +35,7 @@ OutdoorPvPNA::OutdoorPvPNA() : OutdoorPvP(),
m_isUnderSiege(false)
{
// initially set graveyard owner to neither faction
SetGraveYardLinkTeam(GRAVEYARD_ID_HALAA, GRAVEYARD_ZONE_ID_HALAA, TEAM_INVALID, { 530 });
SetGraveYardLinkTeam(GRAVEYARD_ID_HALAA, GRAVEYARD_ZONE_ID_HALAA, TEAM_INVALID, 530);
}

void OutdoorPvPNA::FillInitialWorldStates(WorldPacket& data, uint32& count)
Expand Down Expand Up @@ -339,7 +339,7 @@ void OutdoorPvPNA::ProcessCaptureEvent(GameObject* go, Team team)

UpdateWorldState(WORLD_STATE_REMOVE);
DespawnVendors(go);
SetGraveYardLinkTeam(GRAVEYARD_ID_HALAA, GRAVEYARD_ZONE_ID_HALAA, m_zoneOwner, { 530 });
SetGraveYardLinkTeam(GRAVEYARD_ID_HALAA, GRAVEYARD_ZONE_ID_HALAA, m_zoneOwner, 530);

if (m_zoneOwner == ALLIANCE)
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/OutdoorPvP/OutdoorPvPZM.cpp
View file
Expand Up @@ -49,7 +49,7 @@ OutdoorPvPZM::OutdoorPvPZM() : OutdoorPvP(),
}

// initially set graveyard owner to neither faction
SetGraveYardLinkTeam(GRAVEYARD_ID_TWIN_SPIRE, GRAVEYARD_ZONE_TWIN_SPIRE, TEAM_INVALID, { 530 });
SetGraveYardLinkTeam(GRAVEYARD_ID_TWIN_SPIRE, GRAVEYARD_ZONE_TWIN_SPIRE, TEAM_INVALID, 530);
}

void OutdoorPvPZM::FillInitialWorldStates(WorldPacket& data, uint32& count)
Expand Down

0 comments on commit ecee1b7

Please sign in to comment.