From 1419fc70cba0f3263a15eeac8d58d27dd3af0c69 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 1 Oct 2015 22:22:07 +0300
Subject: Rename some functions in same way like it named in server.
---
src/emap/init.c | 16 ++++++++--------
src/emap/pc.c | 2 +-
src/emap/pc.h | 2 +-
src/emap/script.c | 8 ++++----
src/emap/script.h | 8 ++++----
5 files changed, 18 insertions(+), 18 deletions(-)
(limited to 'src')
diff --git a/src/emap/init.c b/src/emap/init.c
index 2d7e2d2..dd510b9 100644
--- a/src/emap/init.c
+++ b/src/emap/init.c
@@ -177,12 +177,12 @@ HPExport void plugin_init (void)
addHookPre("unit->can_move", eunit_can_move);
addHookPre("unit->walktoxy", eunit_walktoxy);
addHookPre("mail->invalid_operation", email_invalid_operation);
- addHookPre("script->set_reg_npc_num", escript_set_reg_npc_num);
- addHookPre("script->get_val_npc_num", escript_get_val_npcscope_num);
- addHookPre("script->get_val_ref_num", escript_get_val_npcscope_num);
- addHookPre("script->set_reg_npc_str", escript_set_reg_npc_str);
- addHookPre("script->get_val_npc_str", escript_get_val_npcscope_str);
- addHookPre("script->get_val_ref_str", escript_get_val_npcscope_str);
+ addHookPre("script->set_reg_npc_num", eset_reg_npcscope_num);
+ addHookPre("script->get_val_npc_num", eget_val_npcscope_num);
+ addHookPre("script->get_val_ref_num", eget_val_npcscope_num);
+ addHookPre("script->set_reg_npc_str", eset_reg_npcscope_str);
+ addHookPre("script->get_val_npc_str", eget_val_npcscope_str);
+ addHookPre("script->get_val_ref_str", eget_val_npcscope_str);
addHookPre("status->calc_pc_additional", estatus_calc_pc_additional);
addHookPost("clif->getareachar_unit", eclif_getareachar_unit_post);
@@ -197,8 +197,8 @@ HPExport void plugin_init (void)
addHookPost("map->addflooritem", emap_addflooritem_post);
addHookPost("skill->check_condition_castend", eskill_check_condition_castend_post);
addHookPost("pc->additem", epc_additem_post);
- addHookPost("pc->isequip", epc_isuseequip_post);
- addHookPost("pc->isUseitem", epc_isuseequip_post);
+ addHookPost("pc->isequip", epc_isequip_post);
+ addHookPost("pc->isUseitem", epc_isequip_post);
addHookPost("pc->useitem", epc_useitem_post);
addHookPost("pc->equipitem", epc_equipitem_post);
addHookPost("pc->unequipitem", epc_unequipitem_post);
diff --git a/src/emap/pc.c b/src/emap/pc.c
index 2d94eff..9a22d2f 100644
--- a/src/emap/pc.c
+++ b/src/emap/pc.c
@@ -244,7 +244,7 @@ void epc_validate_levels(void)
hookStop();
}
-int epc_isuseequip_post(int retVal, struct map_session_data *sd, int *nPtr)
+int epc_isequip_post(int retVal, struct map_session_data *sd, int *nPtr)
{
const int n = *nPtr;
if (retVal)
diff --git a/src/emap/pc.h b/src/emap/pc.h
index 728e1a1..b524a1d 100644
--- a/src/emap/pc.h
+++ b/src/emap/pc.h
@@ -23,7 +23,7 @@ int epc_takeitem(TBL_PC *sd, TBL_ITEM *fitem);
void epc_validate_levels(void);
-int epc_isuseequip_post(int retVal, struct map_session_data *sd, int *nPtr);
+int epc_isequip_post(int retVal, struct map_session_data *sd, int *nPtr);
int epc_useitem_post(int retVal, struct map_session_data *sd, int *nPtr);
diff --git a/src/emap/script.c b/src/emap/script.c
index d2069eb..2939c1e 100644
--- a/src/emap/script.c
+++ b/src/emap/script.c
@@ -54,7 +54,7 @@
if (!ext) \
return r
-void escript_set_reg_npc_num(struct script_state* st, struct reg_db *n, int64 *num, const char* name, int *val)
+void eset_reg_npcscope_num(struct script_state* st, struct reg_db *n, int64 *num, const char* name, int *val)
{
if (!strcmp(name, ".lang"))
{
@@ -140,7 +140,7 @@ void escript_set_reg_npc_num(struct script_state* st, struct reg_db *n, int64 *n
}
}
-int escript_get_val_npcscope_num(struct script_state* st, struct reg_db *n, struct script_data* data)
+int eget_val_npcscope_num(struct script_state* st, struct reg_db *n, struct script_data* data)
{
const char *name = reference_getname(data);
if (!strcmp(name, ".lang"))
@@ -213,7 +213,7 @@ int escript_get_val_npcscope_num(struct script_state* st, struct reg_db *n, stru
return 0;
}
-void escript_set_reg_npc_str(struct script_state* st, struct reg_db *n, int64 *num, const char* name, const char *str)
+void eset_reg_npcscope_str(struct script_state* st, struct reg_db *n, int64 *num, const char* name, const char *str)
{
if (!strcmp(name, ".map$"))
{
@@ -239,7 +239,7 @@ void escript_set_reg_npc_str(struct script_state* st, struct reg_db *n, int64 *n
}
}
-char *escript_get_val_npcscope_str(struct script_state* st, struct reg_db *n, struct script_data* data)
+char *eget_val_npcscope_str(struct script_state* st, struct reg_db *n, struct script_data* data)
{
const char *name = reference_getname(data);
if (!strcmp(name, ".map$"))
diff --git a/src/emap/script.h b/src/emap/script.h
index 97059df..b8245cd 100644
--- a/src/emap/script.h
+++ b/src/emap/script.h
@@ -4,10 +4,10 @@
#ifndef EVOL_MAP_SCRIPT
#define EVOL_MAP_SCRIPT
-void escript_set_reg_npc_num(struct script_state* st, struct reg_db *n, int64 *num, const char* name, int *val);
-int escript_get_val_npcscope_num(struct script_state* st, struct reg_db *n, struct script_data* data);
-void escript_set_reg_npc_str(struct script_state* st, struct reg_db *n, int64 *num, const char* name, const char *str);
-char *escript_get_val_npcscope_str(struct script_state* st, struct reg_db *n, struct script_data* data);
+void eset_reg_npcscope_num(struct script_state* st, struct reg_db *n, int64 *num, const char* name, int *val);
+int eget_val_npcscope_num(struct script_state* st, struct reg_db *n, struct script_data* data);
+void eset_reg_npcscope_str(struct script_state* st, struct reg_db *n, int64 *num, const char* name, const char *str);
+char *eget_val_npcscope_str(struct script_state* st, struct reg_db *n, struct script_data* data);
BUILDIN(l);
BUILDIN(lg);
--
cgit v1.2.3-70-g09d2