diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors110.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors110.cpp index 72ea94b4..e429dd82 100644 --- a/src/scripts/instances/deepdungeon/HeavenonHighFloors110.cpp +++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors110.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors1120.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors1120.cpp index 3d52cd0b..b33ac50f 100644 --- a/src/scripts/instances/deepdungeon/HeavenonHighFloors1120.cpp +++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors1120.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors2130.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors2130.cpp index 29d57601..48cecd88 100644 --- a/src/scripts/instances/deepdungeon/HeavenonHighFloors2130.cpp +++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors2130.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors3140.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors3140.cpp index 8169929f..78e57b94 100644 --- a/src/scripts/instances/deepdungeon/HeavenonHighFloors3140.cpp +++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors3140.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors4150.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors4150.cpp index 95618bfd..1326de5b 100644 --- a/src/scripts/instances/deepdungeon/HeavenonHighFloors4150.cpp +++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors4150.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors5160.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors5160.cpp index 7c1ac8f0..865a0e65 100644 --- a/src/scripts/instances/deepdungeon/HeavenonHighFloors5160.cpp +++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors5160.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors6170.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors6170.cpp index 25fa5cef..f8e9b8db 100644 --- a/src/scripts/instances/deepdungeon/HeavenonHighFloors6170.cpp +++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors6170.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors7180.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors7180.cpp index 374a3232..21362341 100644 --- a/src/scripts/instances/deepdungeon/HeavenonHighFloors7180.cpp +++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors7180.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors8190.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors8190.cpp index 2733359c..e9adc965 100644 --- a/src/scripts/instances/deepdungeon/HeavenonHighFloors8190.cpp +++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors8190.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors91100.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors91100.cpp index d7ed799a..2c697db0 100644 --- a/src/scripts/instances/deepdungeon/HeavenonHighFloors91100.cpp +++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors91100.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp index 9d85e9a0..1b71f74e 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp index fb636e69..09cc2ef3 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp index 08a57e1e..56ccf719 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp index 17e01aca..88464a86 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp index 6e16c968..29c054a0 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp index 17789eb5..17c1d206 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp index 5d8fb29b..d56e28a4 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp index 645ea613..efcee3bc 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp index f90a524d..5e4759f1 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp index 5d341171..f29b74f9 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp index 19239d2b..cc69d801 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp index ac6fcbbc..9fed7cbb 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp index ab8ccc41..6c514453 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp index 1a07aad9..570e1067 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp index fae5708e..622b3791 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp index 7daa82a7..3a65fae4 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp index be3fc59f..6ff1a4c4 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp index 66452bd0..e9820b0f 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp index d1f8bfe2..c8b671f6 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp index b21fc6cc..ef4bce0b 100644 --- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp +++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/AlaMhigo.cpp b/src/scripts/instances/dungeons/AlaMhigo.cpp index 8a0bbdd6..c1fe4a16 100644 --- a/src/scripts/instances/dungeons/AlaMhigo.cpp +++ b/src/scripts/instances/dungeons/AlaMhigo.cpp @@ -53,7 +53,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/AmdaporKeep.cpp b/src/scripts/instances/dungeons/AmdaporKeep.cpp index ad448e49..8c5423ca 100644 --- a/src/scripts/instances/dungeons/AmdaporKeep.cpp +++ b/src/scripts/instances/dungeons/AmdaporKeep.cpp @@ -139,7 +139,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/AmdaporKeepHard.cpp b/src/scripts/instances/dungeons/AmdaporKeepHard.cpp index dc1135c7..2868209e 100644 --- a/src/scripts/instances/dungeons/AmdaporKeepHard.cpp +++ b/src/scripts/instances/dungeons/AmdaporKeepHard.cpp @@ -56,7 +56,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/BaelsarsWall.cpp b/src/scripts/instances/dungeons/BaelsarsWall.cpp index 4abf19b8..e4d8e589 100644 --- a/src/scripts/instances/dungeons/BaelsarsWall.cpp +++ b/src/scripts/instances/dungeons/BaelsarsWall.cpp @@ -48,7 +48,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/BardamsMettle.cpp b/src/scripts/instances/dungeons/BardamsMettle.cpp index 12e58913..21dde3f0 100644 --- a/src/scripts/instances/dungeons/BardamsMettle.cpp +++ b/src/scripts/instances/dungeons/BardamsMettle.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/BrayfloxsLongstop.cpp b/src/scripts/instances/dungeons/BrayfloxsLongstop.cpp index b73f22f7..84e25b50 100644 --- a/src/scripts/instances/dungeons/BrayfloxsLongstop.cpp +++ b/src/scripts/instances/dungeons/BrayfloxsLongstop.cpp @@ -39,7 +39,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/BrayfloxsLongstopHard.cpp b/src/scripts/instances/dungeons/BrayfloxsLongstopHard.cpp index 445326ce..3a33837a 100644 --- a/src/scripts/instances/dungeons/BrayfloxsLongstopHard.cpp +++ b/src/scripts/instances/dungeons/BrayfloxsLongstopHard.cpp @@ -45,7 +45,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/CastrumAbania.cpp b/src/scripts/instances/dungeons/CastrumAbania.cpp index 4abd446b..70d222cf 100644 --- a/src/scripts/instances/dungeons/CastrumAbania.cpp +++ b/src/scripts/instances/dungeons/CastrumAbania.cpp @@ -78,7 +78,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/CastrumMeridianum.cpp b/src/scripts/instances/dungeons/CastrumMeridianum.cpp index fdbe3b26..b827067f 100644 --- a/src/scripts/instances/dungeons/CastrumMeridianum.cpp +++ b/src/scripts/instances/dungeons/CastrumMeridianum.cpp @@ -86,7 +86,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/CopperbellMines.cpp b/src/scripts/instances/dungeons/CopperbellMines.cpp index 36bb44e7..f8638ca4 100644 --- a/src/scripts/instances/dungeons/CopperbellMines.cpp +++ b/src/scripts/instances/dungeons/CopperbellMines.cpp @@ -70,7 +70,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/CopperbellMinesHard.cpp b/src/scripts/instances/dungeons/CopperbellMinesHard.cpp index a4e5ba93..98106180 100644 --- a/src/scripts/instances/dungeons/CopperbellMinesHard.cpp +++ b/src/scripts/instances/dungeons/CopperbellMinesHard.cpp @@ -62,7 +62,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/CuttersCry.cpp b/src/scripts/instances/dungeons/CuttersCry.cpp index a76be6f8..87618d13 100644 --- a/src/scripts/instances/dungeons/CuttersCry.cpp +++ b/src/scripts/instances/dungeons/CuttersCry.cpp @@ -56,7 +56,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/DomaCastle.cpp b/src/scripts/instances/dungeons/DomaCastle.cpp index deb2a176..bd0fcb3c 100644 --- a/src/scripts/instances/dungeons/DomaCastle.cpp +++ b/src/scripts/instances/dungeons/DomaCastle.cpp @@ -51,7 +51,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/DzemaelDarkhold.cpp b/src/scripts/instances/dungeons/DzemaelDarkhold.cpp index d55834c9..fc3eb969 100644 --- a/src/scripts/instances/dungeons/DzemaelDarkhold.cpp +++ b/src/scripts/instances/dungeons/DzemaelDarkhold.cpp @@ -116,7 +116,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/Halatali.cpp b/src/scripts/instances/dungeons/Halatali.cpp index 50ef09fc..d9b0a5f4 100644 --- a/src/scripts/instances/dungeons/Halatali.cpp +++ b/src/scripts/instances/dungeons/Halatali.cpp @@ -67,7 +67,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/HalataliHard.cpp b/src/scripts/instances/dungeons/HalataliHard.cpp index 3237668e..808a7a95 100644 --- a/src/scripts/instances/dungeons/HalataliHard.cpp +++ b/src/scripts/instances/dungeons/HalataliHard.cpp @@ -72,7 +72,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/HaukkeManor.cpp b/src/scripts/instances/dungeons/HaukkeManor.cpp index 777c8a50..4ad86d9a 100644 --- a/src/scripts/instances/dungeons/HaukkeManor.cpp +++ b/src/scripts/instances/dungeons/HaukkeManor.cpp @@ -60,7 +60,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/HaukkeManorHard.cpp b/src/scripts/instances/dungeons/HaukkeManorHard.cpp index 456fd70b..4f22ca09 100644 --- a/src/scripts/instances/dungeons/HaukkeManorHard.cpp +++ b/src/scripts/instances/dungeons/HaukkeManorHard.cpp @@ -86,7 +86,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/HellsLid.cpp b/src/scripts/instances/dungeons/HellsLid.cpp index a63f5d30..753fdfc5 100644 --- a/src/scripts/instances/dungeons/HellsLid.cpp +++ b/src/scripts/instances/dungeons/HellsLid.cpp @@ -65,7 +65,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/HullbreakerIsle.cpp b/src/scripts/instances/dungeons/HullbreakerIsle.cpp index 329d6ed3..c6274fa0 100644 --- a/src/scripts/instances/dungeons/HullbreakerIsle.cpp +++ b/src/scripts/instances/dungeons/HullbreakerIsle.cpp @@ -84,7 +84,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/HullbreakerIsleHard.cpp b/src/scripts/instances/dungeons/HullbreakerIsleHard.cpp index b16e42bc..7e475352 100644 --- a/src/scripts/instances/dungeons/HullbreakerIsleHard.cpp +++ b/src/scripts/instances/dungeons/HullbreakerIsleHard.cpp @@ -47,7 +47,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/KuganeCastle.cpp b/src/scripts/instances/dungeons/KuganeCastle.cpp index 3a9547c4..9b740ef1 100644 --- a/src/scripts/instances/dungeons/KuganeCastle.cpp +++ b/src/scripts/instances/dungeons/KuganeCastle.cpp @@ -83,7 +83,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/Neverreap.cpp b/src/scripts/instances/dungeons/Neverreap.cpp index 1b6a35a7..d4b4230a 100644 --- a/src/scripts/instances/dungeons/Neverreap.cpp +++ b/src/scripts/instances/dungeons/Neverreap.cpp @@ -70,7 +70,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/PharosSirius.cpp b/src/scripts/instances/dungeons/PharosSirius.cpp index 6a3d4fe1..0ff2361d 100644 --- a/src/scripts/instances/dungeons/PharosSirius.cpp +++ b/src/scripts/instances/dungeons/PharosSirius.cpp @@ -51,7 +51,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/PharosSiriusHard.cpp b/src/scripts/instances/dungeons/PharosSiriusHard.cpp index d4d4602f..9fffaa6d 100644 --- a/src/scripts/instances/dungeons/PharosSiriusHard.cpp +++ b/src/scripts/instances/dungeons/PharosSiriusHard.cpp @@ -48,7 +48,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/SaintMociannesArboretum.cpp b/src/scripts/instances/dungeons/SaintMociannesArboretum.cpp index fbfe0804..7b4f3c9c 100644 --- a/src/scripts/instances/dungeons/SaintMociannesArboretum.cpp +++ b/src/scripts/instances/dungeons/SaintMociannesArboretum.cpp @@ -47,7 +47,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/SaintMociannesArboretumHard.cpp b/src/scripts/instances/dungeons/SaintMociannesArboretumHard.cpp index 8c94a281..6203d120 100644 --- a/src/scripts/instances/dungeons/SaintMociannesArboretumHard.cpp +++ b/src/scripts/instances/dungeons/SaintMociannesArboretumHard.cpp @@ -52,7 +52,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/Sastasha.cpp b/src/scripts/instances/dungeons/Sastasha.cpp index c95cd84e..18751f08 100644 --- a/src/scripts/instances/dungeons/Sastasha.cpp +++ b/src/scripts/instances/dungeons/Sastasha.cpp @@ -67,7 +67,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/SastashaHard.cpp b/src/scripts/instances/dungeons/SastashaHard.cpp index 051a6d33..e2420c39 100644 --- a/src/scripts/instances/dungeons/SastashaHard.cpp +++ b/src/scripts/instances/dungeons/SastashaHard.cpp @@ -56,7 +56,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/ShisuioftheVioletTides.cpp b/src/scripts/instances/dungeons/ShisuioftheVioletTides.cpp index 4c07fdc3..de575bbf 100644 --- a/src/scripts/instances/dungeons/ShisuioftheVioletTides.cpp +++ b/src/scripts/instances/dungeons/ShisuioftheVioletTides.cpp @@ -64,7 +64,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/Snowcloak.cpp b/src/scripts/instances/dungeons/Snowcloak.cpp index 111152f9..ca5ae3f4 100644 --- a/src/scripts/instances/dungeons/Snowcloak.cpp +++ b/src/scripts/instances/dungeons/Snowcloak.cpp @@ -62,7 +62,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/SohmAl.cpp b/src/scripts/instances/dungeons/SohmAl.cpp index 511c0b2f..825c4102 100644 --- a/src/scripts/instances/dungeons/SohmAl.cpp +++ b/src/scripts/instances/dungeons/SohmAl.cpp @@ -44,7 +44,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/SohmAlHard.cpp b/src/scripts/instances/dungeons/SohmAlHard.cpp index 5b34739f..d21ee507 100644 --- a/src/scripts/instances/dungeons/SohmAlHard.cpp +++ b/src/scripts/instances/dungeons/SohmAlHard.cpp @@ -64,7 +64,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/SohrKhai.cpp b/src/scripts/instances/dungeons/SohrKhai.cpp index 3f00e175..3df469c1 100644 --- a/src/scripts/instances/dungeons/SohrKhai.cpp +++ b/src/scripts/instances/dungeons/SohrKhai.cpp @@ -50,7 +50,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheAery.cpp b/src/scripts/instances/dungeons/TheAery.cpp index 72429e25..93bc3e03 100644 --- a/src/scripts/instances/dungeons/TheAery.cpp +++ b/src/scripts/instances/dungeons/TheAery.cpp @@ -42,7 +42,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp b/src/scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp index d140baef..6819e79a 100644 --- a/src/scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp +++ b/src/scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp @@ -54,7 +54,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheAntitower.cpp b/src/scripts/instances/dungeons/TheAntitower.cpp index 72ff6a9e..bab5fe35 100644 --- a/src/scripts/instances/dungeons/TheAntitower.cpp +++ b/src/scripts/instances/dungeons/TheAntitower.cpp @@ -73,7 +73,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheAurumVale.cpp b/src/scripts/instances/dungeons/TheAurumVale.cpp index 12397cc9..ceb80bf8 100644 --- a/src/scripts/instances/dungeons/TheAurumVale.cpp +++ b/src/scripts/instances/dungeons/TheAurumVale.cpp @@ -38,7 +38,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheBurn.cpp b/src/scripts/instances/dungeons/TheBurn.cpp index fe63339a..475c9955 100644 --- a/src/scripts/instances/dungeons/TheBurn.cpp +++ b/src/scripts/instances/dungeons/TheBurn.cpp @@ -48,7 +48,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheDrownedCityofSkalla.cpp b/src/scripts/instances/dungeons/TheDrownedCityofSkalla.cpp index dee522b4..60de516a 100644 --- a/src/scripts/instances/dungeons/TheDrownedCityofSkalla.cpp +++ b/src/scripts/instances/dungeons/TheDrownedCityofSkalla.cpp @@ -51,7 +51,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheDuskVigil.cpp b/src/scripts/instances/dungeons/TheDuskVigil.cpp index a192a877..e30050a8 100644 --- a/src/scripts/instances/dungeons/TheDuskVigil.cpp +++ b/src/scripts/instances/dungeons/TheDuskVigil.cpp @@ -63,7 +63,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheFractalContinuum.cpp b/src/scripts/instances/dungeons/TheFractalContinuum.cpp index 2a6cf669..4f13f09d 100644 --- a/src/scripts/instances/dungeons/TheFractalContinuum.cpp +++ b/src/scripts/instances/dungeons/TheFractalContinuum.cpp @@ -85,7 +85,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheFractalContinuumHard.cpp b/src/scripts/instances/dungeons/TheFractalContinuumHard.cpp index 6c9d47e4..b41137f2 100644 --- a/src/scripts/instances/dungeons/TheFractalContinuumHard.cpp +++ b/src/scripts/instances/dungeons/TheFractalContinuumHard.cpp @@ -55,7 +55,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheGhimlytDark.cpp b/src/scripts/instances/dungeons/TheGhimlytDark.cpp index 124daead..3479b9cc 100644 --- a/src/scripts/instances/dungeons/TheGhimlytDark.cpp +++ b/src/scripts/instances/dungeons/TheGhimlytDark.cpp @@ -62,7 +62,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheGreatGubalLibrary.cpp b/src/scripts/instances/dungeons/TheGreatGubalLibrary.cpp index 01e088b8..ff9d41b5 100644 --- a/src/scripts/instances/dungeons/TheGreatGubalLibrary.cpp +++ b/src/scripts/instances/dungeons/TheGreatGubalLibrary.cpp @@ -56,7 +56,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp b/src/scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp index 0df46961..925f874c 100644 --- a/src/scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp +++ b/src/scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp @@ -66,7 +66,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheKeeperoftheLake.cpp b/src/scripts/instances/dungeons/TheKeeperoftheLake.cpp index d89a1267..0ba14dc6 100644 --- a/src/scripts/instances/dungeons/TheKeeperoftheLake.cpp +++ b/src/scripts/instances/dungeons/TheKeeperoftheLake.cpp @@ -51,7 +51,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheLostCityofAmdapor.cpp b/src/scripts/instances/dungeons/TheLostCityofAmdapor.cpp index a6a014bc..dbfd1fee 100644 --- a/src/scripts/instances/dungeons/TheLostCityofAmdapor.cpp +++ b/src/scripts/instances/dungeons/TheLostCityofAmdapor.cpp @@ -71,7 +71,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp b/src/scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp index f8e843a5..73e27b7e 100644 --- a/src/scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp +++ b/src/scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp @@ -62,7 +62,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/ThePraetorium.cpp b/src/scripts/instances/dungeons/ThePraetorium.cpp index 286fb61c..a341d25a 100644 --- a/src/scripts/instances/dungeons/ThePraetorium.cpp +++ b/src/scripts/instances/dungeons/ThePraetorium.cpp @@ -132,7 +132,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheSirensongSea.cpp b/src/scripts/instances/dungeons/TheSirensongSea.cpp index 50ea1d82..7f8b25ee 100644 --- a/src/scripts/instances/dungeons/TheSirensongSea.cpp +++ b/src/scripts/instances/dungeons/TheSirensongSea.cpp @@ -49,7 +49,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheStoneVigil.cpp b/src/scripts/instances/dungeons/TheStoneVigil.cpp index 94b5ebe2..1370e8ce 100644 --- a/src/scripts/instances/dungeons/TheStoneVigil.cpp +++ b/src/scripts/instances/dungeons/TheStoneVigil.cpp @@ -53,7 +53,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheStoneVigilHard.cpp b/src/scripts/instances/dungeons/TheStoneVigilHard.cpp index a406df03..309d3397 100644 --- a/src/scripts/instances/dungeons/TheStoneVigilHard.cpp +++ b/src/scripts/instances/dungeons/TheStoneVigilHard.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheSunkenTempleofQarn.cpp b/src/scripts/instances/dungeons/TheSunkenTempleofQarn.cpp index 806afb40..a47f25e6 100644 --- a/src/scripts/instances/dungeons/TheSunkenTempleofQarn.cpp +++ b/src/scripts/instances/dungeons/TheSunkenTempleofQarn.cpp @@ -79,7 +79,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp b/src/scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp index 86c6f868..cb9c4b43 100644 --- a/src/scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp +++ b/src/scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp @@ -70,7 +70,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheSwallowsCompass.cpp b/src/scripts/instances/dungeons/TheSwallowsCompass.cpp index 5d479c71..9df99d8e 100644 --- a/src/scripts/instances/dungeons/TheSwallowsCompass.cpp +++ b/src/scripts/instances/dungeons/TheSwallowsCompass.cpp @@ -58,7 +58,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheTamTaraDeepcroft.cpp b/src/scripts/instances/dungeons/TheTamTaraDeepcroft.cpp index 23770d70..2b658e2b 100644 --- a/src/scripts/instances/dungeons/TheTamTaraDeepcroft.cpp +++ b/src/scripts/instances/dungeons/TheTamTaraDeepcroft.cpp @@ -47,7 +47,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp b/src/scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp index 2e776318..53ae55d5 100644 --- a/src/scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp +++ b/src/scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp @@ -94,7 +94,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheTempleoftheFist.cpp b/src/scripts/instances/dungeons/TheTempleoftheFist.cpp index 337769be..227f2cfb 100644 --- a/src/scripts/instances/dungeons/TheTempleoftheFist.cpp +++ b/src/scripts/instances/dungeons/TheTempleoftheFist.cpp @@ -59,7 +59,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp b/src/scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp index 6faef088..6c0e532e 100644 --- a/src/scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp +++ b/src/scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp @@ -69,7 +69,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheVault.cpp b/src/scripts/instances/dungeons/TheVault.cpp index 91b570e0..92c5d320 100644 --- a/src/scripts/instances/dungeons/TheVault.cpp +++ b/src/scripts/instances/dungeons/TheVault.cpp @@ -61,7 +61,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheWanderersPalace.cpp b/src/scripts/instances/dungeons/TheWanderersPalace.cpp index 66fea728..5b0b6a88 100644 --- a/src/scripts/instances/dungeons/TheWanderersPalace.cpp +++ b/src/scripts/instances/dungeons/TheWanderersPalace.cpp @@ -70,7 +70,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/TheWanderersPalaceHard.cpp b/src/scripts/instances/dungeons/TheWanderersPalaceHard.cpp index 1d8da9ae..36afdf26 100644 --- a/src/scripts/instances/dungeons/TheWanderersPalaceHard.cpp +++ b/src/scripts/instances/dungeons/TheWanderersPalaceHard.cpp @@ -51,7 +51,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/dungeons/Xelphatol.cpp b/src/scripts/instances/dungeons/Xelphatol.cpp index 44793382..eafbea5e 100644 --- a/src/scripts/instances/dungeons/Xelphatol.cpp +++ b/src/scripts/instances/dungeons/Xelphatol.cpp @@ -57,7 +57,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/events/TheHauntedManor.cpp b/src/scripts/instances/events/TheHauntedManor.cpp index e9b2da64..ebe31a7a 100644 --- a/src/scripts/instances/events/TheHauntedManor.cpp +++ b/src/scripts/instances/events/TheHauntedManor.cpp @@ -33,7 +33,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/events/TheValentionesCeremony.cpp b/src/scripts/instances/events/TheValentionesCeremony.cpp index 2b91507c..9439b059 100644 --- a/src/scripts/instances/events/TheValentionesCeremony.cpp +++ b/src/scripts/instances/events/TheValentionesCeremony.cpp @@ -61,7 +61,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/goldsaucer/AirForceOne.cpp b/src/scripts/instances/goldsaucer/AirForceOne.cpp index f864f8a4..d528a761 100644 --- a/src/scripts/instances/goldsaucer/AirForceOne.cpp +++ b/src/scripts/instances/goldsaucer/AirForceOne.cpp @@ -21,7 +21,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/goldsaucer/mahjong/AdvancedMahjongRanked.cpp b/src/scripts/instances/goldsaucer/mahjong/AdvancedMahjongRanked.cpp index df6f588a..709aaf08 100644 --- a/src/scripts/instances/goldsaucer/mahjong/AdvancedMahjongRanked.cpp +++ b/src/scripts/instances/goldsaucer/mahjong/AdvancedMahjongRanked.cpp @@ -17,7 +17,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanDisabled.cpp b/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanDisabled.cpp index 4eb0d210..4a093cd4 100644 --- a/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanDisabled.cpp +++ b/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanDisabled.cpp @@ -17,7 +17,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanEnabled.cpp b/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanEnabled.cpp index 727283f8..4e0bba4a 100644 --- a/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanEnabled.cpp +++ b/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanEnabled.cpp @@ -17,7 +17,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/goldsaucer/mahjong/NoviceMahjongRanked.cpp b/src/scripts/instances/goldsaucer/mahjong/NoviceMahjongRanked.cpp index 5da77f34..e1d2022d 100644 --- a/src/scripts/instances/goldsaucer/mahjong/NoviceMahjongRanked.cpp +++ b/src/scripts/instances/goldsaucer/mahjong/NoviceMahjongRanked.cpp @@ -17,7 +17,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp b/src/scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp index 7b227bf4..712825ed 100644 --- a/src/scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp +++ b/src/scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/AnnoytheVoid.cpp b/src/scripts/instances/guildhests/AnnoytheVoid.cpp index 82c0ce83..94e1c7cb 100644 --- a/src/scripts/instances/guildhests/AnnoytheVoid.cpp +++ b/src/scripts/instances/guildhests/AnnoytheVoid.cpp @@ -16,7 +16,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/BasicTrainingEnemyParties.cpp b/src/scripts/instances/guildhests/BasicTrainingEnemyParties.cpp index eb485ce3..e4faa527 100644 --- a/src/scripts/instances/guildhests/BasicTrainingEnemyParties.cpp +++ b/src/scripts/instances/guildhests/BasicTrainingEnemyParties.cpp @@ -16,7 +16,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp b/src/scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp index 07880875..147f35b5 100644 --- a/src/scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp +++ b/src/scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/FlickingSticksandTakingNames.cpp b/src/scripts/instances/guildhests/FlickingSticksandTakingNames.cpp index cc1a9e4e..90296871 100644 --- a/src/scripts/instances/guildhests/FlickingSticksandTakingNames.cpp +++ b/src/scripts/instances/guildhests/FlickingSticksandTakingNames.cpp @@ -17,7 +17,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/HeroontheHalfShell.cpp b/src/scripts/instances/guildhests/HeroontheHalfShell.cpp index eca2fabe..b2adc988 100644 --- a/src/scripts/instances/guildhests/HeroontheHalfShell.cpp +++ b/src/scripts/instances/guildhests/HeroontheHalfShell.cpp @@ -16,7 +16,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/LongLivetheQueen.cpp b/src/scripts/instances/guildhests/LongLivetheQueen.cpp index 242d3d00..72b6f177 100644 --- a/src/scripts/instances/guildhests/LongLivetheQueen.cpp +++ b/src/scripts/instances/guildhests/LongLivetheQueen.cpp @@ -33,7 +33,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/MorethanaFeeler.cpp b/src/scripts/instances/guildhests/MorethanaFeeler.cpp index a4c75d4f..2e00cb36 100644 --- a/src/scripts/instances/guildhests/MorethanaFeeler.cpp +++ b/src/scripts/instances/guildhests/MorethanaFeeler.cpp @@ -16,7 +16,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/PullingPoisonPosies.cpp b/src/scripts/instances/guildhests/PullingPoisonPosies.cpp index 0746a0b5..a448ca4a 100644 --- a/src/scripts/instances/guildhests/PullingPoisonPosies.cpp +++ b/src/scripts/instances/guildhests/PullingPoisonPosies.cpp @@ -16,7 +16,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/ShadowandClaw.cpp b/src/scripts/instances/guildhests/ShadowandClaw.cpp index 1298d86d..343240ff 100644 --- a/src/scripts/instances/guildhests/ShadowandClaw.cpp +++ b/src/scripts/instances/guildhests/ShadowandClaw.cpp @@ -33,7 +33,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/SolemnTrinity.cpp b/src/scripts/instances/guildhests/SolemnTrinity.cpp index 3afed870..797112f5 100644 --- a/src/scripts/instances/guildhests/SolemnTrinity.cpp +++ b/src/scripts/instances/guildhests/SolemnTrinity.cpp @@ -16,7 +16,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/StingingBack.cpp b/src/scripts/instances/guildhests/StingingBack.cpp index b1eed505..bb12801f 100644 --- a/src/scripts/instances/guildhests/StingingBack.cpp +++ b/src/scripts/instances/guildhests/StingingBack.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/UndertheArmor.cpp b/src/scripts/instances/guildhests/UndertheArmor.cpp index ee63c735..cb2a304c 100644 --- a/src/scripts/instances/guildhests/UndertheArmor.cpp +++ b/src/scripts/instances/guildhests/UndertheArmor.cpp @@ -17,7 +17,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/guildhests/WardUp.cpp b/src/scripts/instances/guildhests/WardUp.cpp index f15eaf50..ae34c667 100644 --- a/src/scripts/instances/guildhests/WardUp.cpp +++ b/src/scripts/instances/guildhests/WardUp.cpp @@ -16,7 +16,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp b/src/scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp index 6a3b9b91..cb29f606 100644 --- a/src/scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp +++ b/src/scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp b/src/scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp index 76e8f74b..253effb4 100644 --- a/src/scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp +++ b/src/scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp b/src/scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp index 2ed2a99a..099a22ef 100644 --- a/src/scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp +++ b/src/scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp b/src/scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp index 68cd07fc..866b59e5 100644 --- a/src/scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp +++ b/src/scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp b/src/scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp index e250bcf0..d610f2eb 100644 --- a/src/scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp +++ b/src/scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp b/src/scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp index c632c6e4..0df1df56 100644 --- a/src/scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp +++ b/src/scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/EngageMultipleTargets.cpp b/src/scripts/instances/hallofthenovice/EngageMultipleTargets.cpp index 5f8f73dc..8912f72a 100644 --- a/src/scripts/instances/hallofthenovice/EngageMultipleTargets.cpp +++ b/src/scripts/instances/hallofthenovice/EngageMultipleTargets.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp b/src/scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp index 42b5ea96..b05b322e 100644 --- a/src/scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp +++ b/src/scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp b/src/scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp index 44099ac9..c60c353d 100644 --- a/src/scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp +++ b/src/scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp index 85c15015..0d40598f 100644 --- a/src/scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp +++ b/src/scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/FinalExercise.cpp b/src/scripts/instances/hallofthenovice/FinalExercise.cpp index 72b74366..3b82596c 100644 --- a/src/scripts/instances/hallofthenovice/FinalExercise.cpp +++ b/src/scripts/instances/hallofthenovice/FinalExercise.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/HealMultipleAllies.cpp b/src/scripts/instances/hallofthenovice/HealMultipleAllies.cpp index 966878c4..a5622726 100644 --- a/src/scripts/instances/hallofthenovice/HealMultipleAllies.cpp +++ b/src/scripts/instances/hallofthenovice/HealMultipleAllies.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/HealanAlly.cpp b/src/scripts/instances/hallofthenovice/HealanAlly.cpp index 3e75fdf3..27cbaced 100644 --- a/src/scripts/instances/hallofthenovice/HealanAlly.cpp +++ b/src/scripts/instances/hallofthenovice/HealanAlly.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp b/src/scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp index 218b0c13..6abe3f8e 100644 --- a/src/scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp +++ b/src/scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/AChorusSlime.cpp b/src/scripts/instances/maskedcarnivale/AChorusSlime.cpp index ac409368..4277bc22 100644 --- a/src/scripts/instances/maskedcarnivale/AChorusSlime.cpp +++ b/src/scripts/instances/maskedcarnivale/AChorusSlime.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/ALittleKnightMusic.cpp b/src/scripts/instances/maskedcarnivale/ALittleKnightMusic.cpp index baf693df..3cbd5997 100644 --- a/src/scripts/instances/maskedcarnivale/ALittleKnightMusic.cpp +++ b/src/scripts/instances/maskedcarnivale/ALittleKnightMusic.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/AllsWellThatStartsWell.cpp b/src/scripts/instances/maskedcarnivale/AllsWellThatStartsWell.cpp index b718006b..4549df7f 100644 --- a/src/scripts/instances/maskedcarnivale/AllsWellThatStartsWell.cpp +++ b/src/scripts/instances/maskedcarnivale/AllsWellThatStartsWell.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/AmazingTechnicolorPitFiends.cpp b/src/scripts/instances/maskedcarnivale/AmazingTechnicolorPitFiends.cpp index 08b1d75c..2010f604 100644 --- a/src/scripts/instances/maskedcarnivale/AmazingTechnicolorPitFiends.cpp +++ b/src/scripts/instances/maskedcarnivale/AmazingTechnicolorPitFiends.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/BeautyandaBeast.cpp b/src/scripts/instances/maskedcarnivale/BeautyandaBeast.cpp index 7e54c1f4..7cf3f4fd 100644 --- a/src/scripts/instances/maskedcarnivale/BeautyandaBeast.cpp +++ b/src/scripts/instances/maskedcarnivale/BeautyandaBeast.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/BehemothsandBroomsticks.cpp b/src/scripts/instances/maskedcarnivale/BehemothsandBroomsticks.cpp index 4f25fdec..fde13f58 100644 --- a/src/scripts/instances/maskedcarnivale/BehemothsandBroomsticks.cpp +++ b/src/scripts/instances/maskedcarnivale/BehemothsandBroomsticks.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/BlobsintheWoods.cpp b/src/scripts/instances/maskedcarnivale/BlobsintheWoods.cpp index 7fb169d1..30f59949 100644 --- a/src/scripts/instances/maskedcarnivale/BlobsintheWoods.cpp +++ b/src/scripts/instances/maskedcarnivale/BlobsintheWoods.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/BombedyofErrors.cpp b/src/scripts/instances/maskedcarnivale/BombedyofErrors.cpp index 9e97000d..c5652b28 100644 --- a/src/scripts/instances/maskedcarnivale/BombedyofErrors.cpp +++ b/src/scripts/instances/maskedcarnivale/BombedyofErrors.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/ChimeraonaHotTinRoof.cpp b/src/scripts/instances/maskedcarnivale/ChimeraonaHotTinRoof.cpp index deb1fe15..864b6261 100644 --- a/src/scripts/instances/maskedcarnivale/ChimeraonaHotTinRoof.cpp +++ b/src/scripts/instances/maskedcarnivale/ChimeraonaHotTinRoof.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/DirtyRottenAzulmagia.cpp b/src/scripts/instances/maskedcarnivale/DirtyRottenAzulmagia.cpp index 48074969..c1232522 100644 --- a/src/scripts/instances/maskedcarnivale/DirtyRottenAzulmagia.cpp +++ b/src/scripts/instances/maskedcarnivale/DirtyRottenAzulmagia.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/EyeSociety.cpp b/src/scripts/instances/maskedcarnivale/EyeSociety.cpp index a2d84794..52c1b705 100644 --- a/src/scripts/instances/maskedcarnivale/EyeSociety.cpp +++ b/src/scripts/instances/maskedcarnivale/EyeSociety.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/GentlemenPreferSwords.cpp b/src/scripts/instances/maskedcarnivale/GentlemenPreferSwords.cpp index bb9fd66c..0b061f21 100644 --- a/src/scripts/instances/maskedcarnivale/GentlemenPreferSwords.cpp +++ b/src/scripts/instances/maskedcarnivale/GentlemenPreferSwords.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/HereComestheBoom.cpp b/src/scripts/instances/maskedcarnivale/HereComestheBoom.cpp index 27869627..6d32a6b8 100644 --- a/src/scripts/instances/maskedcarnivale/HereComestheBoom.cpp +++ b/src/scripts/instances/maskedcarnivale/HereComestheBoom.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/MidsummerNightsExplosion.cpp b/src/scripts/instances/maskedcarnivale/MidsummerNightsExplosion.cpp index 08e7982d..527cc2c6 100644 --- a/src/scripts/instances/maskedcarnivale/MidsummerNightsExplosion.cpp +++ b/src/scripts/instances/maskedcarnivale/MidsummerNightsExplosion.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/MissTyphon.cpp b/src/scripts/instances/maskedcarnivale/MissTyphon.cpp index 4dd23166..83578f48 100644 --- a/src/scripts/instances/maskedcarnivale/MissTyphon.cpp +++ b/src/scripts/instances/maskedcarnivale/MissTyphon.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/MuchAdoAboutPudding.cpp b/src/scripts/instances/maskedcarnivale/MuchAdoAboutPudding.cpp index 9140f794..d93640cc 100644 --- a/src/scripts/instances/maskedcarnivale/MuchAdoAboutPudding.cpp +++ b/src/scripts/instances/maskedcarnivale/MuchAdoAboutPudding.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/OnaClearDayYouCanSmellForever.cpp b/src/scripts/instances/maskedcarnivale/OnaClearDayYouCanSmellForever.cpp index d6a65030..00f10d90 100644 --- a/src/scripts/instances/maskedcarnivale/OnaClearDayYouCanSmellForever.cpp +++ b/src/scripts/instances/maskedcarnivale/OnaClearDayYouCanSmellForever.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/SomeLikeItExcruciatinglyHot.cpp b/src/scripts/instances/maskedcarnivale/SomeLikeItExcruciatinglyHot.cpp index 9a7cae91..ed2a9fab 100644 --- a/src/scripts/instances/maskedcarnivale/SomeLikeItExcruciatinglyHot.cpp +++ b/src/scripts/instances/maskedcarnivale/SomeLikeItExcruciatinglyHot.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/SunsetBullevard.cpp b/src/scripts/instances/maskedcarnivale/SunsetBullevard.cpp index 204b6bdc..7757bb25 100644 --- a/src/scripts/instances/maskedcarnivale/SunsetBullevard.cpp +++ b/src/scripts/instances/maskedcarnivale/SunsetBullevard.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/TheMeNobodyNodes.cpp b/src/scripts/instances/maskedcarnivale/TheMeNobodyNodes.cpp index 46c81496..9380a0e5 100644 --- a/src/scripts/instances/maskedcarnivale/TheMeNobodyNodes.cpp +++ b/src/scripts/instances/maskedcarnivale/TheMeNobodyNodes.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/ThePlantomoftheOpera.cpp b/src/scripts/instances/maskedcarnivale/ThePlantomoftheOpera.cpp index 383752f7..65f2f167 100644 --- a/src/scripts/instances/maskedcarnivale/ThePlantomoftheOpera.cpp +++ b/src/scripts/instances/maskedcarnivale/ThePlantomoftheOpera.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/TheSwordofMusic.cpp b/src/scripts/instances/maskedcarnivale/TheSwordofMusic.cpp index f143968b..7e829055 100644 --- a/src/scripts/instances/maskedcarnivale/TheSwordofMusic.cpp +++ b/src/scripts/instances/maskedcarnivale/TheSwordofMusic.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/TheThreepennyTurtles.cpp b/src/scripts/instances/maskedcarnivale/TheThreepennyTurtles.cpp index a928be82..c589e0ca 100644 --- a/src/scripts/instances/maskedcarnivale/TheThreepennyTurtles.cpp +++ b/src/scripts/instances/maskedcarnivale/TheThreepennyTurtles.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/ToKillaMockingslime.cpp b/src/scripts/instances/maskedcarnivale/ToKillaMockingslime.cpp index 09a207ac..90fa7caf 100644 --- a/src/scripts/instances/maskedcarnivale/ToKillaMockingslime.cpp +++ b/src/scripts/instances/maskedcarnivale/ToKillaMockingslime.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/maskedcarnivale/WaitingforGolem.cpp b/src/scripts/instances/maskedcarnivale/WaitingforGolem.cpp index 34d06f45..de96fedb 100644 --- a/src/scripts/instances/maskedcarnivale/WaitingforGolem.cpp +++ b/src/scripts/instances/maskedcarnivale/WaitingforGolem.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/SealRockSeize.cpp b/src/scripts/instances/pvp/SealRockSeize.cpp index f5329df4..04c4b829 100644 --- a/src/scripts/instances/pvp/SealRockSeize.cpp +++ b/src/scripts/instances/pvp/SealRockSeize.cpp @@ -82,7 +82,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/TheBorderlandRuinsSecure.cpp b/src/scripts/instances/pvp/TheBorderlandRuinsSecure.cpp index 31ebc730..5c888d1a 100644 --- a/src/scripts/instances/pvp/TheBorderlandRuinsSecure.cpp +++ b/src/scripts/instances/pvp/TheBorderlandRuinsSecure.cpp @@ -41,7 +41,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/TheFieldsofGloryShatter.cpp b/src/scripts/instances/pvp/TheFieldsofGloryShatter.cpp index 02a56e34..b78e9235 100644 --- a/src/scripts/instances/pvp/TheFieldsofGloryShatter.cpp +++ b/src/scripts/instances/pvp/TheFieldsofGloryShatter.cpp @@ -44,7 +44,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/rivalwings/Astragalos.cpp b/src/scripts/instances/pvp/rivalwings/Astragalos.cpp index cd424925..d4509aa4 100644 --- a/src/scripts/instances/pvp/rivalwings/Astragalos.cpp +++ b/src/scripts/instances/pvp/rivalwings/Astragalos.cpp @@ -30,7 +30,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/rivalwings/HiddenGorge.cpp b/src/scripts/instances/pvp/rivalwings/HiddenGorge.cpp index bc99911c..23fe4320 100644 --- a/src/scripts/instances/pvp/rivalwings/HiddenGorge.cpp +++ b/src/scripts/instances/pvp/rivalwings/HiddenGorge.cpp @@ -29,7 +29,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/thefeast/TheFeast4on4Ranked.cpp b/src/scripts/instances/pvp/thefeast/TheFeast4on4Ranked.cpp index 9861b4e7..2683e4bd 100644 --- a/src/scripts/instances/pvp/thefeast/TheFeast4on4Ranked.cpp +++ b/src/scripts/instances/pvp/thefeast/TheFeast4on4Ranked.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/thefeast/TheFeast4on4Training.cpp b/src/scripts/instances/pvp/thefeast/TheFeast4on4Training.cpp index 0f647d9c..42be7ed3 100644 --- a/src/scripts/instances/pvp/thefeast/TheFeast4on4Training.cpp +++ b/src/scripts/instances/pvp/thefeast/TheFeast4on4Training.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchCrystalTower.cpp b/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchCrystalTower.cpp index 9fd10b15..62c3c820 100644 --- a/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchCrystalTower.cpp +++ b/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchCrystalTower.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchFeastingGrounds.cpp b/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchFeastingGrounds.cpp index 86d427da..238713da 100644 --- a/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchFeastingGrounds.cpp +++ b/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchFeastingGrounds.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchLichenweed.cpp b/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchLichenweed.cpp index 6e9a992d..d2561263 100644 --- a/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchLichenweed.cpp +++ b/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchLichenweed.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/thefeast/TheFeastRanked.cpp b/src/scripts/instances/pvp/thefeast/TheFeastRanked.cpp index b63957a8..a2e558ac 100644 --- a/src/scripts/instances/pvp/thefeast/TheFeastRanked.cpp +++ b/src/scripts/instances/pvp/thefeast/TheFeastRanked.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/thefeast/TheFeastTeamCustomMatchCrystalTower.cpp b/src/scripts/instances/pvp/thefeast/TheFeastTeamCustomMatchCrystalTower.cpp index 94f41ede..a699258f 100644 --- a/src/scripts/instances/pvp/thefeast/TheFeastTeamCustomMatchCrystalTower.cpp +++ b/src/scripts/instances/pvp/thefeast/TheFeastTeamCustomMatchCrystalTower.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/thefeast/TheFeastTeamRanked.cpp b/src/scripts/instances/pvp/thefeast/TheFeastTeamRanked.cpp index 41571839..5a52b0ed 100644 --- a/src/scripts/instances/pvp/thefeast/TheFeastTeamRanked.cpp +++ b/src/scripts/instances/pvp/thefeast/TheFeastTeamRanked.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/pvp/thefeast/TheFeastTraining.cpp b/src/scripts/instances/pvp/thefeast/TheFeastTraining.cpp index b88d86a0..0190aec9 100644 --- a/src/scripts/instances/pvp/thefeast/TheFeastTraining.cpp +++ b/src/scripts/instances/pvp/thefeast/TheFeastTraining.cpp @@ -18,7 +18,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ABeaconforBadThings.cpp b/src/scripts/instances/questbattles/ABeaconforBadThings.cpp index 3b957f97..a6b28244 100644 --- a/src/scripts/instances/questbattles/ABeaconforBadThings.cpp +++ b/src/scripts/instances/questbattles/ABeaconforBadThings.cpp @@ -37,7 +37,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ADangerousProposition.cpp b/src/scripts/instances/questbattles/ADangerousProposition.cpp index 65148aa8..25cc9488 100644 --- a/src/scripts/instances/questbattles/ADangerousProposition.cpp +++ b/src/scripts/instances/questbattles/ADangerousProposition.cpp @@ -36,7 +36,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AFlarefortheDramatic.cpp b/src/scripts/instances/questbattles/AFlarefortheDramatic.cpp index f8ec416b..1a257d39 100644 --- a/src/scripts/instances/questbattles/AFlarefortheDramatic.cpp +++ b/src/scripts/instances/questbattles/AFlarefortheDramatic.cpp @@ -65,7 +65,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AGameofLifeandDeath.cpp b/src/scripts/instances/questbattles/AGameofLifeandDeath.cpp index 5ec6cf31..0ff6d7b7 100644 --- a/src/scripts/instances/questbattles/AGameofLifeandDeath.cpp +++ b/src/scripts/instances/questbattles/AGameofLifeandDeath.cpp @@ -117,7 +117,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AJourneyofPurification.cpp b/src/scripts/instances/questbattles/AJourneyofPurification.cpp index 6cde9941..f144ab06 100644 --- a/src/scripts/instances/questbattles/AJourneyofPurification.cpp +++ b/src/scripts/instances/questbattles/AJourneyofPurification.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AJoyefulReunion.cpp b/src/scripts/instances/questbattles/AJoyefulReunion.cpp index 551bbad6..3c6b21ce 100644 --- a/src/scripts/instances/questbattles/AJoyefulReunion.cpp +++ b/src/scripts/instances/questbattles/AJoyefulReunion.cpp @@ -42,7 +42,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ASeriesofUnfortunateEvents.cpp b/src/scripts/instances/questbattles/ASeriesofUnfortunateEvents.cpp index 6577de15..9f256b1e 100644 --- a/src/scripts/instances/questbattles/ASeriesofUnfortunateEvents.cpp +++ b/src/scripts/instances/questbattles/ASeriesofUnfortunateEvents.cpp @@ -72,7 +72,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ATestofCourage.cpp b/src/scripts/instances/questbattles/ATestofCourage.cpp index 8c167fc8..ce61cd58 100644 --- a/src/scripts/instances/questbattles/ATestofCourage.cpp +++ b/src/scripts/instances/questbattles/ATestofCourage.cpp @@ -118,7 +118,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AVermilionVendetta.cpp b/src/scripts/instances/questbattles/AVermilionVendetta.cpp index 7e316519..e0a53e24 100644 --- a/src/scripts/instances/questbattles/AVermilionVendetta.cpp +++ b/src/scripts/instances/questbattles/AVermilionVendetta.cpp @@ -58,7 +58,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/Absolution.cpp b/src/scripts/instances/questbattles/Absolution.cpp index 894bbcd6..f8c8d185 100644 --- a/src/scripts/instances/questbattles/Absolution.cpp +++ b/src/scripts/instances/questbattles/Absolution.cpp @@ -63,7 +63,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AgainsttheShadow.cpp b/src/scripts/instances/questbattles/AgainsttheShadow.cpp index 9ba8cd44..937b6019 100644 --- a/src/scripts/instances/questbattles/AgainsttheShadow.cpp +++ b/src/scripts/instances/questbattles/AgainsttheShadow.cpp @@ -31,7 +31,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AlwaysBetonBlack.cpp b/src/scripts/instances/questbattles/AlwaysBetonBlack.cpp index 5842d6e2..242c7ee0 100644 --- a/src/scripts/instances/questbattles/AlwaysBetonBlack.cpp +++ b/src/scripts/instances/questbattles/AlwaysBetonBlack.cpp @@ -34,7 +34,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AnArtfortheLiving.cpp b/src/scripts/instances/questbattles/AnArtfortheLiving.cpp index 740aa386..149294ad 100644 --- a/src/scripts/instances/questbattles/AnArtfortheLiving.cpp +++ b/src/scripts/instances/questbattles/AnArtfortheLiving.cpp @@ -101,7 +101,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AnEgistentialCrisis.cpp b/src/scripts/instances/questbattles/AnEgistentialCrisis.cpp index ae570f68..abdef329 100644 --- a/src/scripts/instances/questbattles/AnEgistentialCrisis.cpp +++ b/src/scripts/instances/questbattles/AnEgistentialCrisis.cpp @@ -140,7 +140,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AnIlluminatiIncident.cpp b/src/scripts/instances/questbattles/AnIlluminatiIncident.cpp index cd906b84..2d134692 100644 --- a/src/scripts/instances/questbattles/AnIlluminatiIncident.cpp +++ b/src/scripts/instances/questbattles/AnIlluminatiIncident.cpp @@ -87,7 +87,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AndMyAxe.cpp b/src/scripts/instances/questbattles/AndMyAxe.cpp index 8b03dd75..db7c838d 100644 --- a/src/scripts/instances/questbattles/AndMyAxe.cpp +++ b/src/scripts/instances/questbattles/AndMyAxe.cpp @@ -75,7 +75,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AppetiteforDestruction.cpp b/src/scripts/instances/questbattles/AppetiteforDestruction.cpp index 397daad2..ef5cc551 100644 --- a/src/scripts/instances/questbattles/AppetiteforDestruction.cpp +++ b/src/scripts/instances/questbattles/AppetiteforDestruction.cpp @@ -83,7 +83,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AsGoesLightSoGoesDarkness.cpp b/src/scripts/instances/questbattles/AsGoesLightSoGoesDarkness.cpp index e0c6ead3..0803cbee 100644 --- a/src/scripts/instances/questbattles/AsGoesLightSoGoesDarkness.cpp +++ b/src/scripts/instances/questbattles/AsGoesLightSoGoesDarkness.cpp @@ -161,7 +161,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AttheEndofOurHope.cpp b/src/scripts/instances/questbattles/AttheEndofOurHope.cpp index 0c2557bb..eae5bd0a 100644 --- a/src/scripts/instances/questbattles/AttheEndofOurHope.cpp +++ b/src/scripts/instances/questbattles/AttheEndofOurHope.cpp @@ -68,7 +68,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AusteritiesofEarth.cpp b/src/scripts/instances/questbattles/AusteritiesofEarth.cpp index 71bb5a75..af35bd8b 100644 --- a/src/scripts/instances/questbattles/AusteritiesofEarth.cpp +++ b/src/scripts/instances/questbattles/AusteritiesofEarth.cpp @@ -49,7 +49,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AusteritiesofFlame.cpp b/src/scripts/instances/questbattles/AusteritiesofFlame.cpp index d5e1d638..c5d13f76 100644 --- a/src/scripts/instances/questbattles/AusteritiesofFlame.cpp +++ b/src/scripts/instances/questbattles/AusteritiesofFlame.cpp @@ -29,7 +29,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AusteritiesofWind.cpp b/src/scripts/instances/questbattles/AusteritiesofWind.cpp index e3362408..97cfa9aa 100644 --- a/src/scripts/instances/questbattles/AusteritiesofWind.cpp +++ b/src/scripts/instances/questbattles/AusteritiesofWind.cpp @@ -31,7 +31,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/AxeintheStone.cpp b/src/scripts/instances/questbattles/AxeintheStone.cpp index 19317ef2..bb62c5a1 100644 --- a/src/scripts/instances/questbattles/AxeintheStone.cpp +++ b/src/scripts/instances/questbattles/AxeintheStone.cpp @@ -45,7 +45,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/BestServedwithColdSteel.cpp b/src/scripts/instances/questbattles/BestServedwithColdSteel.cpp index d9e36a29..4360c3cb 100644 --- a/src/scripts/instances/questbattles/BestServedwithColdSteel.cpp +++ b/src/scripts/instances/questbattles/BestServedwithColdSteel.cpp @@ -101,7 +101,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/BigSolleretstoFill.cpp b/src/scripts/instances/questbattles/BigSolleretstoFill.cpp index e86e058c..c2a29bab 100644 --- a/src/scripts/instances/questbattles/BigSolleretstoFill.cpp +++ b/src/scripts/instances/questbattles/BigSolleretstoFill.cpp @@ -39,7 +39,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/BigTroubleinLittleAlaMhigo.cpp b/src/scripts/instances/questbattles/BigTroubleinLittleAlaMhigo.cpp index 529d7fea..dc576be4 100644 --- a/src/scripts/instances/questbattles/BigTroubleinLittleAlaMhigo.cpp +++ b/src/scripts/instances/questbattles/BigTroubleinLittleAlaMhigo.cpp @@ -55,7 +55,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/BleederofthePack.cpp b/src/scripts/instances/questbattles/BleederofthePack.cpp index 0bd6bd9b..7a997612 100644 --- a/src/scripts/instances/questbattles/BleederofthePack.cpp +++ b/src/scripts/instances/questbattles/BleederofthePack.cpp @@ -55,7 +55,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/BloodontheSands.cpp b/src/scripts/instances/questbattles/BloodontheSands.cpp index f53bf06b..0eaba65a 100644 --- a/src/scripts/instances/questbattles/BloodontheSands.cpp +++ b/src/scripts/instances/questbattles/BloodontheSands.cpp @@ -50,7 +50,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/BringingDowntheMountain.cpp b/src/scripts/instances/questbattles/BringingDowntheMountain.cpp index b4e545e5..2698fa63 100644 --- a/src/scripts/instances/questbattles/BringingDowntheMountain.cpp +++ b/src/scripts/instances/questbattles/BringingDowntheMountain.cpp @@ -40,7 +40,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/BrotherfromAnotherMother.cpp b/src/scripts/instances/questbattles/BrotherfromAnotherMother.cpp index 2d45f1d4..000dce84 100644 --- a/src/scripts/instances/questbattles/BrotherfromAnotherMother.cpp +++ b/src/scripts/instances/questbattles/BrotherfromAnotherMother.cpp @@ -36,7 +36,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/BrotherlyLove.cpp b/src/scripts/instances/questbattles/BrotherlyLove.cpp index fad6d2e0..8ed319e9 100644 --- a/src/scripts/instances/questbattles/BrotherlyLove.cpp +++ b/src/scripts/instances/questbattles/BrotherlyLove.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ChasingShadows.cpp b/src/scripts/instances/questbattles/ChasingShadows.cpp index fb41d969..01324df4 100644 --- a/src/scripts/instances/questbattles/ChasingShadows.cpp +++ b/src/scripts/instances/questbattles/ChasingShadows.cpp @@ -41,7 +41,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ChoicesandPaths.cpp b/src/scripts/instances/questbattles/ChoicesandPaths.cpp index d6b0ac0c..6eeda7d7 100644 --- a/src/scripts/instances/questbattles/ChoicesandPaths.cpp +++ b/src/scripts/instances/questbattles/ChoicesandPaths.cpp @@ -53,7 +53,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/CloseEncountersoftheVIthKind.cpp b/src/scripts/instances/questbattles/CloseEncountersoftheVIthKind.cpp index 63210fcf..1b3babfb 100644 --- a/src/scripts/instances/questbattles/CloseEncountersoftheVIthKind.cpp +++ b/src/scripts/instances/questbattles/CloseEncountersoftheVIthKind.cpp @@ -57,7 +57,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/CloyingVictory.cpp b/src/scripts/instances/questbattles/CloyingVictory.cpp index f338b23a..8d91cf31 100644 --- a/src/scripts/instances/questbattles/CloyingVictory.cpp +++ b/src/scripts/instances/questbattles/CloyingVictory.cpp @@ -72,7 +72,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ComeRainorShrine.cpp b/src/scripts/instances/questbattles/ComeRainorShrine.cpp index c0fe44f9..a0312253 100644 --- a/src/scripts/instances/questbattles/ComeRainorShrine.cpp +++ b/src/scripts/instances/questbattles/ComeRainorShrine.cpp @@ -79,7 +79,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/DeclarationofBlood.cpp b/src/scripts/instances/questbattles/DeclarationofBlood.cpp index 37d2b91f..c67bd8ef 100644 --- a/src/scripts/instances/questbattles/DeclarationofBlood.cpp +++ b/src/scripts/instances/questbattles/DeclarationofBlood.cpp @@ -42,7 +42,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/DestructionintheNameofJustice.cpp b/src/scripts/instances/questbattles/DestructionintheNameofJustice.cpp index cb483649..0a23bf79 100644 --- a/src/scripts/instances/questbattles/DestructionintheNameofJustice.cpp +++ b/src/scripts/instances/questbattles/DestructionintheNameofJustice.cpp @@ -47,7 +47,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/DivineIntervention.cpp b/src/scripts/instances/questbattles/DivineIntervention.cpp index 4f6d8834..a0b077d6 100644 --- a/src/scripts/instances/questbattles/DivineIntervention.cpp +++ b/src/scripts/instances/questbattles/DivineIntervention.cpp @@ -58,7 +58,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/DoingIttheBardWay.cpp b/src/scripts/instances/questbattles/DoingIttheBardWay.cpp index 4ea16ffc..9d6ea87d 100644 --- a/src/scripts/instances/questbattles/DoingIttheBardWay.cpp +++ b/src/scripts/instances/questbattles/DoingIttheBardWay.cpp @@ -24,7 +24,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/DragoonsFate.cpp b/src/scripts/instances/questbattles/DragoonsFate.cpp index e3c04c05..5d104962 100644 --- a/src/scripts/instances/questbattles/DragoonsFate.cpp +++ b/src/scripts/instances/questbattles/DragoonsFate.cpp @@ -57,7 +57,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/DutyHonorCountry.cpp b/src/scripts/instances/questbattles/DutyHonorCountry.cpp index 624805dc..763b8ae5 100644 --- a/src/scripts/instances/questbattles/DutyHonorCountry.cpp +++ b/src/scripts/instances/questbattles/DutyHonorCountry.cpp @@ -66,7 +66,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/DutyandtheBeast.cpp b/src/scripts/instances/questbattles/DutyandtheBeast.cpp index bacf1a54..df7712a9 100644 --- a/src/scripts/instances/questbattles/DutyandtheBeast.cpp +++ b/src/scripts/instances/questbattles/DutyandtheBeast.cpp @@ -61,7 +61,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/EscapefromCastrumCentri.cpp b/src/scripts/instances/questbattles/EscapefromCastrumCentri.cpp index 375dbed6..7a1e446a 100644 --- a/src/scripts/instances/questbattles/EscapefromCastrumCentri.cpp +++ b/src/scripts/instances/questbattles/EscapefromCastrumCentri.cpp @@ -69,7 +69,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/EveryLittleThingSheDoesIsMagitek.cpp b/src/scripts/instances/questbattles/EveryLittleThingSheDoesIsMagitek.cpp index 87ea7d5a..f86e6093 100644 --- a/src/scripts/instances/questbattles/EveryLittleThingSheDoesIsMagitek.cpp +++ b/src/scripts/instances/questbattles/EveryLittleThingSheDoesIsMagitek.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/EwerRight.cpp b/src/scripts/instances/questbattles/EwerRight.cpp index 4505ceff..c260013e 100644 --- a/src/scripts/instances/questbattles/EwerRight.cpp +++ b/src/scripts/instances/questbattles/EwerRight.cpp @@ -34,7 +34,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/FacingYourDemons.cpp b/src/scripts/instances/questbattles/FacingYourDemons.cpp index 2fa87ba2..9be5fae3 100644 --- a/src/scripts/instances/questbattles/FacingYourDemons.cpp +++ b/src/scripts/instances/questbattles/FacingYourDemons.cpp @@ -37,7 +37,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/FamiliarFaces.cpp b/src/scripts/instances/questbattles/FamiliarFaces.cpp index d84d6597..6163f1d0 100644 --- a/src/scripts/instances/questbattles/FamiliarFaces.cpp +++ b/src/scripts/instances/questbattles/FamiliarFaces.cpp @@ -51,7 +51,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/FeatherintheCap.cpp b/src/scripts/instances/questbattles/FeatherintheCap.cpp index f25c6aae..4cd4c4d9 100644 --- a/src/scripts/instances/questbattles/FeatherintheCap.cpp +++ b/src/scripts/instances/questbattles/FeatherintheCap.cpp @@ -50,7 +50,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/FeintandStrike.cpp b/src/scripts/instances/questbattles/FeintandStrike.cpp index 85710185..80fb248c 100644 --- a/src/scripts/instances/questbattles/FeintandStrike.cpp +++ b/src/scripts/instances/questbattles/FeintandStrike.cpp @@ -62,7 +62,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/FireandBlood.cpp b/src/scripts/instances/questbattles/FireandBlood.cpp index d4e4d869..f52941cc 100644 --- a/src/scripts/instances/questbattles/FireandBlood.cpp +++ b/src/scripts/instances/questbattles/FireandBlood.cpp @@ -48,7 +48,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/FiveEasyPieces.cpp b/src/scripts/instances/questbattles/FiveEasyPieces.cpp index 1a7181e3..6356f066 100644 --- a/src/scripts/instances/questbattles/FiveEasyPieces.cpp +++ b/src/scripts/instances/questbattles/FiveEasyPieces.cpp @@ -31,7 +31,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/FoolMeTwice.cpp b/src/scripts/instances/questbattles/FoolMeTwice.cpp index cd6d4229..c872b8d6 100644 --- a/src/scripts/instances/questbattles/FoolMeTwice.cpp +++ b/src/scripts/instances/questbattles/FoolMeTwice.cpp @@ -42,7 +42,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ForgottenbutNotGone.cpp b/src/scripts/instances/questbattles/ForgottenbutNotGone.cpp index 5f6d4a5b..607cad2b 100644 --- a/src/scripts/instances/questbattles/ForgottenbutNotGone.cpp +++ b/src/scripts/instances/questbattles/ForgottenbutNotGone.cpp @@ -39,7 +39,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/FortuneFavorstheBole.cpp b/src/scripts/instances/questbattles/FortuneFavorstheBole.cpp index f8a6d933..fdf8342a 100644 --- a/src/scripts/instances/questbattles/FortuneFavorstheBole.cpp +++ b/src/scripts/instances/questbattles/FortuneFavorstheBole.cpp @@ -99,7 +99,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ForwardtheRoyalMarines.cpp b/src/scripts/instances/questbattles/ForwardtheRoyalMarines.cpp index ced25c03..c39f61bc 100644 --- a/src/scripts/instances/questbattles/ForwardtheRoyalMarines.cpp +++ b/src/scripts/instances/questbattles/ForwardtheRoyalMarines.cpp @@ -79,7 +79,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/Foxfire.cpp b/src/scripts/instances/questbattles/Foxfire.cpp index ef5f6002..a0f2417e 100644 --- a/src/scripts/instances/questbattles/Foxfire.cpp +++ b/src/scripts/instances/questbattles/Foxfire.cpp @@ -86,7 +86,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/GrinnersintheMist.cpp b/src/scripts/instances/questbattles/GrinnersintheMist.cpp index 54506162..4eb96b57 100644 --- a/src/scripts/instances/questbattles/GrinnersintheMist.cpp +++ b/src/scripts/instances/questbattles/GrinnersintheMist.cpp @@ -48,7 +48,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/GuardianofEorzea.cpp b/src/scripts/instances/questbattles/GuardianofEorzea.cpp index 417a905e..0b2b7b6e 100644 --- a/src/scripts/instances/questbattles/GuardianofEorzea.cpp +++ b/src/scripts/instances/questbattles/GuardianofEorzea.cpp @@ -41,7 +41,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/HandsofHealing.cpp b/src/scripts/instances/questbattles/HandsofHealing.cpp index 066d4c7d..a4ed9946 100644 --- a/src/scripts/instances/questbattles/HandsofHealing.cpp +++ b/src/scripts/instances/questbattles/HandsofHealing.cpp @@ -55,7 +55,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/HeartoftheForest.cpp b/src/scripts/instances/questbattles/HeartoftheForest.cpp index 3a12c6ee..ce911b1c 100644 --- a/src/scripts/instances/questbattles/HeartoftheForest.cpp +++ b/src/scripts/instances/questbattles/HeartoftheForest.cpp @@ -66,7 +66,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/HeroicReprise.cpp b/src/scripts/instances/questbattles/HeroicReprise.cpp index 7c3c38ae..ea9a60e4 100644 --- a/src/scripts/instances/questbattles/HeroicReprise.cpp +++ b/src/scripts/instances/questbattles/HeroicReprise.cpp @@ -57,7 +57,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/HisForgottenHome.cpp b/src/scripts/instances/questbattles/HisForgottenHome.cpp index 44c85025..a74f3fb4 100644 --- a/src/scripts/instances/questbattles/HisForgottenHome.cpp +++ b/src/scripts/instances/questbattles/HisForgottenHome.cpp @@ -54,7 +54,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/HistoryRepeating.cpp b/src/scripts/instances/questbattles/HistoryRepeating.cpp index 2e64bfcb..2b6ae5c1 100644 --- a/src/scripts/instances/questbattles/HistoryRepeating.cpp +++ b/src/scripts/instances/questbattles/HistoryRepeating.cpp @@ -58,7 +58,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/Homecoming.cpp b/src/scripts/instances/questbattles/Homecoming.cpp index 1ef9e534..1950ca06 100644 --- a/src/scripts/instances/questbattles/Homecoming.cpp +++ b/src/scripts/instances/questbattles/Homecoming.cpp @@ -23,7 +23,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/HopeontheWaves.cpp b/src/scripts/instances/questbattles/HopeontheWaves.cpp index 9e693c82..ea33fd36 100644 --- a/src/scripts/instances/questbattles/HopeontheWaves.cpp +++ b/src/scripts/instances/questbattles/HopeontheWaves.cpp @@ -110,7 +110,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/HowtoQuitYou.cpp b/src/scripts/instances/questbattles/HowtoQuitYou.cpp index 43d93b5c..acf41df1 100644 --- a/src/scripts/instances/questbattles/HowtoQuitYou.cpp +++ b/src/scripts/instances/questbattles/HowtoQuitYou.cpp @@ -89,7 +89,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ICouldHaveTrancedAllNight.cpp b/src/scripts/instances/questbattles/ICouldHaveTrancedAllNight.cpp index 0aec7de3..720b86be 100644 --- a/src/scripts/instances/questbattles/ICouldHaveTrancedAllNight.cpp +++ b/src/scripts/instances/questbattles/ICouldHaveTrancedAllNight.cpp @@ -91,7 +91,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/InCrimsonItBegan.cpp b/src/scripts/instances/questbattles/InCrimsonItBegan.cpp index f233521c..d655102a 100644 --- a/src/scripts/instances/questbattles/InCrimsonItBegan.cpp +++ b/src/scripts/instances/questbattles/InCrimsonItBegan.cpp @@ -117,7 +117,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/InHerDefense.cpp b/src/scripts/instances/questbattles/InHerDefense.cpp index 548a8ed6..9ba90d62 100644 --- a/src/scripts/instances/questbattles/InHerDefense.cpp +++ b/src/scripts/instances/questbattles/InHerDefense.cpp @@ -148,7 +148,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/InLovingMemory.cpp b/src/scripts/instances/questbattles/InLovingMemory.cpp index 01e584dd..b7e9a83d 100644 --- a/src/scripts/instances/questbattles/InLovingMemory.cpp +++ b/src/scripts/instances/questbattles/InLovingMemory.cpp @@ -100,7 +100,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/InNaturesEmbrace.cpp b/src/scripts/instances/questbattles/InNaturesEmbrace.cpp index 14826e50..2e49bdf6 100644 --- a/src/scripts/instances/questbattles/InNaturesEmbrace.cpp +++ b/src/scripts/instances/questbattles/InNaturesEmbrace.cpp @@ -30,7 +30,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/IntheDarkofNight.cpp b/src/scripts/instances/questbattles/IntheDarkofNight.cpp index 76399ced..fcf1cd81 100644 --- a/src/scripts/instances/questbattles/IntheDarkofNight.cpp +++ b/src/scripts/instances/questbattles/IntheDarkofNight.cpp @@ -53,7 +53,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/IntheEyesofGodsandMen.cpp b/src/scripts/instances/questbattles/IntheEyesofGodsandMen.cpp index 92250ac3..f689f528 100644 --- a/src/scripts/instances/questbattles/IntheEyesofGodsandMen.cpp +++ b/src/scripts/instances/questbattles/IntheEyesofGodsandMen.cpp @@ -77,7 +77,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/IntoaCopperHell.cpp b/src/scripts/instances/questbattles/IntoaCopperHell.cpp index 437bd8a5..f5df4a96 100644 --- a/src/scripts/instances/questbattles/IntoaCopperHell.cpp +++ b/src/scripts/instances/questbattles/IntoaCopperHell.cpp @@ -44,7 +44,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/IntotheDragonsMaw.cpp b/src/scripts/instances/questbattles/IntotheDragonsMaw.cpp index 35a142e4..4384b038 100644 --- a/src/scripts/instances/questbattles/IntotheDragonsMaw.cpp +++ b/src/scripts/instances/questbattles/IntotheDragonsMaw.cpp @@ -54,7 +54,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/IshgardianJustice.cpp b/src/scripts/instances/questbattles/IshgardianJustice.cpp index dad272cb..6fba0d6b 100644 --- a/src/scripts/instances/questbattles/IshgardianJustice.cpp +++ b/src/scripts/instances/questbattles/IshgardianJustice.cpp @@ -91,7 +91,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/JustDeserts.cpp b/src/scripts/instances/questbattles/JustDeserts.cpp index e0e31641..6d8999e4 100644 --- a/src/scripts/instances/questbattles/JustDeserts.cpp +++ b/src/scripts/instances/questbattles/JustDeserts.cpp @@ -25,7 +25,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/KeepingtheFlameAlive.cpp b/src/scripts/instances/questbattles/KeepingtheFlameAlive.cpp index 4140e619..c5189cc9 100644 --- a/src/scripts/instances/questbattles/KeepingtheFlameAlive.cpp +++ b/src/scripts/instances/questbattles/KeepingtheFlameAlive.cpp @@ -167,7 +167,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/KeepingtheOath.cpp b/src/scripts/instances/questbattles/KeepingtheOath.cpp index b1919e97..ecf7c9b5 100644 --- a/src/scripts/instances/questbattles/KeepingtheOath.cpp +++ b/src/scripts/instances/questbattles/KeepingtheOath.cpp @@ -70,7 +70,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/KeepingtheSpiritAlive.cpp b/src/scripts/instances/questbattles/KeepingtheSpiritAlive.cpp index 08d17344..0fcbe4a5 100644 --- a/src/scripts/instances/questbattles/KeepingtheSpiritAlive.cpp +++ b/src/scripts/instances/questbattles/KeepingtheSpiritAlive.cpp @@ -30,7 +30,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/KindredSpirits.cpp b/src/scripts/instances/questbattles/KindredSpirits.cpp index 93978653..1583a2f5 100644 --- a/src/scripts/instances/questbattles/KindredSpirits.cpp +++ b/src/scripts/instances/questbattles/KindredSpirits.cpp @@ -58,7 +58,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/LanceofDestiny.cpp b/src/scripts/instances/questbattles/LanceofDestiny.cpp index 3878648e..7c57f19f 100644 --- a/src/scripts/instances/questbattles/LanceofDestiny.cpp +++ b/src/scripts/instances/questbattles/LanceofDestiny.cpp @@ -30,7 +30,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/LeiasLegacy.cpp b/src/scripts/instances/questbattles/LeiasLegacy.cpp index b660e188..6fd0c765 100644 --- a/src/scripts/instances/questbattles/LeiasLegacy.cpp +++ b/src/scripts/instances/questbattles/LeiasLegacy.cpp @@ -30,7 +30,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/LikeMotherLikeDaughter.cpp b/src/scripts/instances/questbattles/LikeMotherLikeDaughter.cpp index 400c652c..ba1f829d 100644 --- a/src/scripts/instances/questbattles/LikeMotherLikeDaughter.cpp +++ b/src/scripts/instances/questbattles/LikeMotherLikeDaughter.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/LordoftheInferno.cpp b/src/scripts/instances/questbattles/LordoftheInferno.cpp index 0ebd16fc..efbfd8ef 100644 --- a/src/scripts/instances/questbattles/LordoftheInferno.cpp +++ b/src/scripts/instances/questbattles/LordoftheInferno.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/LurkersintheGrotto.cpp b/src/scripts/instances/questbattles/LurkersintheGrotto.cpp index 00478abc..ba657989 100644 --- a/src/scripts/instances/questbattles/LurkersintheGrotto.cpp +++ b/src/scripts/instances/questbattles/LurkersintheGrotto.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/MasterMusosai.cpp b/src/scripts/instances/questbattles/MasterMusosai.cpp index eb6f55bb..04a835c5 100644 --- a/src/scripts/instances/questbattles/MasterMusosai.cpp +++ b/src/scripts/instances/questbattles/MasterMusosai.cpp @@ -75,7 +75,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/MasterandStudent.cpp b/src/scripts/instances/questbattles/MasterandStudent.cpp index fa6fabf6..cc7aa8b1 100644 --- a/src/scripts/instances/questbattles/MasterandStudent.cpp +++ b/src/scripts/instances/questbattles/MasterandStudent.cpp @@ -49,7 +49,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/MasterofMarksmanship.cpp b/src/scripts/instances/questbattles/MasterofMarksmanship.cpp index c1222dd4..c576d952 100644 --- a/src/scripts/instances/questbattles/MasterofMarksmanship.cpp +++ b/src/scripts/instances/questbattles/MasterofMarksmanship.cpp @@ -96,7 +96,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/MyFirstMudra.cpp b/src/scripts/instances/questbattles/MyFirstMudra.cpp index d7b042f9..f39aab58 100644 --- a/src/scripts/instances/questbattles/MyFirstMudra.cpp +++ b/src/scripts/instances/questbattles/MyFirstMudra.cpp @@ -39,7 +39,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/Nightkin.cpp b/src/scripts/instances/questbattles/Nightkin.cpp index 5a8fbaa7..cdc4870d 100644 --- a/src/scripts/instances/questbattles/Nightkin.cpp +++ b/src/scripts/instances/questbattles/Nightkin.cpp @@ -117,7 +117,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/NinjaAssassin.cpp b/src/scripts/instances/questbattles/NinjaAssassin.cpp index 12e09951..9eae6f99 100644 --- a/src/scripts/instances/questbattles/NinjaAssassin.cpp +++ b/src/scripts/instances/questbattles/NinjaAssassin.cpp @@ -34,7 +34,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/NinjaBathin.cpp b/src/scripts/instances/questbattles/NinjaBathin.cpp index 07d1e77d..5f594c2c 100644 --- a/src/scripts/instances/questbattles/NinjaBathin.cpp +++ b/src/scripts/instances/questbattles/NinjaBathin.cpp @@ -63,7 +63,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/NotoriousBiggs.cpp b/src/scripts/instances/questbattles/NotoriousBiggs.cpp index b78e7ba5..bbb6c72f 100644 --- a/src/scripts/instances/questbattles/NotoriousBiggs.cpp +++ b/src/scripts/instances/questbattles/NotoriousBiggs.cpp @@ -72,7 +72,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/NouveauRiche.cpp b/src/scripts/instances/questbattles/NouveauRiche.cpp index c235db63..f4b17e78 100644 --- a/src/scripts/instances/questbattles/NouveauRiche.cpp +++ b/src/scripts/instances/questbattles/NouveauRiche.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/OhCaptainMyCaptain.cpp b/src/scripts/instances/questbattles/OhCaptainMyCaptain.cpp index f7da8a8b..5db7ac23 100644 --- a/src/scripts/instances/questbattles/OhCaptainMyCaptain.cpp +++ b/src/scripts/instances/questbattles/OhCaptainMyCaptain.cpp @@ -48,7 +48,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/OnHolyGround.cpp b/src/scripts/instances/questbattles/OnHolyGround.cpp index 978559a9..1cc62dd8 100644 --- a/src/scripts/instances/questbattles/OnHolyGround.cpp +++ b/src/scripts/instances/questbattles/OnHolyGround.cpp @@ -30,7 +30,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/OnceUponaTimeinDoma.cpp b/src/scripts/instances/questbattles/OnceUponaTimeinDoma.cpp index 74aeab1a..7bb3ab6f 100644 --- a/src/scripts/instances/questbattles/OnceUponaTimeinDoma.cpp +++ b/src/scripts/instances/questbattles/OnceUponaTimeinDoma.cpp @@ -55,7 +55,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/OneAutumnsSecret.cpp b/src/scripts/instances/questbattles/OneAutumnsSecret.cpp index 86ea7c76..f1b2dd8e 100644 --- a/src/scripts/instances/questbattles/OneAutumnsSecret.cpp +++ b/src/scripts/instances/questbattles/OneAutumnsSecret.cpp @@ -48,7 +48,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/OneGolemtoRuleThemAll.cpp b/src/scripts/instances/questbattles/OneGolemtoRuleThemAll.cpp index 386d2d80..a068a551 100644 --- a/src/scripts/instances/questbattles/OneGolemtoRuleThemAll.cpp +++ b/src/scripts/instances/questbattles/OneGolemtoRuleThemAll.cpp @@ -68,7 +68,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/OurAnswer.cpp b/src/scripts/instances/questbattles/OurAnswer.cpp index 9c6255a5..ba1f6d30 100644 --- a/src/scripts/instances/questbattles/OurAnswer.cpp +++ b/src/scripts/instances/questbattles/OurAnswer.cpp @@ -72,7 +72,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/OvertheRails.cpp b/src/scripts/instances/questbattles/OvertheRails.cpp index afb3b525..edd25613 100644 --- a/src/scripts/instances/questbattles/OvertheRails.cpp +++ b/src/scripts/instances/questbattles/OvertheRails.cpp @@ -47,7 +47,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ParleyintheSagolii.cpp b/src/scripts/instances/questbattles/ParleyintheSagolii.cpp index 14e6396b..07feb269 100644 --- a/src/scripts/instances/questbattles/ParleyintheSagolii.cpp +++ b/src/scripts/instances/questbattles/ParleyintheSagolii.cpp @@ -24,7 +24,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/PincerManeuver.cpp b/src/scripts/instances/questbattles/PincerManeuver.cpp index b0478d3e..6a1e4b40 100644 --- a/src/scripts/instances/questbattles/PincerManeuver.cpp +++ b/src/scripts/instances/questbattles/PincerManeuver.cpp @@ -73,7 +73,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/PrideandDutyWillTakeYoufromtheMountain.cpp b/src/scripts/instances/questbattles/PrideandDutyWillTakeYoufromtheMountain.cpp index 9c1137d1..78a30c23 100644 --- a/src/scripts/instances/questbattles/PrideandDutyWillTakeYoufromtheMountain.cpp +++ b/src/scripts/instances/questbattles/PrideandDutyWillTakeYoufromtheMountain.cpp @@ -49,7 +49,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/PrimalBurdens.cpp b/src/scripts/instances/questbattles/PrimalBurdens.cpp index bb7bbc4f..20f44f64 100644 --- a/src/scripts/instances/questbattles/PrimalBurdens.cpp +++ b/src/scripts/instances/questbattles/PrimalBurdens.cpp @@ -27,7 +27,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ProofofMight.cpp b/src/scripts/instances/questbattles/ProofofMight.cpp index d2b65c0e..93bb6285 100644 --- a/src/scripts/instances/questbattles/ProofofMight.cpp +++ b/src/scripts/instances/questbattles/ProofofMight.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/Quarantine.cpp b/src/scripts/instances/questbattles/Quarantine.cpp index ae7cf94f..b5781df6 100644 --- a/src/scripts/instances/questbattles/Quarantine.cpp +++ b/src/scripts/instances/questbattles/Quarantine.cpp @@ -28,7 +28,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ReleasetheHounds.cpp b/src/scripts/instances/questbattles/ReleasetheHounds.cpp index 46a4ac13..5b262153 100644 --- a/src/scripts/instances/questbattles/ReleasetheHounds.cpp +++ b/src/scripts/instances/questbattles/ReleasetheHounds.cpp @@ -64,7 +64,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/RequiemfortheFallen.cpp b/src/scripts/instances/questbattles/RequiemfortheFallen.cpp index c6cb9bb9..1988bdd6 100644 --- a/src/scripts/instances/questbattles/RequiemfortheFallen.cpp +++ b/src/scripts/instances/questbattles/RequiemfortheFallen.cpp @@ -52,7 +52,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ReturnoftheHolyfist.cpp b/src/scripts/instances/questbattles/ReturnoftheHolyfist.cpp index 0713d7df..5fa4b8c5 100644 --- a/src/scripts/instances/questbattles/ReturnoftheHolyfist.cpp +++ b/src/scripts/instances/questbattles/ReturnoftheHolyfist.cpp @@ -45,7 +45,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ReturntotheRift.cpp b/src/scripts/instances/questbattles/ReturntotheRift.cpp index 175f31fc..16d7ce82 100644 --- a/src/scripts/instances/questbattles/ReturntotheRift.cpp +++ b/src/scripts/instances/questbattles/ReturntotheRift.cpp @@ -162,7 +162,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/RhalgrsBeacon.cpp b/src/scripts/instances/questbattles/RhalgrsBeacon.cpp index edb57c2f..c37b1f7b 100644 --- a/src/scripts/instances/questbattles/RhalgrsBeacon.cpp +++ b/src/scripts/instances/questbattles/RhalgrsBeacon.cpp @@ -113,7 +113,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/RiseoftheMachinists.cpp b/src/scripts/instances/questbattles/RiseoftheMachinists.cpp index 1424e709..88072cf9 100644 --- a/src/scripts/instances/questbattles/RiseoftheMachinists.cpp +++ b/src/scripts/instances/questbattles/RiseoftheMachinists.cpp @@ -70,7 +70,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/SchismbetweenSisters.cpp b/src/scripts/instances/questbattles/SchismbetweenSisters.cpp index b5142de0..6d1245e3 100644 --- a/src/scripts/instances/questbattles/SchismbetweenSisters.cpp +++ b/src/scripts/instances/questbattles/SchismbetweenSisters.cpp @@ -125,7 +125,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/SecuringtheLocks.cpp b/src/scripts/instances/questbattles/SecuringtheLocks.cpp index c275a9d3..43472f66 100644 --- a/src/scripts/instances/questbattles/SecuringtheLocks.cpp +++ b/src/scripts/instances/questbattles/SecuringtheLocks.cpp @@ -95,7 +95,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/SeerFolly.cpp b/src/scripts/instances/questbattles/SeerFolly.cpp index 6707cd97..3c781844 100644 --- a/src/scripts/instances/questbattles/SeerFolly.cpp +++ b/src/scripts/instances/questbattles/SeerFolly.cpp @@ -43,7 +43,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ShadesofShatotto.cpp b/src/scripts/instances/questbattles/ShadesofShatotto.cpp index 84ce8d3f..6941989b 100644 --- a/src/scripts/instances/questbattles/ShadesofShatotto.cpp +++ b/src/scripts/instances/questbattles/ShadesofShatotto.cpp @@ -37,7 +37,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/SinkingDoesmaga.cpp b/src/scripts/instances/questbattles/SinkingDoesmaga.cpp index 3206970d..cbfff647 100644 --- a/src/scripts/instances/questbattles/SinkingDoesmaga.cpp +++ b/src/scripts/instances/questbattles/SinkingDoesmaga.cpp @@ -61,7 +61,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/SlavetotheCode.cpp b/src/scripts/instances/questbattles/SlavetotheCode.cpp index 092ec284..6240ddca 100644 --- a/src/scripts/instances/questbattles/SlavetotheCode.cpp +++ b/src/scripts/instances/questbattles/SlavetotheCode.cpp @@ -62,7 +62,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/SlingsandArrows.cpp b/src/scripts/instances/questbattles/SlingsandArrows.cpp index 05942dbf..38851ce0 100644 --- a/src/scripts/instances/questbattles/SlingsandArrows.cpp +++ b/src/scripts/instances/questbattles/SlingsandArrows.cpp @@ -94,7 +94,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/SoundingOuttheAmphitheatre.cpp b/src/scripts/instances/questbattles/SoundingOuttheAmphitheatre.cpp index 70710a17..5de776ba 100644 --- a/src/scripts/instances/questbattles/SoundingOuttheAmphitheatre.cpp +++ b/src/scripts/instances/questbattles/SoundingOuttheAmphitheatre.cpp @@ -83,7 +83,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/SpearheadingInitiatives.cpp b/src/scripts/instances/questbattles/SpearheadingInitiatives.cpp index 955d7a60..2fec8729 100644 --- a/src/scripts/instances/questbattles/SpearheadingInitiatives.cpp +++ b/src/scripts/instances/questbattles/SpearheadingInitiatives.cpp @@ -116,7 +116,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/SpiritholdBroken.cpp b/src/scripts/instances/questbattles/SpiritholdBroken.cpp index e81ab4a7..2f570478 100644 --- a/src/scripts/instances/questbattles/SpiritholdBroken.cpp +++ b/src/scripts/instances/questbattles/SpiritholdBroken.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/StainedinScarlet.cpp b/src/scripts/instances/questbattles/StainedinScarlet.cpp index 89a49510..8ec7a029 100644 --- a/src/scripts/instances/questbattles/StainedinScarlet.cpp +++ b/src/scripts/instances/questbattles/StainedinScarlet.cpp @@ -52,7 +52,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/StarcrossedRivals.cpp b/src/scripts/instances/questbattles/StarcrossedRivals.cpp index 66fc90b3..7d7a26a0 100644 --- a/src/scripts/instances/questbattles/StarcrossedRivals.cpp +++ b/src/scripts/instances/questbattles/StarcrossedRivals.cpp @@ -35,7 +35,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/StifledScreams.cpp b/src/scripts/instances/questbattles/StifledScreams.cpp index 6144a7d0..0cfb499c 100644 --- a/src/scripts/instances/questbattles/StifledScreams.cpp +++ b/src/scripts/instances/questbattles/StifledScreams.cpp @@ -86,7 +86,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/StrayintotheShadows.cpp b/src/scripts/instances/questbattles/StrayintotheShadows.cpp index a1e98522..c84541f0 100644 --- a/src/scripts/instances/questbattles/StrayintotheShadows.cpp +++ b/src/scripts/instances/questbattles/StrayintotheShadows.cpp @@ -64,7 +64,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/SweetDreamsAreMadeofPeace.cpp b/src/scripts/instances/questbattles/SweetDreamsAreMadeofPeace.cpp index ea75050a..3a3a2613 100644 --- a/src/scripts/instances/questbattles/SweetDreamsAreMadeofPeace.cpp +++ b/src/scripts/instances/questbattles/SweetDreamsAreMadeofPeace.cpp @@ -67,7 +67,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/SweetSorrows.cpp b/src/scripts/instances/questbattles/SweetSorrows.cpp index dc5cd7d8..517b1206 100644 --- a/src/scripts/instances/questbattles/SweetSorrows.cpp +++ b/src/scripts/instances/questbattles/SweetSorrows.cpp @@ -57,7 +57,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/SwornUponaLance.cpp b/src/scripts/instances/questbattles/SwornUponaLance.cpp index 3d90ae21..6639dffb 100644 --- a/src/scripts/instances/questbattles/SwornUponaLance.cpp +++ b/src/scripts/instances/questbattles/SwornUponaLance.cpp @@ -33,7 +33,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ThatOldFamiliarFeeling.cpp b/src/scripts/instances/questbattles/ThatOldFamiliarFeeling.cpp index 531342f4..6930a5d6 100644 --- a/src/scripts/instances/questbattles/ThatOldFamiliarFeeling.cpp +++ b/src/scripts/instances/questbattles/ThatOldFamiliarFeeling.cpp @@ -49,7 +49,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheBalladofOblivion.cpp b/src/scripts/instances/questbattles/TheBalladofOblivion.cpp index fe042a89..c886524a 100644 --- a/src/scripts/instances/questbattles/TheBalladofOblivion.cpp +++ b/src/scripts/instances/questbattles/TheBalladofOblivion.cpp @@ -40,7 +40,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheBeastWithin.cpp b/src/scripts/instances/questbattles/TheBeastWithin.cpp index 21e15a2d..1ec080c1 100644 --- a/src/scripts/instances/questbattles/TheBeastWithin.cpp +++ b/src/scripts/instances/questbattles/TheBeastWithin.cpp @@ -114,7 +114,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheCompanyYouKeepImmortalFlames.cpp b/src/scripts/instances/questbattles/TheCompanyYouKeepImmortalFlames.cpp index 959b8629..43d23810 100644 --- a/src/scripts/instances/questbattles/TheCompanyYouKeepImmortalFlames.cpp +++ b/src/scripts/instances/questbattles/TheCompanyYouKeepImmortalFlames.cpp @@ -44,7 +44,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheCompanyYouKeepMaelstrom.cpp b/src/scripts/instances/questbattles/TheCompanyYouKeepMaelstrom.cpp index c7f2dd71..80d99f31 100644 --- a/src/scripts/instances/questbattles/TheCompanyYouKeepMaelstrom.cpp +++ b/src/scripts/instances/questbattles/TheCompanyYouKeepMaelstrom.cpp @@ -40,7 +40,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheCompanyYouKeepTwinAdder.cpp b/src/scripts/instances/questbattles/TheCompanyYouKeepTwinAdder.cpp index ab904d14..8f6c26ee 100644 --- a/src/scripts/instances/questbattles/TheCompanyYouKeepTwinAdder.cpp +++ b/src/scripts/instances/questbattles/TheCompanyYouKeepTwinAdder.cpp @@ -40,7 +40,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheConsequencesofAnger.cpp b/src/scripts/instances/questbattles/TheConsequencesofAnger.cpp index 2a01f195..b109b732 100644 --- a/src/scripts/instances/questbattles/TheConsequencesofAnger.cpp +++ b/src/scripts/instances/questbattles/TheConsequencesofAnger.cpp @@ -33,7 +33,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheCrimsonDuelist.cpp b/src/scripts/instances/questbattles/TheCrimsonDuelist.cpp index 6338786a..f43420b4 100644 --- a/src/scripts/instances/questbattles/TheCrimsonDuelist.cpp +++ b/src/scripts/instances/questbattles/TheCrimsonDuelist.cpp @@ -68,7 +68,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheCrowKnows.cpp b/src/scripts/instances/questbattles/TheCrowKnows.cpp index 79817e8f..53bd7f56 100644 --- a/src/scripts/instances/questbattles/TheCrowKnows.cpp +++ b/src/scripts/instances/questbattles/TheCrowKnows.cpp @@ -42,7 +42,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheDefiantOnes.cpp b/src/scripts/instances/questbattles/TheDefiantOnes.cpp index d839d9dd..8caf02c2 100644 --- a/src/scripts/instances/questbattles/TheDefiantOnes.cpp +++ b/src/scripts/instances/questbattles/TheDefiantOnes.cpp @@ -61,7 +61,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheFaceofThal.cpp b/src/scripts/instances/questbattles/TheFaceofThal.cpp index c6eccc10..925eaa36 100644 --- a/src/scripts/instances/questbattles/TheFaceofThal.cpp +++ b/src/scripts/instances/questbattles/TheFaceofThal.cpp @@ -52,7 +52,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheFlameintheAbyss.cpp b/src/scripts/instances/questbattles/TheFlameintheAbyss.cpp index 8713b43f..5757e442 100644 --- a/src/scripts/instances/questbattles/TheFlameintheAbyss.cpp +++ b/src/scripts/instances/questbattles/TheFlameintheAbyss.cpp @@ -30,7 +30,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheHandsofFate.cpp b/src/scripts/instances/questbattles/TheHandsofFate.cpp index 55fab76a..d192594c 100644 --- a/src/scripts/instances/questbattles/TheHandsofFate.cpp +++ b/src/scripts/instances/questbattles/TheHandsofFate.cpp @@ -85,7 +85,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheHereticamongUs.cpp b/src/scripts/instances/questbattles/TheHereticamongUs.cpp index 91dc94ef..3b778b19 100644 --- a/src/scripts/instances/questbattles/TheHereticamongUs.cpp +++ b/src/scripts/instances/questbattles/TheHereticamongUs.cpp @@ -61,7 +61,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheHiddenChapter.cpp b/src/scripts/instances/questbattles/TheHiddenChapter.cpp index c613e204..a78d89cc 100644 --- a/src/scripts/instances/questbattles/TheHiddenChapter.cpp +++ b/src/scripts/instances/questbattles/TheHiddenChapter.cpp @@ -41,7 +41,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheKeytoVictory.cpp b/src/scripts/instances/questbattles/TheKeytoVictory.cpp index b30e4e21..fd2ef352 100644 --- a/src/scripts/instances/questbattles/TheKeytoVictory.cpp +++ b/src/scripts/instances/questbattles/TheKeytoVictory.cpp @@ -93,7 +93,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheLominsanWay.cpp b/src/scripts/instances/questbattles/TheLominsanWay.cpp index 3e64508a..87616948 100644 --- a/src/scripts/instances/questbattles/TheLominsanWay.cpp +++ b/src/scripts/instances/questbattles/TheLominsanWay.cpp @@ -38,7 +38,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheMeasureofHisReach.cpp b/src/scripts/instances/questbattles/TheMeasureofHisReach.cpp index 4195f8ec..975f1268 100644 --- a/src/scripts/instances/questbattles/TheMeasureofHisReach.cpp +++ b/src/scripts/instances/questbattles/TheMeasureofHisReach.cpp @@ -116,7 +116,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheMongrelandtheKnight.cpp b/src/scripts/instances/questbattles/TheMongrelandtheKnight.cpp index 4cb868f6..78c168e8 100644 --- a/src/scripts/instances/questbattles/TheMongrelandtheKnight.cpp +++ b/src/scripts/instances/questbattles/TheMongrelandtheKnight.cpp @@ -56,7 +56,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheMountainThatStrides.cpp b/src/scripts/instances/questbattles/TheMountainThatStrides.cpp index bf3a333c..984e1a3a 100644 --- a/src/scripts/instances/questbattles/TheMountainThatStrides.cpp +++ b/src/scripts/instances/questbattles/TheMountainThatStrides.cpp @@ -40,7 +40,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheOneThatGotAway.cpp b/src/scripts/instances/questbattles/TheOneThatGotAway.cpp index a5af332f..5e079571 100644 --- a/src/scripts/instances/questbattles/TheOneThatGotAway.cpp +++ b/src/scripts/instances/questbattles/TheOneThatGotAway.cpp @@ -41,7 +41,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ThePowerofaTourney.cpp b/src/scripts/instances/questbattles/ThePowerofaTourney.cpp index 3ab85d2b..085b23eb 100644 --- a/src/scripts/instances/questbattles/ThePowerofaTourney.cpp +++ b/src/scripts/instances/questbattles/ThePowerofaTourney.cpp @@ -109,7 +109,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ThePowertoProtect.cpp b/src/scripts/instances/questbattles/ThePowertoProtect.cpp index 2e6a07d4..3eca7157 100644 --- a/src/scripts/instances/questbattles/ThePowertoProtect.cpp +++ b/src/scripts/instances/questbattles/ThePowertoProtect.cpp @@ -71,7 +71,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheReasonRoaille.cpp b/src/scripts/instances/questbattles/TheReasonRoaille.cpp index d337e49f..6499cefd 100644 --- a/src/scripts/instances/questbattles/TheReasonRoaille.cpp +++ b/src/scripts/instances/questbattles/TheReasonRoaille.cpp @@ -109,7 +109,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheRematch.cpp b/src/scripts/instances/questbattles/TheRematch.cpp index 5b06b7df..15f8fffd 100644 --- a/src/scripts/instances/questbattles/TheRematch.cpp +++ b/src/scripts/instances/questbattles/TheRematch.cpp @@ -64,7 +64,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheSpiritIsWilling.cpp b/src/scripts/instances/questbattles/TheSpiritIsWilling.cpp index eba7bb99..694a13d6 100644 --- a/src/scripts/instances/questbattles/TheSpiritIsWilling.cpp +++ b/src/scripts/instances/questbattles/TheSpiritIsWilling.cpp @@ -50,7 +50,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheThreatofPerplexity.cpp b/src/scripts/instances/questbattles/TheThreatofPerplexity.cpp index 32ab5d25..073fdfb5 100644 --- a/src/scripts/instances/questbattles/TheThreatofPerplexity.cpp +++ b/src/scripts/instances/questbattles/TheThreatofPerplexity.cpp @@ -25,7 +25,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheThreatofSuperiority.cpp b/src/scripts/instances/questbattles/TheThreatofSuperiority.cpp index c310cac3..7fae54de 100644 --- a/src/scripts/instances/questbattles/TheThreatofSuperiority.cpp +++ b/src/scripts/instances/questbattles/TheThreatofSuperiority.cpp @@ -35,7 +35,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheTimebetweentheSeconds.cpp b/src/scripts/instances/questbattles/TheTimebetweentheSeconds.cpp index 3aa11f49..f84304f3 100644 --- a/src/scripts/instances/questbattles/TheTimebetweentheSeconds.cpp +++ b/src/scripts/instances/questbattles/TheTimebetweentheSeconds.cpp @@ -85,7 +85,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TheVoidgateBreathesGloomy.cpp b/src/scripts/instances/questbattles/TheVoidgateBreathesGloomy.cpp index 506a183e..0895eebd 100644 --- a/src/scripts/instances/questbattles/TheVoidgateBreathesGloomy.cpp +++ b/src/scripts/instances/questbattles/TheVoidgateBreathesGloomy.cpp @@ -66,7 +66,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ThisLittleSwordofMine.cpp b/src/scripts/instances/questbattles/ThisLittleSwordofMine.cpp index 23aba471..0d3a9457 100644 --- a/src/scripts/instances/questbattles/ThisLittleSwordofMine.cpp +++ b/src/scripts/instances/questbattles/ThisLittleSwordofMine.cpp @@ -64,7 +64,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ToCatchaPoacher.cpp b/src/scripts/instances/questbattles/ToCatchaPoacher.cpp index a66988ff..5e3270a1 100644 --- a/src/scripts/instances/questbattles/ToCatchaPoacher.cpp +++ b/src/scripts/instances/questbattles/ToCatchaPoacher.cpp @@ -37,7 +37,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ToGuardaGuardian.cpp b/src/scripts/instances/questbattles/ToGuardaGuardian.cpp index 34c4e990..3a863734 100644 --- a/src/scripts/instances/questbattles/ToGuardaGuardian.cpp +++ b/src/scripts/instances/questbattles/ToGuardaGuardian.cpp @@ -63,7 +63,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TortoiseinTime.cpp b/src/scripts/instances/questbattles/TortoiseinTime.cpp index 43f5a99c..6361e841 100644 --- a/src/scripts/instances/questbattles/TortoiseinTime.cpp +++ b/src/scripts/instances/questbattles/TortoiseinTime.cpp @@ -93,7 +93,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/TrialbyWater.cpp b/src/scripts/instances/questbattles/TrialbyWater.cpp index 8b4bcba5..689452dc 100644 --- a/src/scripts/instances/questbattles/TrialbyWater.cpp +++ b/src/scripts/instances/questbattles/TrialbyWater.cpp @@ -37,7 +37,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/UnderneaththeSultantree.cpp b/src/scripts/instances/questbattles/UnderneaththeSultantree.cpp index 0a27e6fc..90497cda 100644 --- a/src/scripts/instances/questbattles/UnderneaththeSultantree.cpp +++ b/src/scripts/instances/questbattles/UnderneaththeSultantree.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/VictoryinPeril.cpp b/src/scripts/instances/questbattles/VictoryinPeril.cpp index 7b64104b..5df33eb1 100644 --- a/src/scripts/instances/questbattles/VictoryinPeril.cpp +++ b/src/scripts/instances/questbattles/VictoryinPeril.cpp @@ -52,7 +52,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/ViolatorsWillBeShot.cpp b/src/scripts/instances/questbattles/ViolatorsWillBeShot.cpp index 51ab8efb..f6a823b1 100644 --- a/src/scripts/instances/questbattles/ViolatorsWillBeShot.cpp +++ b/src/scripts/instances/questbattles/ViolatorsWillBeShot.cpp @@ -41,7 +41,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/WayDownintheHole.cpp b/src/scripts/instances/questbattles/WayDownintheHole.cpp index 26e6346e..8503a20c 100644 --- a/src/scripts/instances/questbattles/WayDownintheHole.cpp +++ b/src/scripts/instances/questbattles/WayDownintheHole.cpp @@ -48,7 +48,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/WhatSheAlwaysWanted.cpp b/src/scripts/instances/questbattles/WhatSheAlwaysWanted.cpp index 58103746..ad9b5407 100644 --- a/src/scripts/instances/questbattles/WhatSheAlwaysWanted.cpp +++ b/src/scripts/instances/questbattles/WhatSheAlwaysWanted.cpp @@ -77,7 +77,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/questbattles/WhenGnathsCry.cpp b/src/scripts/instances/questbattles/WhenGnathsCry.cpp index 4855a50a..48433a52 100644 --- a/src/scripts/instances/questbattles/WhenGnathsCry.cpp +++ b/src/scripts/instances/questbattles/WhenGnathsCry.cpp @@ -37,7 +37,7 @@ public: } - void onUpdate( QuestBattle& instance, uint32_t currTime ) override + void onUpdate( QuestBattle& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheArmoftheFather.cpp b/src/scripts/instances/raids/AlexanderTheArmoftheFather.cpp index 13e5aada..6e073874 100644 --- a/src/scripts/instances/raids/AlexanderTheArmoftheFather.cpp +++ b/src/scripts/instances/raids/AlexanderTheArmoftheFather.cpp @@ -35,7 +35,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp b/src/scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp index 0b69dde2..0b6f8998 100644 --- a/src/scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp +++ b/src/scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp @@ -35,7 +35,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheArmoftheSon.cpp b/src/scripts/instances/raids/AlexanderTheArmoftheSon.cpp index 343eb260..8f45da68 100644 --- a/src/scripts/instances/raids/AlexanderTheArmoftheSon.cpp +++ b/src/scripts/instances/raids/AlexanderTheArmoftheSon.cpp @@ -66,7 +66,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp b/src/scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp index 800d8615..b4b642c6 100644 --- a/src/scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp +++ b/src/scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp @@ -66,7 +66,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp b/src/scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp index 6264fc13..5c654d12 100644 --- a/src/scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp +++ b/src/scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp @@ -42,7 +42,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp b/src/scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp index d045b874..366fb38a 100644 --- a/src/scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp +++ b/src/scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp @@ -42,7 +42,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp b/src/scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp index 10866d20..1b7f22cb 100644 --- a/src/scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp +++ b/src/scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp b/src/scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp index ee90a3e9..6dd4d0d3 100644 --- a/src/scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp +++ b/src/scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp b/src/scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp index d46f9858..4e717ab5 100644 --- a/src/scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp +++ b/src/scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp @@ -23,7 +23,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp b/src/scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp index 9265c2d5..3b781e60 100644 --- a/src/scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp +++ b/src/scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp @@ -23,7 +23,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheCuffoftheFather.cpp b/src/scripts/instances/raids/AlexanderTheCuffoftheFather.cpp index ee99b123..76c6e380 100644 --- a/src/scripts/instances/raids/AlexanderTheCuffoftheFather.cpp +++ b/src/scripts/instances/raids/AlexanderTheCuffoftheFather.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp b/src/scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp index ccc99781..bf4b7e2e 100644 --- a/src/scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp +++ b/src/scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheCuffoftheSon.cpp b/src/scripts/instances/raids/AlexanderTheCuffoftheSon.cpp index 1ad93632..49a24997 100644 --- a/src/scripts/instances/raids/AlexanderTheCuffoftheSon.cpp +++ b/src/scripts/instances/raids/AlexanderTheCuffoftheSon.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp b/src/scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp index d8ba3b90..1a59d49a 100644 --- a/src/scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp +++ b/src/scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp b/src/scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp index 5307efe6..deecb819 100644 --- a/src/scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp +++ b/src/scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp b/src/scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp index 54b5f507..cdf3432c 100644 --- a/src/scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp +++ b/src/scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp @@ -46,7 +46,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheFistoftheFather.cpp b/src/scripts/instances/raids/AlexanderTheFistoftheFather.cpp index 1434fa29..9abd56e1 100644 --- a/src/scripts/instances/raids/AlexanderTheFistoftheFather.cpp +++ b/src/scripts/instances/raids/AlexanderTheFistoftheFather.cpp @@ -54,7 +54,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp b/src/scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp index f1be1739..2866bd3f 100644 --- a/src/scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp +++ b/src/scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp @@ -54,7 +54,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheFistoftheSon.cpp b/src/scripts/instances/raids/AlexanderTheFistoftheSon.cpp index eb41888e..20f20192 100644 --- a/src/scripts/instances/raids/AlexanderTheFistoftheSon.cpp +++ b/src/scripts/instances/raids/AlexanderTheFistoftheSon.cpp @@ -45,7 +45,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp b/src/scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp index e87aea84..441d15c5 100644 --- a/src/scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp +++ b/src/scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp @@ -45,7 +45,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp b/src/scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp index 2a93c1f8..45c5dbcc 100644 --- a/src/scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp +++ b/src/scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp @@ -57,7 +57,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp b/src/scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp index 544d99d4..bc462107 100644 --- a/src/scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp +++ b/src/scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp @@ -57,7 +57,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheSouloftheCreator.cpp b/src/scripts/instances/raids/AlexanderTheSouloftheCreator.cpp index f7a7b16c..54976631 100644 --- a/src/scripts/instances/raids/AlexanderTheSouloftheCreator.cpp +++ b/src/scripts/instances/raids/AlexanderTheSouloftheCreator.cpp @@ -38,7 +38,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp b/src/scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp index f9f4dbe4..8c15e9b8 100644 --- a/src/scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp +++ b/src/scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp @@ -38,7 +38,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlphascapeV10.cpp b/src/scripts/instances/raids/AlphascapeV10.cpp index ee73e140..28ac27be 100644 --- a/src/scripts/instances/raids/AlphascapeV10.cpp +++ b/src/scripts/instances/raids/AlphascapeV10.cpp @@ -25,7 +25,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlphascapeV10Savage.cpp b/src/scripts/instances/raids/AlphascapeV10Savage.cpp index 3fda188f..b1a36d8d 100644 --- a/src/scripts/instances/raids/AlphascapeV10Savage.cpp +++ b/src/scripts/instances/raids/AlphascapeV10Savage.cpp @@ -25,7 +25,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlphascapeV20.cpp b/src/scripts/instances/raids/AlphascapeV20.cpp index e03a9b43..6e59e502 100644 --- a/src/scripts/instances/raids/AlphascapeV20.cpp +++ b/src/scripts/instances/raids/AlphascapeV20.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlphascapeV20Savage.cpp b/src/scripts/instances/raids/AlphascapeV20Savage.cpp index 052c8f87..d623839a 100644 --- a/src/scripts/instances/raids/AlphascapeV20Savage.cpp +++ b/src/scripts/instances/raids/AlphascapeV20Savage.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlphascapeV30.cpp b/src/scripts/instances/raids/AlphascapeV30.cpp index c34e4532..be25bae7 100644 --- a/src/scripts/instances/raids/AlphascapeV30.cpp +++ b/src/scripts/instances/raids/AlphascapeV30.cpp @@ -24,7 +24,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlphascapeV30Savage.cpp b/src/scripts/instances/raids/AlphascapeV30Savage.cpp index 8b9732db..148902e5 100644 --- a/src/scripts/instances/raids/AlphascapeV30Savage.cpp +++ b/src/scripts/instances/raids/AlphascapeV30Savage.cpp @@ -24,7 +24,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlphascapeV40.cpp b/src/scripts/instances/raids/AlphascapeV40.cpp index a9e33fa4..d2db0c14 100644 --- a/src/scripts/instances/raids/AlphascapeV40.cpp +++ b/src/scripts/instances/raids/AlphascapeV40.cpp @@ -28,7 +28,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/AlphascapeV40Savage.cpp b/src/scripts/instances/raids/AlphascapeV40Savage.cpp index b3de8189..278bdc75 100644 --- a/src/scripts/instances/raids/AlphascapeV40Savage.cpp +++ b/src/scripts/instances/raids/AlphascapeV40Savage.cpp @@ -28,7 +28,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/DeltascapeV10.cpp b/src/scripts/instances/raids/DeltascapeV10.cpp index 734f259f..6e1e33fc 100644 --- a/src/scripts/instances/raids/DeltascapeV10.cpp +++ b/src/scripts/instances/raids/DeltascapeV10.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/DeltascapeV10Savage.cpp b/src/scripts/instances/raids/DeltascapeV10Savage.cpp index 6607c0ee..d078b33c 100644 --- a/src/scripts/instances/raids/DeltascapeV10Savage.cpp +++ b/src/scripts/instances/raids/DeltascapeV10Savage.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/DeltascapeV20.cpp b/src/scripts/instances/raids/DeltascapeV20.cpp index 3ea501ec..e1d38780 100644 --- a/src/scripts/instances/raids/DeltascapeV20.cpp +++ b/src/scripts/instances/raids/DeltascapeV20.cpp @@ -21,7 +21,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/DeltascapeV20Savage.cpp b/src/scripts/instances/raids/DeltascapeV20Savage.cpp index 8d2dcaa7..ecc5dd8f 100644 --- a/src/scripts/instances/raids/DeltascapeV20Savage.cpp +++ b/src/scripts/instances/raids/DeltascapeV20Savage.cpp @@ -21,7 +21,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/DeltascapeV30.cpp b/src/scripts/instances/raids/DeltascapeV30.cpp index 13df47fa..57afdc5e 100644 --- a/src/scripts/instances/raids/DeltascapeV30.cpp +++ b/src/scripts/instances/raids/DeltascapeV30.cpp @@ -37,7 +37,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/DeltascapeV30Savage.cpp b/src/scripts/instances/raids/DeltascapeV30Savage.cpp index fc076df2..805b003f 100644 --- a/src/scripts/instances/raids/DeltascapeV30Savage.cpp +++ b/src/scripts/instances/raids/DeltascapeV30Savage.cpp @@ -37,7 +37,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/DeltascapeV40.cpp b/src/scripts/instances/raids/DeltascapeV40.cpp index 9b5aff07..c2699501 100644 --- a/src/scripts/instances/raids/DeltascapeV40.cpp +++ b/src/scripts/instances/raids/DeltascapeV40.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/DeltascapeV40Savage.cpp b/src/scripts/instances/raids/DeltascapeV40Savage.cpp index 1cbc0ad2..9aaf42c2 100644 --- a/src/scripts/instances/raids/DeltascapeV40Savage.cpp +++ b/src/scripts/instances/raids/DeltascapeV40Savage.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/DunScaith.cpp b/src/scripts/instances/raids/DunScaith.cpp index 8e11d057..1d650b4c 100644 --- a/src/scripts/instances/raids/DunScaith.cpp +++ b/src/scripts/instances/raids/DunScaith.cpp @@ -84,7 +84,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/SigmascapeV10.cpp b/src/scripts/instances/raids/SigmascapeV10.cpp index 0079725f..87fe1625 100644 --- a/src/scripts/instances/raids/SigmascapeV10.cpp +++ b/src/scripts/instances/raids/SigmascapeV10.cpp @@ -37,7 +37,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/SigmascapeV10Savage.cpp b/src/scripts/instances/raids/SigmascapeV10Savage.cpp index 31573844..e4e07d31 100644 --- a/src/scripts/instances/raids/SigmascapeV10Savage.cpp +++ b/src/scripts/instances/raids/SigmascapeV10Savage.cpp @@ -37,7 +37,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/SigmascapeV20.cpp b/src/scripts/instances/raids/SigmascapeV20.cpp index 0d224141..c4f95c7e 100644 --- a/src/scripts/instances/raids/SigmascapeV20.cpp +++ b/src/scripts/instances/raids/SigmascapeV20.cpp @@ -35,7 +35,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/SigmascapeV20Savage.cpp b/src/scripts/instances/raids/SigmascapeV20Savage.cpp index 1194cd3d..6fea178c 100644 --- a/src/scripts/instances/raids/SigmascapeV20Savage.cpp +++ b/src/scripts/instances/raids/SigmascapeV20Savage.cpp @@ -35,7 +35,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/SigmascapeV30.cpp b/src/scripts/instances/raids/SigmascapeV30.cpp index 8af53827..2305ea66 100644 --- a/src/scripts/instances/raids/SigmascapeV30.cpp +++ b/src/scripts/instances/raids/SigmascapeV30.cpp @@ -30,7 +30,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/SigmascapeV30Savage.cpp b/src/scripts/instances/raids/SigmascapeV30Savage.cpp index f263cacf..4ff275a8 100644 --- a/src/scripts/instances/raids/SigmascapeV30Savage.cpp +++ b/src/scripts/instances/raids/SigmascapeV30Savage.cpp @@ -30,7 +30,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/SigmascapeV40.cpp b/src/scripts/instances/raids/SigmascapeV40.cpp index a6bf32c6..e67b4eeb 100644 --- a/src/scripts/instances/raids/SigmascapeV40.cpp +++ b/src/scripts/instances/raids/SigmascapeV40.cpp @@ -35,7 +35,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/SigmascapeV40Savage.cpp b/src/scripts/instances/raids/SigmascapeV40Savage.cpp index 288062c4..17bbaa75 100644 --- a/src/scripts/instances/raids/SigmascapeV40Savage.cpp +++ b/src/scripts/instances/raids/SigmascapeV40Savage.cpp @@ -35,7 +35,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/SyrcusTower.cpp b/src/scripts/instances/raids/SyrcusTower.cpp index afeb406c..5ec791f5 100644 --- a/src/scripts/instances/raids/SyrcusTower.cpp +++ b/src/scripts/instances/raids/SyrcusTower.cpp @@ -84,7 +84,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp index 578d4516..528d4ffa 100644 --- a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp +++ b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp @@ -53,7 +53,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp index deb107c3..754ac8c7 100644 --- a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp +++ b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp @@ -54,7 +54,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp index 69595314..8b87fbfb 100644 --- a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp +++ b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp @@ -64,7 +64,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp index e8537d0d..db4d65b5 100644 --- a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp +++ b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp @@ -33,7 +33,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp index 773d3acc..040dbcc5 100644 --- a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp +++ b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp @@ -26,7 +26,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp index f37f8c4c..5b54a297 100644 --- a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp +++ b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp @@ -41,7 +41,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp index 5b564429..51809c5b 100644 --- a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp +++ b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp @@ -51,7 +51,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp index 752c996d..5252674f 100644 --- a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp +++ b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp @@ -24,7 +24,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp index b9fb1eac..d8c88c24 100644 --- a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp +++ b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp @@ -24,7 +24,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheLabyrinthoftheAncients.cpp b/src/scripts/instances/raids/TheLabyrinthoftheAncients.cpp index fcb67df4..2ed1915e 100644 --- a/src/scripts/instances/raids/TheLabyrinthoftheAncients.cpp +++ b/src/scripts/instances/raids/TheLabyrinthoftheAncients.cpp @@ -97,7 +97,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheOrbonneMonastery.cpp b/src/scripts/instances/raids/TheOrbonneMonastery.cpp index 1e30d051..c09bcd30 100644 --- a/src/scripts/instances/raids/TheOrbonneMonastery.cpp +++ b/src/scripts/instances/raids/TheOrbonneMonastery.cpp @@ -90,7 +90,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheRidoranaLighthouse.cpp b/src/scripts/instances/raids/TheRidoranaLighthouse.cpp index 44508b21..51781840 100644 --- a/src/scripts/instances/raids/TheRidoranaLighthouse.cpp +++ b/src/scripts/instances/raids/TheRidoranaLighthouse.cpp @@ -93,7 +93,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp b/src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp index 2bf976fd..9ea78eb9 100644 --- a/src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp +++ b/src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp @@ -117,7 +117,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp index a9936b68..2d037813 100644 --- a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp +++ b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp @@ -32,7 +32,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp index 9b9c8f95..1ebe5c4f 100644 --- a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp +++ b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp @@ -32,7 +32,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp index 7250f51a..4e42a8a2 100644 --- a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp +++ b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp @@ -95,7 +95,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp index 74ea7cc8..ca682e31 100644 --- a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp +++ b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp @@ -31,7 +31,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp index 0f42d8d2..b8c93834 100644 --- a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp +++ b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp @@ -32,7 +32,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp index 25af832e..ee131805 100644 --- a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp +++ b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp @@ -32,7 +32,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp index 39f37b9a..d4cbaef9 100644 --- a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp +++ b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp @@ -95,7 +95,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp index 3568813e..1c64c5e7 100644 --- a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp +++ b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp @@ -31,7 +31,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp b/src/scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp index 14516ba1..11a2e5ef 100644 --- a/src/scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp +++ b/src/scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp @@ -25,7 +25,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheVoidArk.cpp b/src/scripts/instances/raids/TheVoidArk.cpp index ffe880ae..a94f5e00 100644 --- a/src/scripts/instances/raids/TheVoidArk.cpp +++ b/src/scripts/instances/raids/TheVoidArk.cpp @@ -109,7 +109,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheWeaponsRefrainUltimate.cpp b/src/scripts/instances/raids/TheWeaponsRefrainUltimate.cpp index 6fea785f..a8a70b47 100644 --- a/src/scripts/instances/raids/TheWeaponsRefrainUltimate.cpp +++ b/src/scripts/instances/raids/TheWeaponsRefrainUltimate.cpp @@ -28,7 +28,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheWeepingCityofMhach.cpp b/src/scripts/instances/raids/TheWeepingCityofMhach.cpp index 1f0f4bc8..624d665a 100644 --- a/src/scripts/instances/raids/TheWeepingCityofMhach.cpp +++ b/src/scripts/instances/raids/TheWeepingCityofMhach.cpp @@ -107,7 +107,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/raids/TheWorldofDarkness.cpp b/src/scripts/instances/raids/TheWorldofDarkness.cpp index 717152c2..a089e1bb 100644 --- a/src/scripts/instances/raids/TheWorldofDarkness.cpp +++ b/src/scripts/instances/raids/TheWorldofDarkness.cpp @@ -133,7 +133,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/treasurehunt/TheAquapolis.cpp b/src/scripts/instances/treasurehunt/TheAquapolis.cpp index f515420a..ab7179c0 100644 --- a/src/scripts/instances/treasurehunt/TheAquapolis.cpp +++ b/src/scripts/instances/treasurehunt/TheAquapolis.cpp @@ -118,7 +118,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp b/src/scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp index 5ba9276c..ee43dc2c 100644 --- a/src/scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp +++ b/src/scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp @@ -139,7 +139,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp b/src/scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp index 4a3cd64f..02ac81a8 100644 --- a/src/scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp +++ b/src/scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp @@ -139,7 +139,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/treasurehunt/TheShiftingAltarsofUznair.cpp b/src/scripts/instances/treasurehunt/TheShiftingAltarsofUznair.cpp index 99f21d1c..1155c53a 100644 --- a/src/scripts/instances/treasurehunt/TheShiftingAltarsofUznair.cpp +++ b/src/scripts/instances/treasurehunt/TheShiftingAltarsofUznair.cpp @@ -39,7 +39,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ARelicReborntheChimera.cpp b/src/scripts/instances/trials/ARelicReborntheChimera.cpp index 4b78132e..8045a9fc 100644 --- a/src/scripts/instances/trials/ARelicReborntheChimera.cpp +++ b/src/scripts/instances/trials/ARelicReborntheChimera.cpp @@ -33,7 +33,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ARelicReborntheHydra.cpp b/src/scripts/instances/trials/ARelicReborntheHydra.cpp index f0f6d143..241fc633 100644 --- a/src/scripts/instances/trials/ARelicReborntheHydra.cpp +++ b/src/scripts/instances/trials/ARelicReborntheHydra.cpp @@ -67,7 +67,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp b/src/scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp index 32a6e699..6947dd08 100644 --- a/src/scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp +++ b/src/scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp @@ -30,7 +30,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/AkhAfahAmphitheatreHard.cpp b/src/scripts/instances/trials/AkhAfahAmphitheatreHard.cpp index 56207224..8cb221e8 100644 --- a/src/scripts/instances/trials/AkhAfahAmphitheatreHard.cpp +++ b/src/scripts/instances/trials/AkhAfahAmphitheatreHard.cpp @@ -30,7 +30,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/BattleintheBigKeep.cpp b/src/scripts/instances/trials/BattleintheBigKeep.cpp index 69d2b0db..77859962 100644 --- a/src/scripts/instances/trials/BattleintheBigKeep.cpp +++ b/src/scripts/instances/trials/BattleintheBigKeep.cpp @@ -139,7 +139,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/BattleontheBigBridge.cpp b/src/scripts/instances/trials/BattleontheBigBridge.cpp index a6dc0c5d..3f8534a4 100644 --- a/src/scripts/instances/trials/BattleontheBigBridge.cpp +++ b/src/scripts/instances/trials/BattleontheBigBridge.cpp @@ -28,7 +28,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/CapeWestwind.cpp b/src/scripts/instances/trials/CapeWestwind.cpp index 8a863296..5082ef47 100644 --- a/src/scripts/instances/trials/CapeWestwind.cpp +++ b/src/scripts/instances/trials/CapeWestwind.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/CastrumFluminis.cpp b/src/scripts/instances/trials/CastrumFluminis.cpp index ba9ad3d4..0e9716aa 100644 --- a/src/scripts/instances/trials/CastrumFluminis.cpp +++ b/src/scripts/instances/trials/CastrumFluminis.cpp @@ -32,7 +32,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ContainmentBayP1T6.cpp b/src/scripts/instances/trials/ContainmentBayP1T6.cpp index 9480aefb..dc29f0d4 100644 --- a/src/scripts/instances/trials/ContainmentBayP1T6.cpp +++ b/src/scripts/instances/trials/ContainmentBayP1T6.cpp @@ -25,7 +25,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ContainmentBayP1T6Extreme.cpp b/src/scripts/instances/trials/ContainmentBayP1T6Extreme.cpp index fb5a0b70..eaa6b4d7 100644 --- a/src/scripts/instances/trials/ContainmentBayP1T6Extreme.cpp +++ b/src/scripts/instances/trials/ContainmentBayP1T6Extreme.cpp @@ -25,7 +25,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ContainmentBayS1T7.cpp b/src/scripts/instances/trials/ContainmentBayS1T7.cpp index 4cb2143d..b5640950 100644 --- a/src/scripts/instances/trials/ContainmentBayS1T7.cpp +++ b/src/scripts/instances/trials/ContainmentBayS1T7.cpp @@ -32,7 +32,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ContainmentBayS1T7Extreme.cpp b/src/scripts/instances/trials/ContainmentBayS1T7Extreme.cpp index 1c8b1e6e..1511b945 100644 --- a/src/scripts/instances/trials/ContainmentBayS1T7Extreme.cpp +++ b/src/scripts/instances/trials/ContainmentBayS1T7Extreme.cpp @@ -32,7 +32,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ContainmentBayZ1T9.cpp b/src/scripts/instances/trials/ContainmentBayZ1T9.cpp index b93f229e..41f06bed 100644 --- a/src/scripts/instances/trials/ContainmentBayZ1T9.cpp +++ b/src/scripts/instances/trials/ContainmentBayZ1T9.cpp @@ -31,7 +31,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp b/src/scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp index dd0c39be..3f990441 100644 --- a/src/scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp +++ b/src/scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp @@ -31,7 +31,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/Emanation.cpp b/src/scripts/instances/trials/Emanation.cpp index e03b1a33..b2a9290d 100644 --- a/src/scripts/instances/trials/Emanation.cpp +++ b/src/scripts/instances/trials/Emanation.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/EmanationExtreme.cpp b/src/scripts/instances/trials/EmanationExtreme.cpp index d41a1a0d..1341ad96 100644 --- a/src/scripts/instances/trials/EmanationExtreme.cpp +++ b/src/scripts/instances/trials/EmanationExtreme.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/HellsKier.cpp b/src/scripts/instances/trials/HellsKier.cpp index 66f01834..4f8a182f 100644 --- a/src/scripts/instances/trials/HellsKier.cpp +++ b/src/scripts/instances/trials/HellsKier.cpp @@ -31,7 +31,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/HellsKierExtreme.cpp b/src/scripts/instances/trials/HellsKierExtreme.cpp index bc4047d1..9b5b0423 100644 --- a/src/scripts/instances/trials/HellsKierExtreme.cpp +++ b/src/scripts/instances/trials/HellsKierExtreme.cpp @@ -31,7 +31,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/SpecialEventI.cpp b/src/scripts/instances/trials/SpecialEventI.cpp index 1cb45c18..cf2aaf47 100644 --- a/src/scripts/instances/trials/SpecialEventI.cpp +++ b/src/scripts/instances/trials/SpecialEventI.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/SpecialEventII.cpp b/src/scripts/instances/trials/SpecialEventII.cpp index 1123778e..b73acb02 100644 --- a/src/scripts/instances/trials/SpecialEventII.cpp +++ b/src/scripts/instances/trials/SpecialEventII.cpp @@ -32,7 +32,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/SpecialEventIII.cpp b/src/scripts/instances/trials/SpecialEventIII.cpp index d2f01778..dba2eb22 100644 --- a/src/scripts/instances/trials/SpecialEventIII.cpp +++ b/src/scripts/instances/trials/SpecialEventIII.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheBowlofEmbers.cpp b/src/scripts/instances/trials/TheBowlofEmbers.cpp index 3899860e..19f34dfa 100644 --- a/src/scripts/instances/trials/TheBowlofEmbers.cpp +++ b/src/scripts/instances/trials/TheBowlofEmbers.cpp @@ -21,7 +21,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheBowlofEmbersExtreme.cpp b/src/scripts/instances/trials/TheBowlofEmbersExtreme.cpp index ef062135..ab1f1233 100644 --- a/src/scripts/instances/trials/TheBowlofEmbersExtreme.cpp +++ b/src/scripts/instances/trials/TheBowlofEmbersExtreme.cpp @@ -21,7 +21,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheBowlofEmbersHard.cpp b/src/scripts/instances/trials/TheBowlofEmbersHard.cpp index 08f037d9..2ce5333f 100644 --- a/src/scripts/instances/trials/TheBowlofEmbersHard.cpp +++ b/src/scripts/instances/trials/TheBowlofEmbersHard.cpp @@ -21,7 +21,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheChrysalis.cpp b/src/scripts/instances/trials/TheChrysalis.cpp index ab9bcad1..0ebc3030 100644 --- a/src/scripts/instances/trials/TheChrysalis.cpp +++ b/src/scripts/instances/trials/TheChrysalis.cpp @@ -49,7 +49,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheDragonsNeck.cpp b/src/scripts/instances/trials/TheDragonsNeck.cpp index 6556426a..58bf0557 100644 --- a/src/scripts/instances/trials/TheDragonsNeck.cpp +++ b/src/scripts/instances/trials/TheDragonsNeck.cpp @@ -72,7 +72,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheFinalStepsofFaith.cpp b/src/scripts/instances/trials/TheFinalStepsofFaith.cpp index e2068650..28350039 100644 --- a/src/scripts/instances/trials/TheFinalStepsofFaith.cpp +++ b/src/scripts/instances/trials/TheFinalStepsofFaith.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheGreatHunt.cpp b/src/scripts/instances/trials/TheGreatHunt.cpp index d33e5610..16434e60 100644 --- a/src/scripts/instances/trials/TheGreatHunt.cpp +++ b/src/scripts/instances/trials/TheGreatHunt.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheGreatHuntExtreme.cpp b/src/scripts/instances/trials/TheGreatHuntExtreme.cpp index a5aa9da8..80b8a8ba 100644 --- a/src/scripts/instances/trials/TheGreatHuntExtreme.cpp +++ b/src/scripts/instances/trials/TheGreatHuntExtreme.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheHowlingEye.cpp b/src/scripts/instances/trials/TheHowlingEye.cpp index 61e64602..819c1f34 100644 --- a/src/scripts/instances/trials/TheHowlingEye.cpp +++ b/src/scripts/instances/trials/TheHowlingEye.cpp @@ -27,7 +27,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheHowlingEyeExtreme.cpp b/src/scripts/instances/trials/TheHowlingEyeExtreme.cpp index 533694f5..0b980057 100644 --- a/src/scripts/instances/trials/TheHowlingEyeExtreme.cpp +++ b/src/scripts/instances/trials/TheHowlingEyeExtreme.cpp @@ -27,7 +27,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheHowlingEyeHard.cpp b/src/scripts/instances/trials/TheHowlingEyeHard.cpp index 5e8311e4..9808acdc 100644 --- a/src/scripts/instances/trials/TheHowlingEyeHard.cpp +++ b/src/scripts/instances/trials/TheHowlingEyeHard.cpp @@ -27,7 +27,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheJadeStoa.cpp b/src/scripts/instances/trials/TheJadeStoa.cpp index 91fd2a31..7dd7df38 100644 --- a/src/scripts/instances/trials/TheJadeStoa.cpp +++ b/src/scripts/instances/trials/TheJadeStoa.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheJadeStoaExtreme.cpp b/src/scripts/instances/trials/TheJadeStoaExtreme.cpp index 90d58e8c..2a66d016 100644 --- a/src/scripts/instances/trials/TheJadeStoaExtreme.cpp +++ b/src/scripts/instances/trials/TheJadeStoaExtreme.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheLimitlessBlueExtreme.cpp b/src/scripts/instances/trials/TheLimitlessBlueExtreme.cpp index 0cdefea7..b2f2213d 100644 --- a/src/scripts/instances/trials/TheLimitlessBlueExtreme.cpp +++ b/src/scripts/instances/trials/TheLimitlessBlueExtreme.cpp @@ -27,7 +27,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheLimitlessBlueHard.cpp b/src/scripts/instances/trials/TheLimitlessBlueHard.cpp index 7a66348e..6f534afc 100644 --- a/src/scripts/instances/trials/TheLimitlessBlueHard.cpp +++ b/src/scripts/instances/trials/TheLimitlessBlueHard.cpp @@ -27,7 +27,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp b/src/scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp index d987198e..bc5b61c0 100644 --- a/src/scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp +++ b/src/scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp @@ -22,7 +22,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp b/src/scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp index 7b879b10..e4d78aaf 100644 --- a/src/scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp +++ b/src/scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp @@ -36,7 +36,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp b/src/scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp index 3086c312..10ec1158 100644 --- a/src/scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp +++ b/src/scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp @@ -72,7 +72,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheMinstrelsBalladTsukuyomisPain.cpp b/src/scripts/instances/trials/TheMinstrelsBalladTsukuyomisPain.cpp index 12ae093a..75fb2920 100644 --- a/src/scripts/instances/trials/TheMinstrelsBalladTsukuyomisPain.cpp +++ b/src/scripts/instances/trials/TheMinstrelsBalladTsukuyomisPain.cpp @@ -32,7 +32,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp b/src/scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp index 0c26a2a8..a5c6acd5 100644 --- a/src/scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp +++ b/src/scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp @@ -25,7 +25,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheNavel.cpp b/src/scripts/instances/trials/TheNavel.cpp index ed624d8e..a6edd431 100644 --- a/src/scripts/instances/trials/TheNavel.cpp +++ b/src/scripts/instances/trials/TheNavel.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheNavelExtreme.cpp b/src/scripts/instances/trials/TheNavelExtreme.cpp index d2687f49..819af37c 100644 --- a/src/scripts/instances/trials/TheNavelExtreme.cpp +++ b/src/scripts/instances/trials/TheNavelExtreme.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheNavelHard.cpp b/src/scripts/instances/trials/TheNavelHard.cpp index e3eba771..c4eddb65 100644 --- a/src/scripts/instances/trials/TheNavelHard.cpp +++ b/src/scripts/instances/trials/TheNavelHard.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ThePoolofTribute.cpp b/src/scripts/instances/trials/ThePoolofTribute.cpp index 6c7ce2fe..cdda3cae 100644 --- a/src/scripts/instances/trials/ThePoolofTribute.cpp +++ b/src/scripts/instances/trials/ThePoolofTribute.cpp @@ -21,7 +21,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ThePoolofTributeExtreme.cpp b/src/scripts/instances/trials/ThePoolofTributeExtreme.cpp index 36f73c42..bbad8aa5 100644 --- a/src/scripts/instances/trials/ThePoolofTributeExtreme.cpp +++ b/src/scripts/instances/trials/ThePoolofTributeExtreme.cpp @@ -21,7 +21,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheRoyalMenagerie.cpp b/src/scripts/instances/trials/TheRoyalMenagerie.cpp index 0144b302..f22a3d5a 100644 --- a/src/scripts/instances/trials/TheRoyalMenagerie.cpp +++ b/src/scripts/instances/trials/TheRoyalMenagerie.cpp @@ -32,7 +32,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheSingularityReactor.cpp b/src/scripts/instances/trials/TheSingularityReactor.cpp index 991f40b1..2b740a75 100644 --- a/src/scripts/instances/trials/TheSingularityReactor.cpp +++ b/src/scripts/instances/trials/TheSingularityReactor.cpp @@ -72,7 +72,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheStepsofFaith.cpp b/src/scripts/instances/trials/TheStepsofFaith.cpp index 57902de6..0e17d63c 100644 --- a/src/scripts/instances/trials/TheStepsofFaith.cpp +++ b/src/scripts/instances/trials/TheStepsofFaith.cpp @@ -43,7 +43,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheStrikingTreeExtreme.cpp b/src/scripts/instances/trials/TheStrikingTreeExtreme.cpp index eb39b371..51c35f92 100644 --- a/src/scripts/instances/trials/TheStrikingTreeExtreme.cpp +++ b/src/scripts/instances/trials/TheStrikingTreeExtreme.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheStrikingTreeHard.cpp b/src/scripts/instances/trials/TheStrikingTreeHard.cpp index c50a14ce..52013ae8 100644 --- a/src/scripts/instances/trials/TheStrikingTreeHard.cpp +++ b/src/scripts/instances/trials/TheStrikingTreeHard.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheWhorleaterExtreme.cpp b/src/scripts/instances/trials/TheWhorleaterExtreme.cpp index 956d00de..eab8e925 100644 --- a/src/scripts/instances/trials/TheWhorleaterExtreme.cpp +++ b/src/scripts/instances/trials/TheWhorleaterExtreme.cpp @@ -24,7 +24,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheWhorleaterHard.cpp b/src/scripts/instances/trials/TheWhorleaterHard.cpp index b9c9445b..89c83ccb 100644 --- a/src/scripts/instances/trials/TheWhorleaterHard.cpp +++ b/src/scripts/instances/trials/TheWhorleaterHard.cpp @@ -24,7 +24,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheWreathofSnakes.cpp b/src/scripts/instances/trials/TheWreathofSnakes.cpp index 9127f53b..b3c593ec 100644 --- a/src/scripts/instances/trials/TheWreathofSnakes.cpp +++ b/src/scripts/instances/trials/TheWreathofSnakes.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/TheWreathofSnakesExtreme.cpp b/src/scripts/instances/trials/TheWreathofSnakesExtreme.cpp index c11021f0..3f21aa11 100644 --- a/src/scripts/instances/trials/TheWreathofSnakesExtreme.cpp +++ b/src/scripts/instances/trials/TheWreathofSnakesExtreme.cpp @@ -20,7 +20,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ThokastThokExtreme.cpp b/src/scripts/instances/trials/ThokastThokExtreme.cpp index 406ef2c4..08d9ad09 100644 --- a/src/scripts/instances/trials/ThokastThokExtreme.cpp +++ b/src/scripts/instances/trials/ThokastThokExtreme.cpp @@ -39,7 +39,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ThokastThokHard.cpp b/src/scripts/instances/trials/ThokastThokHard.cpp index fa297d7a..1c72fcfb 100644 --- a/src/scripts/instances/trials/ThokastThokHard.cpp +++ b/src/scripts/instances/trials/ThokastThokHard.cpp @@ -39,7 +39,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ThornmarchExtreme.cpp b/src/scripts/instances/trials/ThornmarchExtreme.cpp index e939405d..3f0aafda 100644 --- a/src/scripts/instances/trials/ThornmarchExtreme.cpp +++ b/src/scripts/instances/trials/ThornmarchExtreme.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/ThornmarchHard.cpp b/src/scripts/instances/trials/ThornmarchHard.cpp index c78266ba..581239a7 100644 --- a/src/scripts/instances/trials/ThornmarchHard.cpp +++ b/src/scripts/instances/trials/ThornmarchHard.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/scripts/instances/trials/UrthsFount.cpp b/src/scripts/instances/trials/UrthsFount.cpp index e576550d..3e4ff0d5 100644 --- a/src/scripts/instances/trials/UrthsFount.cpp +++ b/src/scripts/instances/trials/UrthsFount.cpp @@ -19,7 +19,7 @@ public: } - void onUpdate( InstanceContent& instance, uint32_t currTime ) override + void onUpdate( InstanceContent& instance, uint64_t tickCount ) override { } diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index b072a768..31bcf940 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -166,9 +166,9 @@ bool Sapphire::Action::Action::update() // todo: check if the target is still in range } - uint64_t currTime = Util::getTimeMs(); + uint64_t tickCount = Util::getTimeMs(); - if( !hasCastTime() || std::difftime( currTime, m_startTime ) > m_castTimeMs ) + if( !hasCastTime() || std::difftime( tickCount, m_startTime ) > m_castTimeMs ) { execute(); return true; diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp index acf6b512..2691756a 100644 --- a/src/world/Actor/BNpc.cpp +++ b/src/world/Actor/BNpc.cpp @@ -424,7 +424,7 @@ void Sapphire::Entity::BNpc::onTick() } } -void Sapphire::Entity::BNpc::update( int64_t currTime ) +void Sapphire::Entity::BNpc::update( uint64_t tickCount ) { const uint8_t minActorDistance = 4; const uint8_t maxDistanceToOrigin = 40; @@ -549,7 +549,7 @@ void Sapphire::Entity::BNpc::update( int64_t currTime ) } - Chara::update( currTime ); + Chara::update( tickCount ); } void Sapphire::Entity::BNpc::regainHp() diff --git a/src/world/Actor/BNpc.h b/src/world/Actor/BNpc.h index a473b084..439b915e 100644 --- a/src/world/Actor/BNpc.h +++ b/src/world/Actor/BNpc.h @@ -84,7 +84,7 @@ namespace Sapphire::Entity void aggro( CharaPtr pChara ); void deaggro( CharaPtr pChara ); - void update( int64_t currTime ) override; + void update( uint64_t tickCount ) override; void onTick() override; void onActionHostile( CharaPtr pSource ) override; diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp index fa9724bb..06f447dc 100644 --- a/src/world/Actor/Chara.cpp +++ b/src/world/Actor/Chara.cpp @@ -284,16 +284,16 @@ bool Sapphire::Entity::Chara::checkAction() } -void Sapphire::Entity::Chara::update( int64_t currTime ) +void Sapphire::Entity::Chara::update( uint64_t tickCount ) { - if( std::difftime( currTime, m_lastTickTime ) > 3000 ) + if( std::difftime( tickCount, m_lastTickTime ) > 3000 ) { onTick(); - m_lastTickTime = currTime; + m_lastTickTime = tickCount; } - m_lastUpdate = currTime; + m_lastUpdate = tickCount; } /*! diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h index 00b3148a..d8945fb2 100644 --- a/src/world/Actor/Chara.h +++ b/src/world/Actor/Chara.h @@ -251,7 +251,7 @@ namespace Sapphire::Entity virtual bool checkAction(); - virtual void update( int64_t currTime ); + virtual void update( uint64_t tickCount ); Action::ActionPtr getCurrentAction() const; diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index 7754369b..e0354f84 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -1054,10 +1054,10 @@ void Sapphire::Entity::Player::unsetStateFlag( Common::PlayerStateFlag flag ) true ); } -void Sapphire::Entity::Player::update( int64_t currTime ) +void Sapphire::Entity::Player::update( uint64_t tickCount ) { // a zoning is pending, lets do it - if( m_queuedZoneing && ( currTime - m_queuedZoneing->m_queueTime ) > 800 ) + if( m_queuedZoneing && ( tickCount - m_queuedZoneing->m_queueTime ) > 800 ) { Common::FFXIVARR_POSITION3 targetPos = m_queuedZoneing->m_targetPosition; if( getCurrentZone()->getTerritoryTypeId() != m_queuedZoneing->m_targetZone ) @@ -1087,7 +1087,7 @@ void Sapphire::Entity::Player::update( int64_t currTime ) updateStatusEffects(); - m_lastUpdate = currTime; + m_lastUpdate = tickCount; if( !checkAction() ) { @@ -1115,9 +1115,9 @@ void Sapphire::Entity::Player::update( int64_t currTime ) actor->getPos().x, actor->getPos().y, actor->getPos().z ) <= range ) { - if( ( currTime - m_lastAttack ) > mainWeap->getDelay() ) + if( ( tickCount - m_lastAttack ) > mainWeap->getDelay() ) { - m_lastAttack = currTime; + m_lastAttack = tickCount; autoAttack( actor->getAsChara() ); } @@ -1127,7 +1127,7 @@ void Sapphire::Entity::Player::update( int64_t currTime ) } } - Chara::update( currTime ); + Chara::update( tickCount ); } void Sapphire::Entity::Player::onMobKill( uint16_t nameId ) diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h index 3a7e6795..314c055e 100644 --- a/src/world/Actor/Player.h +++ b/src/world/Actor/Player.h @@ -147,7 +147,7 @@ namespace Sapphire::Entity void onDeath() override; /*! Event called on every session iteration */ - void update( int64_t currTime ) override; + void update( uint64_t tickCount ) override; /*! Event to be called upon Bnpc kill */ void onMobKill( uint16_t nameId ); diff --git a/src/world/Event/Director.h b/src/world/Event/Director.h index 29579aa4..779efb78 100644 --- a/src/world/Event/Director.h +++ b/src/world/Event/Director.h @@ -36,7 +36,8 @@ namespace Sapphire::Event Created, DutyReset, DutyInProgress, - DutyFinished + DutyFinished, + DutyFailed }; Director( DirectorType type, uint16_t contentId ); diff --git a/src/world/Manager/TerritoryMgr.cpp b/src/world/Manager/TerritoryMgr.cpp index 7c47f428..c288868f 100644 --- a/src/world/Manager/TerritoryMgr.cpp +++ b/src/world/Manager/TerritoryMgr.cpp @@ -500,16 +500,16 @@ Sapphire::ZonePtr Sapphire::World::Manager::TerritoryMgr::getZoneByLandSetId( ui return zoneMap->second; } -void Sapphire::World::Manager::TerritoryMgr::updateTerritoryInstances( uint32_t currentTime ) +void Sapphire::World::Manager::TerritoryMgr::updateTerritoryInstances( uint64_t tickCount ) { for( auto& zone : m_zoneSet ) { - zone->update( currentTime ); + zone->update( tickCount ); } for( auto& zone : m_instanceZoneSet ) { - zone->update( currentTime ); + zone->update( tickCount ); } // remove internal house zones with nobody in them @@ -518,10 +518,10 @@ void Sapphire::World::Manager::TerritoryMgr::updateTerritoryInstances( uint32_t auto zone = std::dynamic_pointer_cast< Territory::Housing::HousingInteriorTerritory >( it->second ); assert( zone ); // wtf?? - auto diff = std::difftime( currentTime, zone->getLastActivityTime() ); + auto diff = std::difftime( tickCount, zone->getLastActivityTime() ); // todo: make this timeout configurable, though should be pretty relaxed in any case - if( diff > 60 ) + if( diff > 6000 ) { Logger::info( "Removing HousingInteriorTerritory#{0} - has been inactive for 60 seconds", zone->getGuId() ); diff --git a/src/world/Manager/TerritoryMgr.h b/src/world/Manager/TerritoryMgr.h index b6f0c02d..e0d8dbae 100644 --- a/src/world/Manager/TerritoryMgr.h +++ b/src/world/Manager/TerritoryMgr.h @@ -120,7 +120,7 @@ namespace Sapphire::World::Manager Data::TerritoryTypePtr getTerritoryDetail( uint32_t territoryTypeId ) const; /*! loop for processing territory logic, iterating all existing instances */ - void updateTerritoryInstances( uint32_t currentTime ); + void updateTerritoryInstances( uint64_t tickCount ); /*! returns a ZonePositionPtr if found, else nullptr */ ZonePositionPtr getTerritoryPosition( uint32_t territoryPositionId ) const; diff --git a/src/world/Network/PacketWrappers/ChatPacket.h b/src/world/Network/PacketWrappers/ChatPacket.h index b3b9711d..29e4aa26 100644 --- a/src/world/Network/PacketWrappers/ChatPacket.h +++ b/src/world/Network/PacketWrappers/ChatPacket.h @@ -12,7 +12,7 @@ namespace Sapphire::Network::Packets::Server /** * @brief The Chat packet. */ - class ChatPacket : public ZoneChannelPacket< FFXIVIpcChat > + class ChatPacket : public ZoneChannelPacket< FFXIVIpcChat > { public: ChatPacket( Entity::Player& player, Common::ChatType chatType, const std::string& msg ) : diff --git a/src/world/Network/PacketWrappers/ModelEquipPacket.h b/src/world/Network/PacketWrappers/ModelEquipPacket.h index 60966f4a..50cc7b5d 100644 --- a/src/world/Network/PacketWrappers/ModelEquipPacket.h +++ b/src/world/Network/PacketWrappers/ModelEquipPacket.h @@ -11,8 +11,7 @@ namespace Sapphire::Network::Packets::Server /** * @brief The update model packet. */ - class ModelEquipPacket : - public ZoneChannelPacket< FFXIVIpcModelEquip > + class ModelEquipPacket : public ZoneChannelPacket< FFXIVIpcModelEquip > { public: ModelEquipPacket( Entity::Player& player ) : diff --git a/src/world/Network/PacketWrappers/MoveActorPacket.h b/src/world/Network/PacketWrappers/MoveActorPacket.h index 21595ea9..78718b41 100644 --- a/src/world/Network/PacketWrappers/MoveActorPacket.h +++ b/src/world/Network/PacketWrappers/MoveActorPacket.h @@ -15,8 +15,7 @@ namespace Sapphire::Network::Packets::Server * @brief The Client UI Initialization packet. This must be sent to the client * once upon connection to configure the UI. */ - class MoveActorPacket : - public ZoneChannelPacket< FFXIVIpcActorMove > + class MoveActorPacket : public ZoneChannelPacket< FFXIVIpcActorMove > { public: MoveActorPacket( Entity::Chara& actor, uint8_t headRotation, uint8_t animationType, uint8_t state, uint16_t animationSpeed, uint8_t unknownRotation = 0 ) : diff --git a/src/world/Network/PacketWrappers/PingPacket.h b/src/world/Network/PacketWrappers/PingPacket.h index 7760087a..df2241d5 100644 --- a/src/world/Network/PacketWrappers/PingPacket.h +++ b/src/world/Network/PacketWrappers/PingPacket.h @@ -11,8 +11,7 @@ namespace Sapphire::Network::Packets::Server /** * @brief The Ping response packet. */ - class PingPacket : - public ZoneChannelPacket< FFXIVIpcPing > + class PingPacket : public ZoneChannelPacket< FFXIVIpcPing > { public: PingPacket( Entity::Player& player, int32_t inVal ) : diff --git a/src/world/Network/PacketWrappers/ServerNoticePacket.h b/src/world/Network/PacketWrappers/ServerNoticePacket.h index e403fe3c..aeefe168 100644 --- a/src/world/Network/PacketWrappers/ServerNoticePacket.h +++ b/src/world/Network/PacketWrappers/ServerNoticePacket.h @@ -11,8 +11,7 @@ namespace Sapphire::Network::Packets::Server /** * @brief The Ping response packet. */ - class ServerNoticePacket : - public ZoneChannelPacket< FFXIVIpcServerNotice > + class ServerNoticePacket : public ZoneChannelPacket< FFXIVIpcServerNotice > { public: ServerNoticePacket( uint32_t playerId, const std::string& message ) : diff --git a/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h index c4ff50f1..cfc85756 100644 --- a/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h +++ b/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h @@ -11,8 +11,7 @@ namespace Sapphire::Network::Packets::Server /** * @brief The Ping response packet. */ - class UpdateHpMpTpPacket : - public ZoneChannelPacket< FFXIVIpcUpdateHpMpTp > + class UpdateHpMpTpPacket : public ZoneChannelPacket< FFXIVIpcUpdateHpMpTp > { public: UpdateHpMpTpPacket( Entity::Chara& actor ) : diff --git a/src/world/Script/NativeScriptApi.cpp b/src/world/Script/NativeScriptApi.cpp index 471f48e2..33fcfb60 100644 --- a/src/world/Script/NativeScriptApi.cpp +++ b/src/world/Script/NativeScriptApi.cpp @@ -185,7 +185,7 @@ namespace Sapphire::ScriptAPI { } - void InstanceContentScript::onUpdate( InstanceContent& instance, uint32_t currTime ) + void InstanceContentScript::onUpdate( InstanceContent& instance, uint64_t tickCount ) { } @@ -209,7 +209,7 @@ namespace Sapphire::ScriptAPI { } - void QuestBattleScript::onUpdate( QuestBattle& instance, uint32_t currTime ) + void QuestBattleScript::onUpdate( QuestBattle& instance, uint64_t tickCount ) { } diff --git a/src/world/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h index a18b3cc9..073a5d63 100644 --- a/src/world/Script/NativeScriptApi.h +++ b/src/world/Script/NativeScriptApi.h @@ -225,7 +225,7 @@ namespace Sapphire::ScriptAPI virtual void onInit( Sapphire::InstanceContent& instance ); - virtual void onUpdate( Sapphire::InstanceContent& instance, uint32_t currTime ); + virtual void onUpdate( Sapphire::InstanceContent& instance, uint64_t tickCount ); virtual void onEnterTerritory( Sapphire::InstanceContent& instance, Sapphire::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ); @@ -243,7 +243,7 @@ namespace Sapphire::ScriptAPI virtual void onInit( Sapphire::QuestBattle& instance ); - virtual void onUpdate( Sapphire::QuestBattle& instance, uint32_t currTime ); + virtual void onUpdate( Sapphire::QuestBattle& instance, uint64_t tickCount ); virtual void onEnterTerritory( Sapphire::QuestBattle& instance, Sapphire::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ); diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp index 27f373d0..260f196a 100644 --- a/src/world/Script/ScriptMgr.cpp +++ b/src/world/Script/ScriptMgr.cpp @@ -436,13 +436,13 @@ bool Sapphire::Scripting::ScriptMgr::onInstanceInit( InstanceContentPtr instance return false; } -bool Sapphire::Scripting::ScriptMgr::onInstanceUpdate( InstanceContentPtr instance, uint32_t currTime ) +bool Sapphire::Scripting::ScriptMgr::onInstanceUpdate( InstanceContentPtr instance, uint64_t tickCount ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::InstanceContentScript >( instance->getDirectorId() ); if( script ) { - script->onUpdate( *instance, currTime ); + script->onUpdate( *instance, tickCount ); return true; } @@ -486,13 +486,13 @@ bool Sapphire::Scripting::ScriptMgr::onInstanceInit( QuestBattlePtr instance ) return false; } -bool Sapphire::Scripting::ScriptMgr::onInstanceUpdate( QuestBattlePtr instance, uint32_t currTime ) +bool Sapphire::Scripting::ScriptMgr::onInstanceUpdate( QuestBattlePtr instance, uint64_t tickCount ) { auto script = m_nativeScriptMgr->getScript< Sapphire::ScriptAPI::QuestBattleScript >( instance->getDirectorId() ); if( script ) { - script->onUpdate( *instance, currTime ); + script->onUpdate( *instance, tickCount ); return true; } diff --git a/src/world/Script/ScriptMgr.h b/src/world/Script/ScriptMgr.h index b5faffc5..ce05c052 100644 --- a/src/world/Script/ScriptMgr.h +++ b/src/world/Script/ScriptMgr.h @@ -94,7 +94,7 @@ namespace Sapphire::Scripting bool onInstanceInit( InstanceContentPtr instance ); - bool onInstanceUpdate( InstanceContentPtr instance, uint32_t currTime ); + bool onInstanceUpdate( InstanceContentPtr instance, uint64_t tickCount ); bool onInstanceEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1, @@ -104,7 +104,7 @@ namespace Sapphire::Scripting bool onInstanceInit( QuestBattlePtr instance ); - bool onInstanceUpdate( QuestBattlePtr instance, uint32_t currTime ); + bool onInstanceUpdate( QuestBattlePtr instance, uint64_t tickCount ); bool onInstanceEnterTerritory( QuestBattlePtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ); diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp index c3686943..71cef6a0 100644 --- a/src/world/ServerMgr.cpp +++ b/src/world/ServerMgr.cpp @@ -271,8 +271,9 @@ void Sapphire::World::ServerMgr::mainLoop() std::this_thread::sleep_for( std::chrono::milliseconds( 50 ) ); auto currTime = Util::getTimeSeconds(); + auto tickCount = Util::getTimeMs(); - pTeriMgr->updateTerritoryInstances( currTime ); + pTeriMgr->updateTerritoryInstances( tickCount ); pScriptMgr->update(); diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.cpp b/src/world/Territory/Housing/HousingInteriorTerritory.cpp index ef140545..761efeed 100644 --- a/src/world/Territory/Housing/HousingInteriorTerritory.cpp +++ b/src/world/Territory/Housing/HousingInteriorTerritory.cpp @@ -39,7 +39,7 @@ Sapphire::World::Territory::Housing::HousingInteriorTerritory::HousingInteriorTe Zone( territoryTypeId, guId, internalName, contentName, pFw ), m_landIdent( ident ) { - m_lastActivityTime = Util::getTimeSeconds(); + m_lastActivityTime = 0; } Housing::HousingInteriorTerritory::~HousingInteriorTerritory() = default; @@ -103,13 +103,13 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onPlayerZone player.queuePacket( Server::makeActorControl143( player.getId(), Network::ActorControl::HideAdditionalChambersDoor ) ); } -void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onUpdate( uint32_t currTime ) +void Sapphire::World::Territory::Housing::HousingInteriorTerritory::onUpdate( uint64_t tickCount ) { if( m_playerMap.size() > 0 ) - m_lastActivityTime = currTime; + m_lastActivityTime = tickCount; } -uint32_t Sapphire::World::Territory::Housing::HousingInteriorTerritory::getLastActivityTime() const +uint64_t Sapphire::World::Territory::Housing::HousingInteriorTerritory::getLastActivityTime() const { return m_lastActivityTime; } diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.h b/src/world/Territory/Housing/HousingInteriorTerritory.h index 352c414e..b108d4e4 100644 --- a/src/world/Territory/Housing/HousingInteriorTerritory.h +++ b/src/world/Territory/Housing/HousingInteriorTerritory.h @@ -19,9 +19,9 @@ namespace Sapphire::World::Territory::Housing bool init() override; void onPlayerZoneIn( Entity::Player& player ) override; - void onUpdate( uint32_t currTime ) override; + void onUpdate( uint64_t tickCount ) override; - uint32_t getLastActivityTime() const; + uint64_t getLastActivityTime() const; const Common::LandIdent getLandIdent() const; @@ -34,7 +34,7 @@ namespace Sapphire::World::Territory::Housing private: Common::LandIdent m_landIdent; - uint32_t m_lastActivityTime; + uint64_t m_lastActivityTime; std::array< Sapphire::Common::HousingObject, 400 > m_housingObjects; }; diff --git a/src/world/Territory/HousingZone.cpp b/src/world/Territory/HousingZone.cpp index 4a6e2f90..e138b38e 100644 --- a/src/world/Territory/HousingZone.cpp +++ b/src/world/Territory/HousingZone.cpp @@ -153,8 +153,6 @@ bool Sapphire::HousingZone::init() return true; } -Sapphire::HousingZone::~HousingZone() = default; - void Sapphire::HousingZone::onPlayerZoneIn( Entity::Player& player ) { Logger::debug( "HousingZone::onPlayerZoneIn: Zone#{0}|{1}, Entity#{2}", @@ -284,11 +282,11 @@ bool Sapphire::HousingZone::isPlayerSubInstance( Entity::Player& player ) return player.getPos().x < -15000.0f; //ToDo: get correct pos } -void Sapphire::HousingZone::onUpdate( uint32_t currTime ) +void Sapphire::HousingZone::onUpdate( uint64_t tickCount ) { for( auto pLandItr : m_landPtrMap ) { - pLandItr.second->update( currTime ); + pLandItr.second->update( tickCount ); } } diff --git a/src/world/Territory/HousingZone.h b/src/world/Territory/HousingZone.h index c637e521..001f5a58 100644 --- a/src/world/Territory/HousingZone.h +++ b/src/world/Territory/HousingZone.h @@ -34,12 +34,12 @@ namespace Sapphire const std::string& contentName, FrameworkPtr pFw ); - virtual ~HousingZone(); + virtual ~HousingZone() = default; bool init() override; void onPlayerZoneIn( Entity::Player& player ) override; - void onUpdate( uint32_t currTime ) override; + void onUpdate( uint64_t tickCount ) override; void sendLandSet( Entity::Player& player ); void sendLandUpdate( uint8_t landId ); diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp index 99d604ec..285469e6 100644 --- a/src/world/Territory/InstanceContent.cpp +++ b/src/world/Territory/InstanceContent.cpp @@ -93,7 +93,7 @@ void Sapphire::InstanceContent::onLeaveTerritory( Entity::Player& player ) clearDirector( player ); } -void Sapphire::InstanceContent::onUpdate( uint32_t currTime ) +void Sapphire::InstanceContent::onUpdate( uint64_t tickCount ) { switch( m_state ) { @@ -118,10 +118,10 @@ void Sapphire::InstanceContent::onUpdate( uint32_t currTime ) if( m_instanceCommenceTime == 0 ) { - m_instanceCommenceTime = Util::getTimeMs() + instanceStartDelay; + m_instanceCommenceTime = tickCount + instanceStartDelay; return; } - else if( Util::getTimeMs() < m_instanceCommenceTime ) + else if( tickCount < m_instanceCommenceTime ) return; for( const auto& playerIt : m_playerMap ) @@ -154,7 +154,7 @@ void Sapphire::InstanceContent::onUpdate( uint32_t currTime ) } auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >(); - pScriptMgr->onInstanceUpdate( getAsInstanceContent(), currTime ); + pScriptMgr->onInstanceUpdate( getAsInstanceContent(), tickCount ); } void Sapphire::InstanceContent::onFinishLoading( Entity::Player& player ) diff --git a/src/world/Territory/InstanceContent.h b/src/world/Territory/InstanceContent.h index adacd08b..2acae2b2 100644 --- a/src/world/Territory/InstanceContent.h +++ b/src/world/Territory/InstanceContent.h @@ -47,7 +47,7 @@ namespace Sapphire void onDirectorSync( Entity::Player& player ) override; - void onUpdate( uint32_t currTime ) override; + void onUpdate( uint64_t tickCount ) override; void onTalk( Entity::Player& player, uint32_t eventId, uint64_t actorId ); diff --git a/src/world/Territory/Land.cpp b/src/world/Territory/Land.cpp index fb18f139..bb11a578 100644 --- a/src/world/Territory/Land.cpp +++ b/src/world/Territory/Land.cpp @@ -225,10 +225,11 @@ void Sapphire::Land::updateLandDb() house->updateHouseDb(); } -void Sapphire::Land::update( uint32_t currTime ) +void Sapphire::Land::update( uint64_t tickCount ) { if( getStatus() == HouseStatus::ForSale ) { + auto currTime = Util::getTimeSeconds(); if( m_nextDrop < currTime && m_minPrice < m_currentPrice ) { m_nextDrop = currTime + 21600; diff --git a/src/world/Territory/Land.h b/src/world/Territory/Land.h index 8eecbb33..213cfe3c 100644 --- a/src/world/Territory/Land.h +++ b/src/world/Territory/Land.h @@ -53,7 +53,7 @@ namespace Sapphire void setCurrentPrice( uint32_t currentPrice ); bool setPreset( uint32_t itemId ); void updateLandDb(); - void update( uint32_t currTime ); + void update( uint64_t tickCount ); uint32_t getCurrentPrice() const; uint32_t getMaxPrice() const; diff --git a/src/world/Territory/QuestBattle.cpp b/src/world/Territory/QuestBattle.cpp index 4e65dd99..227d82ba 100644 --- a/src/world/Territory/QuestBattle.cpp +++ b/src/world/Territory/QuestBattle.cpp @@ -40,7 +40,6 @@ Sapphire::QuestBattle::QuestBattle( std::shared_ptr< Sapphire::Data::QuestBattle m_questBattleId( questBattleId ), m_state( Created ), m_instanceCommenceTime( 0 ) - // m_currentBgm( pInstanceConfiguration->bGM ) { } @@ -53,12 +52,6 @@ bool Sapphire::QuestBattle::init() return true; } - -Sapphire::QuestBattle::~QuestBattle() -{ - -} - uint32_t Sapphire::QuestBattle::getQuestBattleId() const { return m_questBattleId; @@ -79,10 +72,7 @@ void Sapphire::QuestBattle::onPlayerZoneIn( Entity::Player& player ) // mark player as "bound by duty" player.setStateFlag( PlayerStateFlag::BoundByDuty ); - // if the instance was not started yet, director init is sent on enter event. - // else it will be sent on finish loading. - if( m_state == Created ) - sendDirectorInit( player ); + sendDirectorInit( player ); } @@ -101,7 +91,7 @@ void Sapphire::QuestBattle::onEnterSceneFinish( Entity::Player& player ) setSequence( 2 ); } -void Sapphire::QuestBattle::onUpdate( uint32_t currTime ) +void Sapphire::QuestBattle::onUpdate( uint64_t tickCount ) { switch( m_state ) { @@ -135,16 +125,17 @@ void Sapphire::QuestBattle::onUpdate( uint32_t currTime ) break; case DutyInProgress: - { break; - } case DutyFinished: break; + + case DutyFailed: + setSequence( 0xFE ); } auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >(); - pScriptMgr->onInstanceUpdate( getAsQuestBattle(), currTime ); + pScriptMgr->onInstanceUpdate( getAsQuestBattle(), tickCount ); } void Sapphire::QuestBattle::onFinishLoading( Entity::Player& player ) @@ -247,7 +238,6 @@ void Sapphire::QuestBattle::setBranch( uint8_t value ) { setDirectorBranch( value ); sendDirectorVars( *m_pPlayer ); - } void Sapphire::QuestBattle::startQte() diff --git a/src/world/Territory/QuestBattle.h b/src/world/Territory/QuestBattle.h index 87b888ad..67495c65 100644 --- a/src/world/Territory/QuestBattle.h +++ b/src/world/Territory/QuestBattle.h @@ -23,7 +23,7 @@ namespace Sapphire uint32_t questBattleId, FrameworkPtr pFw ); - virtual ~QuestBattle(); + virtual ~QuestBattle() = default; bool init() override; @@ -39,7 +39,7 @@ namespace Sapphire void onDirectorSync( Entity::Player& player ) override; - void onUpdate( uint32_t currTime ) override; + void onUpdate( uint64_t tickCount ) override; void onTalk( Entity::Player& player, uint32_t eventId, uint64_t actorId ); diff --git a/src/world/Territory/Zone.cpp b/src/world/Territory/Zone.cpp index bf55866e..be66bcc4 100644 --- a/src/world/Territory/Zone.cpp +++ b/src/world/Territory/Zone.cpp @@ -68,7 +68,8 @@ Sapphire::Zone::Zone( uint16_t territoryTypeId, uint32_t guId, m_currentWeather( Weather::FairSkies ), m_nextEObjId( 0x400D0000 ), m_nextActorId( 0x500D0000 ), - m_pFw( pFw ) + m_pFw( pFw ), + m_lastUpdate( 0 ) { auto pExdData = m_pFw->get< Data::ExdDataGenerated >(); m_guId = guId; @@ -386,13 +387,13 @@ bool Sapphire::Zone::checkWeather() return false; } -void Sapphire::Zone::updateBNpcs( int64_t tickCount ) +void Sapphire::Zone::updateBNpcs( uint64_t tickCount ) { if( ( tickCount - m_lastMobUpdate ) <= 250 ) return; m_lastMobUpdate = tickCount; - uint32_t currTime = Sapphire::Util::getTimeSeconds(); + uint64_t currTime = Sapphire::Util::getTimeSeconds(); for( const auto& entry : m_bNpcMap ) { @@ -442,30 +443,26 @@ void Sapphire::Zone::updateBNpcs( int64_t tickCount ) } -bool Sapphire::Zone::update( uint32_t currTime ) +bool Sapphire::Zone::update( uint64_t tickCount ) { - int64_t tickCount = Util::getTimeMs(); - //TODO: this should be moved to a updateWeather call and pulled out of updateSessions bool changedWeather = checkWeather(); - updateSessions( changedWeather ); + updateSessions( tickCount, changedWeather ); updateBNpcs( tickCount ); - onUpdate( currTime ); + onUpdate( tickCount ); updateSpawnPoints(); return true; } -void Sapphire::Zone::updateSessions( bool changedWeather ) +void Sapphire::Zone::updateSessions( uint64_t tickCount, bool changedWeather ) { - auto it = m_sessionSet.begin(); - // update sessions in this zone - for( ; it != m_sessionSet.end(); ) + for( auto it = m_sessionSet.begin(); it != m_sessionSet.end(); ++it ) { - auto pSession = ( *it ); + auto pSession = *it; if( !pSession ) { @@ -484,6 +481,8 @@ void Sapphire::Zone::updateSessions( bool changedWeather ) continue; } + m_lastUpdate = tickCount; + if( changedWeather ) { auto weatherChangePacket = makeZonePacket< FFXIVIpcWeatherChange >( pPlayer->getId() ); @@ -494,7 +493,6 @@ void Sapphire::Zone::updateSessions( bool changedWeather ) // perform session duties pSession->update(); - ++it; } } @@ -702,7 +700,7 @@ void Sapphire::Zone::onLeaveTerritory( Entity::Player& player ) Logger::debug( "Zone::onLeaveTerritory: Zone#{0}|{1}, Entity#{2}", getGuId(), getTerritoryTypeId(), player.getId() ); } -void Sapphire::Zone::onUpdate( uint32_t currTime ) +void Sapphire::Zone::onUpdate( uint64_t tickCount ) { } diff --git a/src/world/Territory/Zone.h b/src/world/Territory/Zone.h index cf0fddfa..bd91d0be 100644 --- a/src/world/Territory/Zone.h +++ b/src/world/Territory/Zone.h @@ -51,6 +51,7 @@ namespace Sapphire std::map< uint8_t, int32_t > m_weatherRateMap; int64_t m_lastMobUpdate; + int64_t m_lastUpdate; FestivalPair m_currentFestival; @@ -101,7 +102,7 @@ namespace Sapphire virtual void onLeaveTerritory( Entity::Player& player ); - virtual void onUpdate( uint32_t currTime ); + virtual void onUpdate( uint64_t tickCount ); virtual void onRegisterEObj( Entity::EventObjectPtr object ) {}; @@ -146,11 +147,11 @@ namespace Sapphire bool loadSpawnGroups(); bool checkWeather(); - void updateBNpcs( int64_t tickCount ); + void updateBNpcs( uint64_t tickCount ); - bool update( uint32_t currTime ); + bool update( uint64_t tickCount ); - void updateSessions( bool changedWeather ); + void updateSessions( uint64_t tickCount, bool changedWeather ); Entity::EventObjectPtr registerEObj( const std::string& name, uint32_t objectId, uint32_t mapLink, uint8_t state, Common::FFXIVARR_POSITION3 pos, float scale, float rotation );