summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-08 18:24:10 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-08 18:24:10 +0300
commit537b2bb3510f52eb9ccdee4f98e6061b5878bff0 (patch)
treedeb9ab96f897bb3a77455ad8ece4c64cb2554fb1 /src
parent2053a2d8ff9e822ed61fac8e6fd12513ded633bd (diff)
downloadhercules-537b2bb3510f52eb9ccdee4f98e6061b5878bff0.tar.gz
hercules-537b2bb3510f52eb9ccdee4f98e6061b5878bff0.tar.bz2
hercules-537b2bb3510f52eb9ccdee4f98e6061b5878bff0.tar.xz
hercules-537b2bb3510f52eb9ccdee4f98e6061b5878bff0.zip
Fix hpm issues after rodex commit.
Diffstat (limited to 'src')
-rw-r--r--src/char/int_rodex.c2
-rw-r--r--src/char/mapif.c2
-rw-r--r--src/char/mapif.h2
-rw-r--r--src/plugins/HPMHooking.c2
-rw-r--r--src/plugins/HPMHooking/HPMHooking.Defs.inc4
-rw-r--r--src/plugins/HPMHooking/HPMHooking_char.Hooks.inc14
6 files changed, 13 insertions, 13 deletions
diff --git a/src/char/int_rodex.c b/src/char/int_rodex.c
index 12ab54290..1fa76e4db 100644
--- a/src/char/int_rodex.c
+++ b/src/char/int_rodex.c
@@ -463,7 +463,7 @@ void mapif_parse_rodex_send(int fd)
/*------------------------------------------
* Check Player
*------------------------------------------*/
-void mapif_rodex_checkname(int fd, int reqchar_id, int target_char_id, short target_class, int target_level, char name[NAME_LENGTH])
+void mapif_rodex_checkname(int fd, int reqchar_id, int target_char_id, short target_class, int target_level, char *name)
{
nullpo_retv(name);
Assert_retv(reqchar_id > 0);
diff --git a/src/char/mapif.c b/src/char/mapif.c
index b71171e23..9fccd691b 100644
--- a/src/char/mapif.c
+++ b/src/char/mapif.c
@@ -192,7 +192,7 @@ int mapif_parse_rodex_updatemail(int fd);
int mapif_parse_rodex_send(int fd);
void mapif_rodex_send(int fd, int sender_id, int receiver_id, int receiver_accountid, bool result);
int mapif_parse_rodex_checkname(int fd);
-void mapif_rodex_checkname(int fd, int reqchar_id, int target_char_id, short target_class, int target_level, char name[NAME_LENGTH]);
+void mapif_rodex_checkname(int fd, int reqchar_id, int target_char_id, short target_class, int target_level, char *name);
int mapif_load_guild_storage(int fd,int account_id,int guild_id, char flag);
int mapif_save_guild_storage_ack(int fd, int account_id, int guild_id, int fail);
int mapif_parse_LoadGuildStorage(int fd);
diff --git a/src/char/mapif.h b/src/char/mapif.h
index 353da7ab0..a78940ba2 100644
--- a/src/char/mapif.h
+++ b/src/char/mapif.h
@@ -184,7 +184,7 @@ struct mapif_interface {
int(*parse_rodex_send) (int fd);
void(*rodex_send) (int fd, int sender_id, int receiver_id, int receiver_accountid, bool result);
int(*parse_rodex_checkname) (int fd);
- void(*rodex_checkname) (int fd, int reqchar_id, int target_char_id, short target_class, int target_level, char name[NAME_LENGTH]);
+ void(*rodex_checkname) (int fd, int reqchar_id, int target_char_id, short target_class, int target_level, char *name);
int (*load_guild_storage) (int fd, int account_id, int guild_id, char flag);
int (*save_guild_storage_ack) (int fd, int account_id, int guild_id, int fail);
int (*parse_LoadGuildStorage) (int fd);
diff --git a/src/plugins/HPMHooking.c b/src/plugins/HPMHooking.c
index 0b98ea99f..a5354211d 100644
--- a/src/plugins/HPMHooking.c
+++ b/src/plugins/HPMHooking.c
@@ -52,6 +52,7 @@
#include "char/int_party.h"
#include "char/int_pet.h"
#include "char/int_quest.h"
+#include "char/int_rodex.h"
#include "char/int_storage.h"
#include "char/inter.h"
#include "char/loginif.h"
@@ -91,6 +92,7 @@
#include "map/pc.h"
#include "map/pet.h"
#include "map/quest.h"
+#include "map/rodex.h"
#include "map/script.h"
#include "map/skill.h"
#include "map/status.h"
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index b5ae9b0db..3ec573b6f 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -4472,8 +4472,8 @@ typedef void (*HPMHOOK_pre_mapif_rodex_send) (int *fd, int *sender_id, int *rece
typedef void (*HPMHOOK_post_mapif_rodex_send) (int fd, int sender_id, int receiver_id, int receiver_accountid, bool result);
typedef int (*HPMHOOK_pre_mapif_parse_rodex_checkname) (int *fd);
typedef int (*HPMHOOK_post_mapif_parse_rodex_checkname) (int retVal___, int fd);
-typedef void (*HPMHOOK_pre_mapif_rodex_checkname) (int *fd, int *reqchar_id, int *target_char_id, short *target_class, int *target_level, );
-typedef void (*HPMHOOK_post_mapif_rodex_checkname) (int fd, int reqchar_id, int target_char_id, short target_class, int target_level, );
+typedef void (*HPMHOOK_pre_mapif_rodex_checkname) (int *fd, int *reqchar_id, int *target_char_id, short *target_class, int *target_level, char **name);
+typedef void (*HPMHOOK_post_mapif_rodex_checkname) (int fd, int reqchar_id, int target_char_id, short target_class, int target_level, char *name);
typedef int (*HPMHOOK_pre_mapif_load_guild_storage) (int *fd, int *account_id, int *guild_id, char *flag);
typedef int (*HPMHOOK_post_mapif_load_guild_storage) (int retVal___, int fd, int account_id, int guild_id, char flag);
typedef int (*HPMHOOK_pre_mapif_save_guild_storage_ack) (int *fd, int *account_id, int *guild_id, int *fail);
diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
index b727d208b..a372f83b3 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
@@ -14751,16 +14751,14 @@ int HP_mapif_parse_rodex_checkname(int fd) {
}
return retVal___;
}
-void HP_mapif_rodex_checkname(int fd, int reqchar_id, int target_char_id, short target_class, int target_level, ) {
-/* Error: Unexpected character '+' */
-/* Error: Unhandled var type 'char name[(23+1)]' */
+void HP_mapif_rodex_checkname(int fd, int reqchar_id, int target_char_id, short target_class, int target_level, char *name) {
int hIndex = 0;
if (HPMHooks.count.HP_mapif_rodex_checkname_pre > 0) {
- void (*preHookFunc) (int *fd, int *reqchar_id, int *target_char_id, short *target_class, int *target_level, );
+ void (*preHookFunc) (int *fd, int *reqchar_id, int *target_char_id, short *target_class, int *target_level, char **name);
*HPMforce_return = false;
for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_rodex_checkname_pre; hIndex++) {
preHookFunc = HPMHooks.list.HP_mapif_rodex_checkname_pre[hIndex].func;
- preHookFunc(&fd, &reqchar_id, &target_char_id, &target_class, &target_level, );
+ preHookFunc(&fd, &reqchar_id, &target_char_id, &target_class, &target_level, &name);
}
if (*HPMforce_return) {
*HPMforce_return = false;
@@ -14768,13 +14766,13 @@ void HP_mapif_rodex_checkname(int fd, int reqchar_id, int target_char_id, short
}
}
{
- HPMHooks.source.mapif.rodex_checkname(fd, reqchar_id, target_char_id, target_class, target_level, );
+ HPMHooks.source.mapif.rodex_checkname(fd, reqchar_id, target_char_id, target_class, target_level, name);
}
if (HPMHooks.count.HP_mapif_rodex_checkname_post > 0) {
- void (*postHookFunc) (int fd, int reqchar_id, int target_char_id, short target_class, int target_level, );
+ void (*postHookFunc) (int fd, int reqchar_id, int target_char_id, short target_class, int target_level, char *name);
for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_rodex_checkname_post; hIndex++) {
postHookFunc = HPMHooks.list.HP_mapif_rodex_checkname_post[hIndex].func;
- postHookFunc(fd, reqchar_id, target_char_id, target_class, target_level, );
+ postHookFunc(fd, reqchar_id, target_char_id, target_class, target_level, name);
}
}
return;