diff options
author | Jesusaves <cpntb1@ymail.com> | 2021-04-10 17:39:36 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2021-04-10 17:39:36 -0300 |
commit | 8f15ef24a574284482ea76311237c39e136aa18b (patch) | |
tree | f4ad9f91b430029614a765d537ed20d5e58f2bd2 | |
parent | c46f9692a9ee4c4db500dd4806d5ad3fb0fa5d92 (diff) | |
download | serverdata-8f15ef24a574284482ea76311237c39e136aa18b.tar.gz serverdata-8f15ef24a574284482ea76311237c39e136aa18b.tar.bz2 serverdata-8f15ef24a574284482ea76311237c39e136aa18b.tar.xz serverdata-8f15ef24a574284482ea76311237c39e136aa18b.zip |
Remove ClearGlobalVars() - no longer needed
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | npc/functions/clear_vars.txt | 60 | ||||
-rw-r--r-- | npc/functions/global_event_handler.txt | 5 |
3 files changed, 1 insertions, 66 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e7db09f..e3eb4210 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ mariadb_run_latest_gcc10: needs: [] script: - export CC=gcc-7 - #- export HERCCPPFLAGS=" -Wno-format-overflow" + - export HERCCPPFLAGS=" -Wno-format-overflow" - export ASAN_OPTIONS=detect_stack_use_after_return=true:strict_init_order=true:detect_odr_violation=0 - ./.tools/jobs/install.sh "mysql-client-5.7 gcc-7 diff --git a/npc/functions/clear_vars.txt b/npc/functions/clear_vars.txt index 35c05a4c..61268afd 100644 --- a/npc/functions/clear_vars.txt +++ b/npc/functions/clear_vars.txt @@ -15,63 +15,3 @@ function script ClearVariables { } -function script ClearGlobalVars { - $@loop = 5; - goto L_FluffyClear; - -L_FluffyClear: - if ($@loop == 12) - goto L_IlliaClear; - - $Record_Fluffy_Name$[$@loop] = ""; - $Record_Fluffy_Date$[$@loop] = ""; - $Record_Fluffy_Kills[$@loop] = 0; - - $@loop = $@loop + 1; - goto L_FluffyClear; - - -L_IlliaClear: - $@loop = 0; - goto L_IlliaLoop; - -L_IlliaLoop: - if ($Illia_Win_Records$[$@loop] == "") - goto L_EventClear; - - $Illia_Win_Records$[$@loop] = ""; - - $@loop = $@loop + 1; - goto L_IlliaLoop; - -L_EventClear: - $@loop = 0; - - $CandyOpsComplete = 0; - - $Easter_2010_Npc_State1 = 0; - $Easter_2010_Npc_State2 = 0; - $Easter_2010_Egg_Loc_State1 = 0; - $Easter_2010_Egg_Loc_State2 = 0; - $Easter_2010_Egg_Loc_State3 = 0; - $Easter_2010_Egg_Loc_State4 = 0; - $Easter_2010_Egg_Loc_State5 = 0; - - $hween10 = 0; - $hween10_tondel = 0; - $hween10_mmallow = 0; - $hween10_jelskul = 0; - $hween10_canpump = 0; - - $Golbenez_Inn_Cost = 0; - - $hween16 = 0; - $hween16_tondel = 0; - $hween16_mmallow = 0; - $hween16_jelskul = 0; - $hween16_canpump = 0; - - $state = 0; - return; -} - diff --git a/npc/functions/global_event_handler.txt b/npc/functions/global_event_handler.txt index 80a0643c..75a2fabc 100644 --- a/npc/functions/global_event_handler.txt +++ b/npc/functions/global_event_handler.txt @@ -7,7 +7,6 @@ OnPCLoginEvent: //callfunc "fixHeadStyles"; // convert headstyles //callfunc "ClearVariables"; // removes / converts old variables callfunc "DisplayMOTD"; // send the motd to the client, if enabled - //addtimer 0, "Magic Timer::OnLogin"; // prevent cast rate abuse // add more here @login_event = 2; end; @@ -21,15 +20,11 @@ OnMobKillEvent: end; OnPCDieEvent: - callfunc "fightclub_GoBack"; // this used by the battle master - //callfunc "fightclub_event_die"; // this is used by the 1v1 arena @necromancer = 0; - //addtimer 0, "Magic Timer::OnClear"; // reset magic block on death set @killerrid, 0; // reset killer rid end; OnInit: - callfunc "ClearGlobalVars"; callfunc "MOTD"; // set the MOTD array end; } |