diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-23 06:32:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-23 06:32:44 +0200 |
| commit | 8bc519a308ab78b1d6b243f49b332ddd9dd4ae17 (patch) | |
| tree | 95c92ba85108b8df3b9f58027034accba018a9d1 /src/server/scripts/Examples | |
| parent | 059f3030b4b842a241e2f526b60f5a48956ee5e6 (diff) | |
| parent | 1bebe15698bea8ff314bfdf93b205e9dc17aeced (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
Diffstat (limited to 'src/server/scripts/Examples')
| -rw-r--r-- | src/server/scripts/Examples/example_creature.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index d573241137f..9fa2940a43f 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -199,7 +199,7 @@ class example_creature : public CreatureScript if (m_uiSpell1Timer <= uiDiff) { //Cast spell one on our current target. - if (rand()%50 > 10) + if (rand32() % 50 > 10) DoCastVictim(SPELL_ONE_ALT); else if (me->IsWithinDist(me->GetVictim(), 25.0f)) DoCastVictim(SPELL_ONE); |