diff options
| author | Matias <matiassw@gmail.com> | 2013-06-25 16:59:44 -0400 |
|---|---|---|
| committer | Matias <matiassw@gmail.com> | 2013-06-25 16:59:44 -0400 |
| commit | b40371d3a0772031d12f2782c10976413c6f34b9 (patch) | |
| tree | 7aeed5544a9df524a834cc739d3f596b66d6a006 /src/map/npc.h | |
| parent | 25914bae30eced388cf8640eead19fbb11a65ade (diff) | |
| parent | 5785dbae3f513da20611e3147dadef2b9c911443 (diff) | |
| download | hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.gz hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.bz2 hercules-b40371d3a0772031d12f2782c10976413c6f34b9.tar.xz hercules-b40371d3a0772031d12f2782c10976413c6f34b9.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/npc.h')
| -rw-r--r-- | src/map/npc.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/map/npc.h b/src/map/npc.h index 8a8b14d6e..16e6fe74c 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -12,6 +12,7 @@ struct block_list; struct npc_data; struct view_data; +struct unit_data npc_base_ud; struct npc_timerevent_list { int timer,pos; @@ -26,9 +27,9 @@ struct npc_item_list { struct npc_data { struct block_list bl; - struct unit_data ud; //Because they need to be able to move.... + struct unit_data *ud; struct view_data *vd; - struct status_change sc; //They can't have status changes, but.. they want the visual opt values. + unsigned int option; struct npc_data *master_nd; short class_; short speed; @@ -37,12 +38,13 @@ struct npc_data { int chat_id; int touching_id; unsigned int next_walktime; - + uint8 dir; + unsigned size : 2; struct status_data status; - unsigned int level; - unsigned int stat_point; + unsigned short level; + unsigned short stat_point; void* chatdb; // pointer to a npc_parse struct (see npc_chat.c) char* path;/* path dir */ |