From 99faa588ad3a698f5535f2e772c1cb218514289b Mon Sep 17 00:00:00 2001
From: Lemongrass3110 <lemongrass@kstp.at>
Date: Wed, 5 Oct 2022 16:31:03 +0200
Subject: [PATCH] Fixed names of two timer functions (#7319)

Blame it on me in 01f61cfa
---
 src/common/timer.cpp | 6 +++---
 src/common/timer.hpp | 4 ++--
 src/map/pc.cpp       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/timer.cpp b/src/common/timer.cpp
index 763dba584b..1ed67a379d 100644
--- a/src/common/timer.cpp
+++ b/src/common/timer.cpp
@@ -314,14 +314,14 @@ int delete_timer(int tid, TimerFunc func)
 
 /// Adjusts a timer's expiration time.
 /// Returns the new tick value, or -1 if it fails.
-t_tick addt_tickimer(int tid, t_tick tick)
+t_tick addtick_timer(int tid, t_tick tick)
 {
-	return sett_tickimer(tid, timer_data[tid].tick+tick);
+	return settick_timer(tid, timer_data[tid].tick+tick);
 }
 
 /// Modifies a timer's expiration time (an alternative to deleting a timer and starting a new one).
 /// Returns the new tick value, or -1 if it fails.
-t_tick sett_tickimer(int tid, t_tick tick)
+t_tick settick_timer(int tid, t_tick tick)
 {
 	size_t i;
 
diff --git a/src/common/timer.hpp b/src/common/timer.hpp
index 127ddd1b00..5f332647c5 100644
--- a/src/common/timer.hpp
+++ b/src/common/timer.hpp
@@ -56,8 +56,8 @@ int add_timer_interval(t_tick tick, TimerFunc func, int id, intptr_t data, int i
 const struct TimerData* get_timer(int tid);
 int delete_timer(int tid, TimerFunc func);
 
-t_tick addt_tickimer(int tid, t_tick tick);
-t_tick sett_tickimer(int tid, t_tick tick);
+t_tick addtick_timer(int tid, t_tick tick);
+t_tick settick_timer(int tid, t_tick tick);
 
 int add_timer_func_list(TimerFunc func, const char* name);
 
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index 8c427ab1dc..dae7180925 100755
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -11175,7 +11175,7 @@ void pc_addeventtimercount(struct map_session_data *sd,const char *name,int tick
 	for(i=0;i<MAX_EVENTTIMER;i++)
 		if( sd->eventtimer[i] != INVALID_TIMER && strcmp(
 			(char *)(get_timer(sd->eventtimer[i])->data), name)==0 ){
-				addt_tickimer(sd->eventtimer[i],tick);
+				addtick_timer(sd->eventtimer[i],tick);
 				break;
 		}
 }
@@ -14385,7 +14385,7 @@ struct s_bonus_script_entry *pc_bonus_script_add(struct map_session_data *sd, co
 			if (strcmpi(script_str, StringBuf_Value(entry->script_buf)) == 0) {
 				t_tick newdur = gettick() + dur;
 				if (flag&BSF_FORCE_REPLACE && entry->tick < newdur) { // Change duration
-					sett_tickimer(entry->tid, newdur);
+					settick_timer(entry->tid, newdur);
 					script_free_code(script);
 					return NULL;
 				}