diff options
| author | shennetsind <ind@henn.et> | 2014-01-12 16:38:58 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-01-12 16:38:58 -0200 |
| commit | e4c21279a33a810ee80c334a74c422affcdab870 (patch) | |
| tree | a7dab158ca095f82c6814d7c903e222ba90716c6 /src/map/npc.h | |
| parent | d9c1629c753ae756ce32613a76e69b3a03970b8d (diff) | |
| parent | 253e90c67f7ddbbb3ab2f9f68a0d760d059ed797 (diff) | |
| download | hercules-e4c21279a33a810ee80c334a74c422affcdab870.tar.gz hercules-e4c21279a33a810ee80c334a74c422affcdab870.tar.bz2 hercules-e4c21279a33a810ee80c334a74c422affcdab870.tar.xz hercules-e4c21279a33a810ee80c334a74c422affcdab870.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/npc.h')
| -rw-r--r-- | src/map/npc.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/map/npc.h b/src/map/npc.h index a3f07e79c..2f4401bf7 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -46,6 +46,7 @@ struct npc_shop_data { struct npc_item_list *item;/* list */ unsigned short items;/* total */ }; +struct npc_parse; struct npc_data { struct block_list bl; struct unit_data *ud; @@ -67,7 +68,7 @@ struct npc_data { unsigned short level; unsigned short stat_point; - void* chatdb; // pointer to a npc_parse struct (see npc_chat.c) + struct npc_parse *chatdb; char* path;/* path dir */ enum npc_subtype subtype; int src_id; @@ -302,12 +303,6 @@ struct pcrematch_set { /* * Entire data structure hung off a NPC - * - * The reason I have done it this way (a void * in npc_data and then - * this) was to reduce the number of patches that needed to be applied - * to a ragnarok distribution to bring this code online. I - * also wanted people to be able to grab this one file to get updates - * without having to do a large number of changes. */ struct npc_parse { struct pcrematch_set* active; |