summaryrefslogtreecommitdiff
path: root/src/map/npc.hpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2012-08-30 17:37:27 -0700
committerBen Longbons <b.r.longbons@gmail.com>2012-09-03 16:23:10 -0700
commit31544d2b6973931be7fdec898ea3672bea831de2 (patch)
treedcf946429b406f39297404be662b0a840094e477 /src/map/npc.hpp
parent41974ae5265fbc23a06f276f9e008d5dad020e0b (diff)
downloadtmwa-31544d2b6973931be7fdec898ea3672bea831de2.tar.gz
tmwa-31544d2b6973931be7fdec898ea3672bea831de2.tar.bz2
tmwa-31544d2b6973931be7fdec898ea3672bea831de2.tar.xz
tmwa-31544d2b6973931be7fdec898ea3672bea831de2.zip
Fix compiler errors of C++ conversion
Diffstat (limited to 'src/map/npc.hpp')
-rw-r--r--src/map/npc.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/npc.hpp b/src/map/npc.hpp
index 6bb9370..6204316 100644
--- a/src/map/npc.hpp
+++ b/src/map/npc.hpp
@@ -12,7 +12,7 @@ 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, char *npcname, char *command);
+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);
@@ -20,8 +20,8 @@ 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 (char *w1, char *w2, char *w3, char *w4);
-int npc_parse_warp (char *w1, char *w2, char *w3, char *w4);
+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);
@@ -33,7 +33,7 @@ int npc_get_new_npc_id (void);
*
* \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_, char *name, 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