From 60a426c0742b3e7d8c5b557c7578df6eeeea377b Mon Sep 17 00:00:00 2001 From: brianluau Date: Wed, 5 Dec 2012 02:53:33 +0000 Subject: - Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924). [16969:16991/trunk/src/] will be re-committed in the next 24 hours. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16992 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.h | 219 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 110 insertions(+), 109 deletions(-) (limited to 'src/map/npc.h') diff --git a/src/map/npc.h b/src/map/npc.h index 6e0fe0ee5..0379ae634 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -13,74 +13,75 @@ struct view_data; struct npc_timerevent_list { - int timer,pos; + int timer,pos; }; struct npc_label_list { - char name[NAME_LENGTH]; - int pos; + char name[NAME_LENGTH]; + int pos; }; struct npc_item_list { - unsigned int nameid,value; + unsigned int nameid,value; }; struct npc_data { - struct block_list bl; - 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 class_; - short speed; - char name[NAME_LENGTH+1];// display name - char exname[NAME_LENGTH+1];// unique npc name - int chat_id; - int touching_id; - unsigned int next_walktime; - - unsigned size : 2; - - void *chatdb; // pointer to a npc_parse struct (see npc_chat.c) - char *path;/* path dir */ - enum npc_subtype subtype; - int src_id; - union { - struct { - struct script_code *script; - short xs,ys; // OnTouch area radius - int guild_id; - int timer,timerid,timeramount,rid; - unsigned int timertick; - struct npc_timerevent_list *timer_event; - int label_list_num; - struct npc_label_list *label_list; - } scr; - struct { - struct npc_item_list *shop_item; - int count; - } shop; - struct { - short xs,ys; // OnTouch area radius - short x,y; // destination coords - unsigned short mapindex; // destination map - } warp; - struct { - struct mob_data *md; - time_t kill_time; - char killer_name[NAME_LENGTH]; - } tomb; - } u; + struct block_list bl; + 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 class_; + short speed; + char name[NAME_LENGTH+1];// display name + char exname[NAME_LENGTH+1];// unique npc name + int chat_id; + int touching_id; + unsigned int next_walktime; + + unsigned size : 2; + + void* chatdb; // pointer to a npc_parse struct (see npc_chat.c) + char* path;/* path dir */ + enum npc_subtype subtype; + int src_id; + union { + struct { + struct script_code *script; + short xs,ys; // OnTouch area radius + int guild_id; + int timer,timerid,timeramount,rid; + unsigned int timertick; + struct npc_timerevent_list *timer_event; + int label_list_num; + struct npc_label_list *label_list; + } scr; + struct { + struct npc_item_list* shop_item; + int count; + } shop; + struct { + short xs,ys; // OnTouch area radius + short x,y; // destination coords + unsigned short mapindex; // destination map + } warp; + struct { + struct mob_data *md; + time_t kill_time; + char killer_name[NAME_LENGTH]; + } tomb; + } u; }; #define START_NPC_NUM 110000000 -enum actor_classes { - WARP_CLASS = 45, - HIDDEN_WARP_CLASS = 139, - WARP_DEBUG_CLASS = 722, - FLAG_CLASS = 722, - INVISIBLE_CLASS = 32767, +enum actor_classes +{ + WARP_CLASS = 45, + HIDDEN_WARP_CLASS = 139, + WARP_DEBUG_CLASS = 722, + FLAG_CLASS = 722, + INVISIBLE_CLASS = 32767, }; #define MAX_NPC_CLASS 1000 @@ -89,91 +90,91 @@ enum actor_classes { #define npcdb_checkid(id) ( ( (id) >= 46 && (id) <= 125) || (id) == HIDDEN_WARP_CLASS || ( (id) > 400 && (id) < MAX_NPC_CLASS ) || (id) == INVISIBLE_CLASS ) #ifdef PCRE_SUPPORT -void npc_chat_finalize(struct npc_data *nd); +void npc_chat_finalize(struct npc_data* nd); #endif //Script NPC events. enum npce_event { - NPCE_LOGIN, - NPCE_LOGOUT, - NPCE_LOADMAP, - NPCE_BASELVUP, - NPCE_JOBLVUP, - NPCE_DIE, - NPCE_KILLPC, - NPCE_KILLNPC, - NPCE_MAX + NPCE_LOGIN, + NPCE_LOGOUT, + NPCE_LOADMAP, + NPCE_BASELVUP, + NPCE_JOBLVUP, + NPCE_DIE, + NPCE_KILLPC, + NPCE_KILLNPC, + NPCE_MAX }; -struct view_data *npc_get_viewdata(int class_); -int npc_chat_sub(struct block_list *bl, va_list ap); -int npc_event_dequeue(struct map_session_data *sd); -int npc_event(struct map_session_data *sd, const char *eventname, int ontouch); -int npc_touch_areanpc(struct map_session_data *sd, int m, int x, int y); +struct view_data* npc_get_viewdata(int class_); +int npc_chat_sub(struct block_list* bl, va_list ap); +int npc_event_dequeue(struct map_session_data* sd); +int npc_event(struct map_session_data* sd, const char* eventname, int ontouch); +int npc_touch_areanpc(struct map_session_data* sd, int m, int x, int y); int npc_touch_areanpc2(struct mob_data *md); // [Skotlex] int npc_check_areanpc(int flag, int m, int x, int y, int range); -int npc_touchnext_areanpc(struct map_session_data *sd,bool leavemap); -int npc_click(struct map_session_data *sd, struct npc_data *nd); -int npc_scriptcont(struct map_session_data *sd, int id); -struct npc_data *npc_checknear(struct map_session_data *sd, struct block_list *bl); -int npc_buysellsel(struct map_session_data *sd, int id, int type); -int npc_buylist(struct map_session_data *sd,int n, unsigned short *item_list); -int npc_selllist(struct map_session_data *sd, int n, unsigned short *item_list); -void npc_parse_mob2(struct spawn_data *mob); -struct npc_data *npc_add_warp(char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y); -int npc_globalmessage(const char *name,const char *mes); - -void npc_setcells(struct npc_data *nd); -void npc_unsetcells(struct npc_data *nd); -void npc_movenpc(struct npc_data *nd, int x, int y); -int npc_enable(const char *name, int flag); -void npc_setdisplayname(struct npc_data *nd, const char *newname); -void npc_setclass(struct npc_data *nd, short class_); -struct npc_data *npc_name2id(const char *name); +int npc_touchnext_areanpc(struct map_session_data* sd,bool leavemap); +int npc_click(struct map_session_data* sd, struct npc_data* nd); +int npc_scriptcont(struct map_session_data* sd, int id); +struct npc_data* npc_checknear(struct map_session_data* sd, struct block_list* bl); +int npc_buysellsel(struct map_session_data* sd, int id, int type); +int npc_buylist(struct map_session_data* sd,int n, unsigned short* item_list); +int npc_selllist(struct map_session_data* sd, int n, unsigned short* item_list); +void npc_parse_mob2(struct spawn_data* mob); +struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y); +int npc_globalmessage(const char* name,const char* mes); + +void npc_setcells(struct npc_data* nd); +void npc_unsetcells(struct npc_data* nd); +void npc_movenpc(struct npc_data* nd, int x, int y); +int npc_enable(const char* name, int flag); +void npc_setdisplayname(struct npc_data* nd, const char* newname); +void npc_setclass(struct npc_data* nd, short class_); +struct npc_data* npc_name2id(const char* name); int npc_get_new_npc_id(void); -void npc_addsrcfile(const char *name); -void npc_delsrcfile(const char *name); -void npc_parsesrcfile(const char *filepath, bool runOnInit); +void npc_addsrcfile(const char* name); +void npc_delsrcfile(const char* name); +void npc_parsesrcfile(const char* filepath, bool runOnInit); void do_clear_npc(void); int do_final_npc(void); int do_init_npc(void); void npc_event_do_oninit(void); int npc_do_ontimer(int npc_id, int option); -int npc_event_do(const char *name); -int npc_event_doall(const char *name); -int npc_event_doall_id(const char *name, int rid); - -int npc_timerevent_start(struct npc_data *nd, int rid); -int npc_timerevent_stop(struct npc_data *nd); -void npc_timerevent_quit(struct map_session_data *sd); -int npc_gettimerevent_tick(struct npc_data *nd); -int npc_settimerevent_tick(struct npc_data *nd, int newtimer); -int npc_remove_map(struct npc_data *nd); -void npc_unload_duplicates(struct npc_data *nd); -int npc_unload(struct npc_data *nd, bool single); +int npc_event_do(const char* name); +int npc_event_doall(const char* name); +int npc_event_doall_id(const char* name, int rid); + +int npc_timerevent_start(struct npc_data* nd, int rid); +int npc_timerevent_stop(struct npc_data* nd); +void npc_timerevent_quit(struct map_session_data* sd); +int npc_gettimerevent_tick(struct npc_data* nd); +int npc_settimerevent_tick(struct npc_data* nd, int newtimer); +int npc_remove_map(struct npc_data* nd); +void npc_unload_duplicates (struct npc_data* nd); +int npc_unload(struct npc_data* nd, bool single); int npc_reload(void); void npc_read_event_script(void); -int npc_script_event(struct map_session_data *sd, enum npce_event type); +int npc_script_event(struct map_session_data* sd, enum npce_event type); int npc_duplicate4instance(struct npc_data *snd, int m); int npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int points); -extern struct npc_data *fake_nd; +extern struct npc_data* fake_nd; -int npc_cashshop_buylist(struct map_session_data *sd, int points, int count, unsigned short *item_list); +int npc_cashshop_buylist(struct map_session_data *sd, int points, int count, unsigned short* item_list); /** * For the Secure NPC Timeout option (check config/Secure.h) [RR] **/ #if SECURE_NPCTIMEOUT -int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t data); + int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t data); #endif // @commands (script-based) -int npc_do_atcmd_event(struct map_session_data *sd, const char *command, const char *message, const char *eventname); +int npc_do_atcmd_event(struct map_session_data* sd, const char* command, const char* message, const char* eventname); -bool npc_unloadfile(const char *path); +bool npc_unloadfile( const char* path ); #endif /* _NPC_H_ */ -- cgit v1.2.3-70-g09d2