diff options
| author | Haru <haru@dotalux.com> | 2018-07-23 01:04:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 01:04:25 +0200 |
| commit | be3209bc5ff1b88314c47a6fdc53d73deaa9e96a (patch) | |
| tree | a12e7ac7b7e6ae8410ba170d345a3022da0e51a5 /src/map/map.h | |
| parent | bcaf5eaa9c8ef65068ab5468d7bd13e2df516cab (diff) | |
| parent | 6c73aa1b03b04d4d9a2ba9056b8583475856da12 (diff) | |
| download | hercules-be3209bc5ff1b88314c47a6fdc53d73deaa9e96a.tar.gz hercules-be3209bc5ff1b88314c47a6fdc53d73deaa9e96a.tar.bz2 hercules-be3209bc5ff1b88314c47a6fdc53d73deaa9e96a.tar.xz hercules-be3209bc5ff1b88314c47a6fdc53d73deaa9e96a.zip | |
Merge pull request #2134 from 4144/itemint
Update int fields to using int32
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/map.h b/src/map/map.h index 494f93cfe..e346e72ba 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -714,7 +714,7 @@ enum map_zone_skill_subtype { }; struct map_zone_disabled_skill_entry { - unsigned short nameid; + int nameid; enum bl_type type; enum map_zone_skill_subtype subtype; }; @@ -724,7 +724,7 @@ struct map_zone_disabled_command_entry { }; struct map_zone_skill_damage_cap_entry { - unsigned short nameid; + int nameid; unsigned int cap; enum bl_type type; enum map_zone_skill_subtype subtype; @@ -1342,7 +1342,7 @@ END_ZEROED_BLOCK; int (*sql_init) (void); int (*sql_close) (void); bool (*zone_mf_cache) (int m, char *flag, char *params); - unsigned short (*zone_str2itemid) (const char *name); + int (*zone_str2itemid) (const char *name); unsigned short (*zone_str2skillid) (const char *name); enum bl_type (*zone_bl_type) (const char *entry, enum map_zone_skill_subtype *subtype); void (*read_zone_db) (void); |