summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-12-03 04:20:55 +0100
committerHaru <haru@dotalux.com>2016-12-03 15:38:58 +0100
commitc1b4b0b2fb1066087e928e9440b40edd185b188e (patch)
tree61fb624792d54db3668601df7f95f03eb30d8baf /src/map/npc.c
parenta222f21b459eb6abc0862695526c1d15361a99e0 (diff)
downloadhercules-c1b4b0b2fb1066087e928e9440b40edd185b188e.tar.gz
hercules-c1b4b0b2fb1066087e928e9440b40edd185b188e.tar.bz2
hercules-c1b4b0b2fb1066087e928e9440b40edd185b188e.tar.xz
hercules-c1b4b0b2fb1066087e928e9440b40edd185b188e.zip
Remove the platform-dependent variables from struct status_data
`struct status_data::class_` was platform dependent since c30bb75ec50624429bff7b4106db4be0fda366d6 in order to silence some compile warnings (uint32 on 64 bit builds and uint16 on 32 bit builds). It's now been changed to the correct type, int32, on all platforms. Since the change has potential to silently break third party code, the variable was renamed to `class`. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 72c451ef9..a824d4216 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -4961,11 +4961,11 @@ int do_init_npc(bool minimal) {
//Stock view data for normal npcs.
memset(&npc_viewdb, 0, sizeof(npc_viewdb));
- npc_viewdb[0].class_ = INVISIBLE_CLASS; //Invisible class is stored here.
+ npc_viewdb[0].class = INVISIBLE_CLASS; //Invisible class is stored here.
for( i = 1; i < MAX_NPC_CLASS; i++ )
- npc_viewdb[i].class_ = i;
+ npc_viewdb[i].class = i;
for( i = MAX_NPC_CLASS2_START; i < MAX_NPC_CLASS2_END; i++ )
- npc_viewdb2[i - MAX_NPC_CLASS2_START].class_ = i;
+ npc_viewdb2[i - MAX_NPC_CLASS2_START].class = i;
npc->ev_db = strdb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA, EVENT_NAME_LENGTH);
npc->ev_label_db = strdb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA, NAME_LENGTH);