diff options
| author | schell244 <Schell244@web.de> | 2020-02-16 13:27:36 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-21 18:32:22 +0100 |
| commit | 460549799ee6116ca39751226e3aededab04ac6a (patch) | |
| tree | fbba41c056d96ae10272df8420e7f293dc67b641 /src | |
| parent | 2c78f4dd1f52200e7061b809bb472dbcd499962e (diff) | |
Scripts/World: Hourly Bell sound, further improvements (#24147)
* Improvements for hourly bell sound
* TC codestyle
* added missing breaks and improve codestyle
(cherry picked from commit baa87c43bae9df507427b3fe2d86ba25f059fdef)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/World/go_scripts.cpp | 76 |
1 files changed, 42 insertions, 34 deletions
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 5af9c2a5f0a..be87672242b 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1770,15 +1770,15 @@ enum BellHourlySoundFX enum BellHourlySoundZones { - TIRISFAL_ZONE = 85, - UNDERCITY_ZONE = 1497, - DUN_MOROGH_ZONE = 1, - IRONFORGE_ZONE = 1537, - TELDRASSIL_ZONE = 141, - DARNASSUS_ZONE = 1657, - ASHENVALE_ZONE = 331, - HILLSBRAD_FOOTHILLS = 267, - DUSKWOOD_ZONE = 42 + TIRISFAL_ZONE = 85, + UNDERCITY_ZONE = 1497, + DUN_MOROGH_ZONE = 1, + IRONFORGE_ZONE = 1537, + TELDRASSIL_ZONE = 141, + DARNASSUS_ZONE = 1657, + ASHENVALE_ZONE = 331, + HILLSBRAD_FOOTHILLS_ZONE = 267, + DUSKWOOD_ZONE = 10 }; enum BellHourlyObjects @@ -1811,38 +1811,42 @@ public: { case GO_HORDE_BELL: { - switch (zoneId) { - case TIRISFAL_ZONE: - case UNDERCITY_ZONE: - case HILLSBRAD_FOOTHILLS: - case DUSKWOOD_ZONE: - _soundId = BELLTOLLHORDE; // undead bell sound - break; - default: - _soundId = BELLTOLLTRIBAL; // orc drum sound - break; + switch (zoneId) + { + case TIRISFAL_ZONE: + case UNDERCITY_ZONE: + case HILLSBRAD_FOOTHILLS_ZONE: + case DUSKWOOD_ZONE: + _soundId = BELLTOLLHORDE; // undead bell sound + break; + default: + _soundId = BELLTOLLTRIBAL; // orc drum sound + break; } + break; } case GO_ALLIANCE_BELL: { - switch (zoneId) { - case IRONFORGE_ZONE: - case DUN_MOROGH_ZONE: - _soundId = BELLTOLLDWARFGNOME; // horn sound - break; - case DARNASSUS_ZONE: - case TELDRASSIL_ZONE: - case ASHENVALE_ZONE: - _soundId = BELLTOLLNIGHTELF; // nightelf bell sound - break; - default: - _soundId = BELLTOLLALLIANCE; // human bell sound + switch (zoneId) + { + case IRONFORGE_ZONE: + case DUN_MOROGH_ZONE: + _soundId = BELLTOLLDWARFGNOME; // horn sound + break; + case DARNASSUS_ZONE: + case TELDRASSIL_ZONE: + case ASHENVALE_ZONE: + _soundId = BELLTOLLNIGHTELF; // nightelf bell sound + break; + default: + _soundId = BELLTOLLALLIANCE; // human bell sound } + break; } case GO_KHARAZHAN_BELL: { - _soundId = BELLTOLLKHARAZHAN; - break; + _soundId = BELLTOLLKHARAZHAN; + break; } } } @@ -1854,7 +1858,11 @@ public: time_t time = GameTime::GetGameTime(); tm localTm; localtime_r(&time, &localTm); - uint8 _rings = (localTm.tm_hour - 1) % 12 + 1; + uint8 _rings = (localTm.tm_hour) % 12; + if (_rings == 0) // 00:00 and 12:00 + { + _rings = 12; + } for (auto i = 0; i < _rings; ++i) _events.ScheduleEvent(EVENT_RING_BELL, Seconds(i * 4 + 1)); |