summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/echar/char.c2
-rw-r--r--src/echar/char.h2
-rw-r--r--src/echar/init.c2
-rw-r--r--src/emap/init.c4
-rw-r--r--src/emap/pc.c14
-rw-r--r--src/emap/pc.h6
-rw-r--r--src/emap/status.c6
-rw-r--r--src/emap/status.h2
8 files changed, 18 insertions, 20 deletions
diff --git a/src/echar/char.c b/src/echar/char.c
index 61bfc9e..28cc7c9 100644
--- a/src/echar/char.c
+++ b/src/echar/char.c
@@ -196,7 +196,7 @@ void echar_mmo_char_send099d(int *fdPtr, struct char_session_data *sd)
send_additional_slots(*fdPtr, sd);
}
-int echar_mmo_char_send_characters(int retVal, int *fdPtr, struct char_session_data* sd)
+int echar_mmo_char_send_characters_post(int retVal, int *fdPtr, struct char_session_data* sd)
{
send_additional_slots(*fdPtr, sd);
return retVal;
diff --git a/src/echar/char.h b/src/echar/char.h
index c8b05fa..d0873cb 100644
--- a/src/echar/char.h
+++ b/src/echar/char.h
@@ -22,8 +22,6 @@ int echar_mmo_chars_fromsql(struct char_session_data* sd, uint8* buf);
void echar_mmo_char_send099d(int *fdPtr, struct char_session_data *sd);
-int echar_mmo_char_send_characters(int retVal, int *fdPtr, struct char_session_data* sd);
-
void send_additional_slots(int fd, struct char_session_data* sd);
void echar_parse_char_connect_pre(int *fdPtr, struct char_session_data *sd, uint32 *ipl);
diff --git a/src/echar/init.c b/src/echar/init.c
index 0a3c988..16eb493 100644
--- a/src/echar/init.c
+++ b/src/echar/init.c
@@ -55,7 +55,7 @@ HPExport void plugin_init (void)
addHookPre("chr->parse_char_connect", echar_parse_char_connect_pre);
addHookPost("chr->mmo_char_send099d", echar_mmo_char_send099d);
- addHookPost("chr->mmo_char_send_characters", echar_mmo_char_send_characters);
+ addHookPost("chr->mmo_char_send_characters", echar_mmo_char_send_characters_post);
addHookPost("chr->parse_char_connect", echar_parse_char_connect_post);
}
diff --git a/src/emap/init.c b/src/emap/init.c
index dd510b9..09f3c1e 100644
--- a/src/emap/init.c
+++ b/src/emap/init.c
@@ -191,7 +191,7 @@ HPExport void plugin_init (void)
addHookPost("clif->set_unit_idle", eclif_set_unit_idle_post);
addHookPost("status->set_viewdata", estatus_set_viewdata_post);
addHookPost("status->read_job_db_sub", estatus_read_job_db_sub);
- addHookPost("status->calc_pc_", estatus_calc_pc_);
+ addHookPost("status->calc_pc_", estatus_calc_pc__post);
addHookPost("clif->set_unit_walking", eclif_set_unit_walking);
addHookPost("clif->move", eclif_move);
addHookPost("map->addflooritem", emap_addflooritem_post);
@@ -202,7 +202,7 @@ HPExport void plugin_init (void)
addHookPost("pc->useitem", epc_useitem_post);
addHookPost("pc->equipitem", epc_equipitem_post);
addHookPost("pc->unequipitem", epc_unequipitem_post);
- addHookPost("pc->setnewpc", epc_setnewpc);
+ addHookPost("pc->setnewpc", epc_setnewpc_post);
addHookPost("pc->delitem", epc_delitem_post);
addHookPost("pc->can_insert_card_into", epc_can_insert_card_into_post);
diff --git a/src/emap/pc.c b/src/emap/pc.c
index 9a22d2f..c4db70b 100644
--- a/src/emap/pc.c
+++ b/src/emap/pc.c
@@ -348,13 +348,13 @@ int epc_check_job_name(const char *name)
return -1;
}
-int epc_setnewpc(int retVal, struct map_session_data *sd,
- int *account_id __attribute__ ((unused)),
- int *char_id __attribute__ ((unused)),
- int *login_id1 __attribute__ ((unused)),
- unsigned int *client_tick __attribute__ ((unused)),
- int *sex __attribute__ ((unused)),
- int *fd __attribute__ ((unused)))
+int epc_setnewpc_post(int retVal, struct map_session_data *sd,
+ int *account_id __attribute__ ((unused)),
+ int *char_id __attribute__ ((unused)),
+ int *login_id1 __attribute__ ((unused)),
+ unsigned int *client_tick __attribute__ ((unused)),
+ int *sex __attribute__ ((unused)),
+ int *fd __attribute__ ((unused)))
{
if (sd)
{
diff --git a/src/emap/pc.h b/src/emap/pc.h
index b524a1d..8921d4e 100644
--- a/src/emap/pc.h
+++ b/src/emap/pc.h
@@ -35,9 +35,9 @@ int epc_unequipitem_post(int retVal, struct map_session_data *sd,
int epc_check_job_name(const char *name);
-int epc_setnewpc(int retVal, struct map_session_data *sd,
- int *account_id, int *char_id, int *login_id1,
- unsigned int *client_tick, int *sex, int *fd);
+int epc_setnewpc_post(int retVal, struct map_session_data *sd,
+ int *account_id, int *char_id, int *login_id1,
+ unsigned int *client_tick, int *sex, int *fd);
int epc_additem_post(int retVal, struct map_session_data *sd,
struct item *item_data, int *amountPtr,
diff --git a/src/emap/status.c b/src/emap/status.c
index 0422221..bc3f0e3 100644
--- a/src/emap/status.c
+++ b/src/emap/status.c
@@ -58,9 +58,9 @@ void estatus_read_job_db_sub(int *idxPtr,
class_move_speed[idx] = i32;
}
-int estatus_calc_pc_(int retVal,
- struct map_session_data *sd,
- enum e_status_calc_opt *opt __attribute__ ((unused)))
+int estatus_calc_pc__post(int retVal,
+ struct map_session_data *sd,
+ enum e_status_calc_opt *opt __attribute__ ((unused)))
{
if (!sd)
return retVal;
diff --git a/src/emap/status.h b/src/emap/status.h
index 7aaa671..e18a3da 100644
--- a/src/emap/status.h
+++ b/src/emap/status.h
@@ -7,7 +7,7 @@
void status_init(void);
void estatus_set_viewdata_post(struct block_list *bl, int *class_);
void estatus_read_job_db_sub(int *idxPtr, const char *name, config_setting_t *jdb);
-int estatus_calc_pc_(int retVal, struct map_session_data* sd, enum e_status_calc_opt *opt);
+int estatus_calc_pc__post(int retVal, struct map_session_data* sd, enum e_status_calc_opt *opt);
int estatus_calc_pc_additional(struct map_session_data* sd, enum e_status_calc_opt *opt);
#endif // EVOL_MAP_STATUS