Fixed errors. Added client exe files (x32/x64)

mygithome002 · Jun 7, 2018 · c1090d0 · c1090d0
1 parent 41b5029
commit c1090d0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/client/MoPCore547x32.rar b/client/MoPCore547x32.rar
diff --git a/client/MoPCore547.rar → client/MoPCore547x64.rar b/client/MoPCore547.rar → client/MoPCore547x64.rar
diff --git a/src/server/scripts/EasternKingdoms/Gilneas/gilneas.cpp b/src/server/scripts/EasternKingdoms/Gilneas/gilneas.cpp
@@ -1572,7 +1572,7 @@ class npc_worgen_attacker_right  : public CreatureScript
                 {
                     worgenId = data;
                     me->GetMotionMaster()->MovePoint(0, WorgenPosRight[worgenId].runPos);
-                    events.ScheduleEvent(EVENT_JUMP, 20000);
+                    events.ScheduleEvent(EVENT_JUMP, 20 * IN_MILLISECONDS);
                 }
             }
 

diff --git a/src/server/scripts/EasternKingdoms/Gilneas/gilneas.h b/src/server/scripts/EasternKingdoms/Gilneas/gilneas.h
@@ -68,8 +68,6 @@ enum GilneasSpells
 
     SPELL_GHOUL_TAUNT                       = 43263,
 
-    SPELL_ENRAGE                            = 8599,
-
     SPELL_GUARD_SHOOT_DEFAULT               = 20463,
     SPELL_GUARD_SHOOT_DEADLY                = 67595,
 
@@ -164,15 +162,14 @@ enum GilneasEvents
 
     EVENT_TALK                              = 11,
 
-    EVENT_FINISH_RUN                        = 12,
-    EVENT_RUN_AWAY                          = 13,
+    EVENT_RUN_AWAY                          = 12,
 
-    EVENT_START_RUN                         = 14,
-    EVENT_FINISH_RUN                        = 15,
+    EVENT_START_RUN                         = 13,
+    EVENT_FINISH_RUN                        = 14,
 
-    EVENT_CAST_FROSTBOLT                    = 16,
+    EVENT_CAST_FROSTBOLT                    = 15,
 
-    EVENT_UPDATE_PSC                        = 17,
+    EVENT_UPDATE_PSC                        = 16,
 };
 
 enum GilneasTypes

diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
@@ -13,6 +13,7 @@ enum Data
     DATA_TEMPEST            = 7,
     DATA_VENDOR_1           = 8,
     DATA_VENDOR_2           = 9,
+    DATA_ZULJINEVENT        = 10,
 };
 
 enum CreaturesIds