Reformatting, warning fixes, unsigned char removal

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10618 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 38 insertions, 38 deletions

diff --git a/src/map/npc.h b/src/map/npc.h
index 0ef12de7f..74d49dd3c 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -17,8 +17,8 @@
 #define npcdb_checkid(id) ((id >=  46 && id <= 125) || id == 139 || (id >= 700 && id <= MAX_NPC_CLASS) || id == INVISIBLE_CLASS)
 
 #ifdef PCRE_SUPPORT
-void npc_chat_finalize(struct npc_data *nd);
-int mob_chat_sub(struct block_list *bl, va_list ap);
+void npc_chat_finalize(struct npc_data* nd);
+int mob_chat_sub(struct block_list* bl, va_list ap);
 #endif
 
 //Script NPC events.
@@ -34,32 +34,32 @@ enum {
 	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_timer(int tid,unsigned int tick,int id,int data);
-int npc_event(struct map_session_data *sd, const unsigned char *eventname, int mob_kill);
-int npc_timer_event(const unsigned char *eventname);				// Added by RoVeRT
+int npc_chat_sub(struct block_list* bl, va_list ap);
+int npc_event_dequeue(struct map_session_data* sd);
+int npc_event_timer(int tid,unsigned int tick, int id, int data);
+int npc_event(struct map_session_data* sd, const char* eventname, int mob_kill);
+int npc_timer_event(const char* eventname); // Added by RoVeRT
 int npc_command(struct map_session_data* sd, const char* npcname, const char* command);
-int npc_touch_areanpc(struct map_session_data *,int,int,int);
-int npc_touch_areanpc2(struct block_list *bl); // [Skotlex]
-int npc_check_areanpc(int flag,int m,int x,int y,int range);
-int npc_click(struct map_session_data *sd,struct npc_data *nd);
-int npc_scriptcont(struct map_session_data *,int);
-TBL_NPC *npc_checknear(struct map_session_data *sd,struct block_list *bl);
-int npc_checknear2(struct map_session_data *sd,struct block_list *bl);
-int npc_buysellsel(struct map_session_data *,int,int);
-int npc_buylist(struct map_session_data *,int,unsigned short *);
-int npc_selllist(struct map_session_data *,int,unsigned short *);
-int npc_parse_mob(char *w1,char *w2,char *w3,char *w4);
-int npc_parse_mob2 (struct spawn_data*, int index); // [Wizputer]
-int npc_parse_warp(char *w1,char *w2,char *w3,char *w4);
-int npc_globalmessage(const char *name,const char *mes);
+int npc_touch_areanpc(struct map_session_data* sd, int m, int x, int y);
+int npc_touch_areanpc2(struct block_list* bl); // [Skotlex]
+int npc_check_areanpc(int flag, int m, int x, int y, int range);
+int npc_click(struct map_session_data* sd, struct npc_data* nd);
+int npc_scriptcont(struct map_session_data* sd, int id);
+TBL_NPC* npc_checknear(struct map_session_data* sd, struct block_list* bl);
+int npc_checknear2(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);
+int npc_parse_mob(char* w1, char* w2, char* w3, char* w4);
+int npc_parse_mob2(struct spawn_data* mob, int index); // [Wizputer]
+int npc_parse_warp(char* w1,char* w2,char* w3,char* w4);
+int npc_globalmessage(const char* name,const char* mes);
 
-void npc_setcells(struct npc_data *nd);
-void npc_movenpc(struct npc_data *nd, int x, int y);
-int npc_enable(const char *name,int flag);
-int npc_changename(const char *name, const char *newname, short look); // [Lance]
-struct npc_data* npc_name2id(const char *name);
+void npc_setcells(struct npc_data* nd);
+void npc_movenpc(struct npc_data* nd, int x, int y);
+int npc_enable(const char* name, int flag);
+int npc_changename(const char* name, const char* newname, short look); // [Lance]
+struct npc_data* npc_name2id(const char* name);
 
 int npc_get_new_npc_id(void);
 
@@ -69,20 +69,20 @@ void npc_parsesrcfile(const char* name);
 int do_final_npc(void);
 int do_init_npc(void);
 int npc_event_do_oninit(void);
-int npc_do_ontimer(int,int);
+int npc_do_ontimer(int npc_id, int option);
 
-int npc_event_doall(const unsigned char *name);
-int npc_event_do(const unsigned char *name);
-int npc_event_doall_id(const unsigned char *name, int id);
+int npc_event_doall(const char* name);
+int npc_event_do(const char* name);
+int npc_event_doall_id(const char* name, int id);
 
-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);
+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);
 int npc_reload(void);
 void npc_read_event_script(void);
 int npc_script_event(TBL_PC* sd, int type);