summaryrefslogtreecommitdiff
path: root/src/map/map.h
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-21 13:29:45 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-21 13:29:45 +0000
commitc2ca8110f6a3cab0171d32920b7a724d0c180068 (patch)
treecce3f3a36fd692a9c7d87963ef4b14dd9c57103b /src/map/map.h
parentedaa6dcc93fd64bd961fcbc701e7ce16bf31a350 (diff)
downloadhercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.tar.gz
hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.tar.bz2
hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.tar.xz
hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.zip
- Moved subtype from struct block_list to struct npc_data.
- Fixed some compilation warnings. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11772 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
-rw-r--r--src/map/map.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/map.h b/src/map/map.h
index 4258b3cb8..6f3b27c2b 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -189,7 +189,7 @@ enum bl_type {
#define BL_CHAR (BL_PC|BL_MOB|BL_HOM)
#define BL_ALL 0xfff
-enum bl_subtype { WARP, SHOP, SCRIPT, MONS };
+enum npc_subtype { WARP, SHOP, SCRIPT };
enum {
RC_FORMLESS=0,
@@ -233,7 +233,6 @@ struct block_list {
int id;
short m,x,y;
enum bl_type type;
- enum bl_subtype subtype;
};
struct walkpath_data {
@@ -824,6 +823,7 @@ struct npc_data {
struct unit_data ud; //Because they need to be able to move....
struct view_data *vd;
struct status_change sc; //They can't have status changes, but.. they want the visual opt values.
+ struct npc_data *master_nd;
short n;
short class_;
short speed;
@@ -833,8 +833,7 @@ struct npc_data {
unsigned int next_walktime;
void* chatdb; // pointer to a npc_parse struct (see npc_chat.c)
- struct npc_data *master_nd;
-
+ enum npc_subtype subtype;
union {
struct {
struct script_code *script;