Skip to content

fix build for AC pr #21151 and minor code style adjustments #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nyeriah merged 1 commit into from
Feb 7, 2025
Merged

fix build for AC pr #21151 and minor code style adjustments #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions src/mod_cta_switch_script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,14 @@ class cta_switch_event_script : public GameEventScript
void OnStart(uint16 eventId) override
{
if (!sConfigMgr->GetOption<int>("ModCTASwitch.Enable", 0))
{
return;
}

switch (eventId)
{
case EVENT_CTA_WARSONG_GULCH:

if (!sConfigMgr->GetOption<int>("ModCTASwitch.SwitchWsg", EVENT_CTA_WARSONG_GULCH))
{
return;
}

if (sConfigMgr->GetOption<int>("ModCTASwitch.SwitchWsg", EVENT_CTA_WARSONG_GULCH) == eventId)
{
Expand All @@ -48,9 +44,7 @@ class cta_switch_event_script : public GameEventScript
case EVENT_CTA_ARATHI_BASIN:

if (!sConfigMgr->GetOption<int>("ModCTASwitch.SwitchAB", EVENT_CTA_ARATHI_BASIN))
{
return;
}

if (sConfigMgr->GetOption<int>("ModCTASwitch.SwitchAB", EVENT_CTA_ARATHI_BASIN) == eventId)
{
Expand All @@ -64,9 +58,7 @@ class cta_switch_event_script : public GameEventScript
case EVENT_CTA_ALTERAC_VALLEY:

if (!sConfigMgr->GetOption<int>("ModCTASwitch.SwitchAV", EVENT_CTA_ALTERAC_VALLEY))
{
return;
}

if (sConfigMgr->GetOption<int>("ModCTASwitch.SwitchAV", EVENT_CTA_ALTERAC_VALLEY) == eventId)
{
Expand All @@ -80,9 +72,7 @@ class cta_switch_event_script : public GameEventScript
case EVENT_CTA_EYE_OF_THE_STORM:

if (!sConfigMgr->GetOption<int>("ModCTASwitch.SwitchEots", EVENT_CTA_EYE_OF_THE_STORM))
{
return;
}

if (sConfigMgr->GetOption<int>("ModCTASwitch.SwitchEots", EVENT_CTA_EYE_OF_THE_STORM) == eventId)
{
Expand All @@ -96,9 +86,7 @@ class cta_switch_event_script : public GameEventScript
case EVENT_CTA_STRAND_OF_THE_ANCIENTS:

if (!sConfigMgr->GetOption<int>("ModCTASwitch.SwitchSota", EVENT_CTA_STRAND_OF_THE_ANCIENTS))
{
return;
}

if (sConfigMgr->GetOption<int>("ModCTASwitch.SwitchSota", EVENT_CTA_STRAND_OF_THE_ANCIENTS) == eventId)
{
Expand All @@ -112,9 +100,7 @@ class cta_switch_event_script : public GameEventScript
case EVENT_CTA_ISLE_OF_CONQUEST:

if (!sConfigMgr->GetOption<int>("ModCTASwitch.SwitchIoc", EVENT_CTA_ISLE_OF_CONQUEST))
{
return;
}

if (sConfigMgr->GetOption<int>("ModCTASwitch.SwitchIoc", EVENT_CTA_ISLE_OF_CONQUEST) == eventId)
{
Expand All @@ -131,9 +117,7 @@ class cta_switch_event_script : public GameEventScript
void OnEventCheck(uint16 /*eventId*/) override
{
if (!sConfigMgr->GetOption<int>("ModCTASwitch.Enable", 0))
{
return;
}

std::vector<uint16> eventIds = { EVENT_CTA_ALTERAC_VALLEY, EVENT_CTA_ARATHI_BASIN, EVENT_CTA_WARSONG_GULCH,
EVENT_CTA_EYE_OF_THE_STORM, EVENT_CTA_ISLE_OF_CONQUEST, EVENT_CTA_STRAND_OF_THE_ANCIENTS };
Expand All @@ -158,7 +142,7 @@ class cta_switch_event_script : public GameEventScript
GameEventData const& eventData = events[activeEvent];

sGameEventMgr->StopEvent(activeEvent, true);
LOG_INFO("module", "[CTA-Switch]: Stopping {} ({})", eventData.description, activeEvent);
LOG_INFO("module", "[CTA-Switch]: Stopping {} ({})", eventData.Description, activeEvent);
}
}
}
Expand Down
Loading