diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-13 16:25:50 -0800 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-14 16:18:22 -0800 |
commit | 069f39e8a1ebee3e4a4ce8302d0099842876782b (patch) | |
tree | 57d8de5f57d65878f8ef560e2884b9dee08e9323 /src/map/npc.hpp | |
parent | f9563edf69f083287630f4b17db70d97524196d6 (diff) | |
download | tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.gz tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.bz2 tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.tar.xz tmwa-069f39e8a1ebee3e4a4ce8302d0099842876782b.zip |
Some formatting fixes before I go insane
Also delete the French translation from ladmin.
Diffstat (limited to 'src/map/npc.hpp')
-rw-r--r-- | src/map/npc.hpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/map/npc.hpp b/src/map/npc.hpp index 6204316..cea585b 100644 --- a/src/map/npc.hpp +++ b/src/map/npc.hpp @@ -8,57 +8,57 @@ #define WARP_DEBUG_CLASS 722 #define INVISIBLE_CLASS 32767 -int npc_event_dequeue (struct map_session_data *sd); -void npc_event_timer (timer_id, tick_t, custom_id_t, custom_data_t); -int npc_event (struct map_session_data *sd, const char *npcname, int); -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_click (struct map_session_data *, int); -int npc_scriptcont (struct map_session_data *, int); -int npc_checknear (struct map_session_data *, int); -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 (const char *w1, const char *w2, const char *w3, const char *w4); -int npc_parse_warp (const char *w1, const char *w2, const char *w3, const char *w4); +int npc_event_dequeue(struct map_session_data *sd); +void npc_event_timer(timer_id, tick_t, custom_id_t, custom_data_t); +int npc_event(struct map_session_data *sd, const char *npcname, int); +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_click(struct map_session_data *, int); +int npc_scriptcont(struct map_session_data *, int); +int npc_checknear(struct map_session_data *, int); +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(const char *w1, const char *w2, const char *w3, const char *w4); +int npc_parse_warp(const char *w1, const char *w2, const char *w3, const char *w4); -int npc_enable (const char *name, int flag); -struct npc_data *npc_name2id (const char *name); +int npc_enable(const char *name, int flag); +struct npc_data *npc_name2id(const char *name); -int npc_get_new_npc_id (void); +int npc_get_new_npc_id(void); /** * Spawns and installs a talk-only NPC * * \param message The message to speak. If message is NULL, the NPC will not do anything at all. */ -struct npc_data *npc_spawn_text (int m, int x, int y, int class_, const char *name, const char *message); // message is strdup'd within +struct npc_data *npc_spawn_text(int m, int x, int y, int class_, const char *name, const char *message); // message is strdup'd within /** * Uninstalls and frees an NPC */ -void npc_free (struct npc_data *npc); +void npc_free(struct npc_data *npc); -void npc_addsrcfile (char *); -void npc_delsrcfile (char *); -int do_final_npc (void); -int do_init_npc (void); -int npc_event_do_oninit (void); -int npc_do_ontimer (int, struct map_session_data *, int); +void npc_addsrcfile(char *); +void npc_delsrcfile(char *); +int do_final_npc(void); +int do_init_npc(void); +int npc_event_do_oninit(void); +int npc_do_ontimer(int, struct map_session_data *, int); struct argrec; -int npc_event_doall_l (const char *name, int rid, int argc, +int npc_event_doall_l(const char *name, int rid, int argc, struct argrec *argv); -int npc_event_do_l (const char *name, int rid, int argc, +int npc_event_do_l(const char *name, int rid, int argc, struct argrec *argv); #define npc_event_doall(name) npc_event_doall_l(name, 0, 0, NULL) #define npc_event_do(name) npc_event_do_l(name, 0, 0, NULL) -int npc_timerevent_start (struct npc_data *nd); -int npc_timerevent_stop (struct npc_data *nd); -int npc_gettimerevent_tick (struct npc_data *nd); -int npc_settimerevent_tick (struct npc_data *nd, int newtimer); -int npc_delete (struct npc_data *nd); +int npc_timerevent_start(struct npc_data *nd); +int npc_timerevent_stop(struct npc_data *nd); +int npc_gettimerevent_tick(struct npc_data *nd); +int npc_settimerevent_tick(struct npc_data *nd, int newtimer); +int npc_delete(struct npc_data *nd); #endif |