diff options
| -rw-r--r-- | sql/updates/world/2011_03_20_0_world_game_event.sql | 2 | ||||
| -rwxr-xr-x | src/server/game/Battlegrounds/BattlegroundMgr.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Miscellaneous/SharedDefines.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/sql/updates/world/2011_03_20_0_world_game_event.sql b/sql/updates/world/2011_03_20_0_world_game_event.sql new file mode 100644 index 00000000000..ebee67b8d36 --- /dev/null +++ b/sql/updates/world/2011_03_20_0_world_game_event.sql @@ -0,0 +1,2 @@ +UPDATE `game_event` SET `holiday`=400 WHERE `eventEntry`=53; -- Call to Arms: Strand of the Ancients! +UPDATE `game_event` SET `holiday`=420 WHERE `eventEntry`=54; -- Call to Arms: Isle of Conquest! diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index e58ba68df46..e5603075b18 100755 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -1166,6 +1166,7 @@ HolidayIds BattlegroundMgr::BGTypeToWeekendHolidayId(BattlegroundTypeId bgTypeId case BATTLEGROUND_WS: return HOLIDAY_CALL_TO_ARMS_WS; case BATTLEGROUND_SA: return HOLIDAY_CALL_TO_ARMS_SA; case BATTLEGROUND_AB: return HOLIDAY_CALL_TO_ARMS_AB; + case BATTLEGROUND_IC: return HOLIDAY_CALL_TO_ARMS_IC; default: return HOLIDAY_NONE; } } @@ -1179,6 +1180,7 @@ BattlegroundTypeId BattlegroundMgr::WeekendHolidayIdToBGType(HolidayIds holiday) case HOLIDAY_CALL_TO_ARMS_WS: return BATTLEGROUND_WS; case HOLIDAY_CALL_TO_ARMS_SA: return BATTLEGROUND_SA; case HOLIDAY_CALL_TO_ARMS_AB: return BATTLEGROUND_AB; + case HOLIDAY_CALL_TO_ARMS_IC: return BATTLEGROUND_IC; default: return BATTLEGROUND_TYPE_NONE; } } diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 19e68b37e31..6e2e338fa4a 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -2219,7 +2219,7 @@ enum HolidayIds HOLIDAY_PILGRIMS_BOUNTY = 404, HOLIDAY_WOTLK_LAUNCH = 406, HOLIDAY_DAY_OF_DEAD = 409, - HOLIDAY_CALL_TO_ARMS_ISLE_OF_C = 420 + HOLIDAY_CALL_TO_ARMS_IC = 420 }; // values based at QuestInfo.dbc |