diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-08-15 02:28:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-08-15 02:28:24 +0300 |
| commit | 94df0300da69e3dde9bc05f32137dd90c43040e8 (patch) | |
| tree | 53b540f7483533a281ffb66e0c39765a8f65508a /src/common/mapindex.h | |
| parent | 6795414243a08d47bc111e23c9c0f09218260ccf (diff) | |
| parent | d95f3b14d78305ea48834212684c73086555f74f (diff) | |
| download | hercules-94df0300da69e3dde9bc05f32137dd90c43040e8.tar.gz hercules-94df0300da69e3dde9bc05f32137dd90c43040e8.tar.bz2 hercules-94df0300da69e3dde9bc05f32137dd90c43040e8.tar.xz hercules-94df0300da69e3dde9bc05f32137dd90c43040e8.zip | |
Merge pull request #643 from HerculesWS/hpmfixes_v2
HPM Compatibility Improvements
Diffstat (limited to 'src/common/mapindex.h')
| -rw-r--r-- | src/common/mapindex.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/mapindex.h b/src/common/mapindex.h index c334e7cca..ff19630a1 100644 --- a/src/common/mapindex.h +++ b/src/common/mapindex.h @@ -5,7 +5,7 @@ #ifndef COMMON_MAPINDEX_H #define COMMON_MAPINDEX_H -#include "common/cbasetypes.h" +#include "common/hercules.h" #include "common/db.h" #include "common/mmo.h" @@ -91,14 +91,14 @@ struct mapindex_interface { const char* (*getmapname_ext) (const char* string, char* output); /* TODO: Hello World! make up your mind, this thing is int on some places and unsigned short on others */ unsigned short (*name2id) (const char*); - const char* (*id2name) (unsigned short,const char *file, int line, const char *func); + const char * (*id2name) (uint16 id, const char *file, int line, const char *func); bool (*check_default) (void); }; -struct mapindex_interface *mapindex; - #ifdef HERCULES_CORE void mapindex_defaults(void); #endif // HERCULES_CORE +HPShared struct mapindex_interface *mapindex; + #endif /* COMMON_MAPINDEX_H */ |