summaryrefslogtreecommitdiff
path: root/src/map/pc.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/pc.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/pc.hpp')
-rw-r--r--src/map/pc.hpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/map/pc.hpp b/src/map/pc.hpp
index 7237957..cc433b8 100644
--- a/src/map/pc.hpp
+++ b/src/map/pc.hpp
@@ -56,8 +56,8 @@ int pc_can_reach (struct map_session_data *, int, int);
int pc_walktoxy (struct map_session_data *, int, int);
int pc_stop_walking (struct map_session_data *, int);
int pc_movepos (struct map_session_data *, int, int);
-int pc_setpos (struct map_session_data *, char *, int, int, int);
-int pc_setsavepoint (struct map_session_data *, char *, int, int);
+int pc_setpos (struct map_session_data *, const char *, int, int, int);
+int pc_setsavepoint (struct map_session_data *, const char *, int, int);
int pc_randomwarp (struct map_session_data *sd, int type);
int pc_memo (struct map_session_data *sd, int i);
@@ -132,7 +132,6 @@ int pc_resetskill (struct map_session_data *);
int pc_equipitem (struct map_session_data *, int, int);
int pc_unequipitem (struct map_session_data *, int, int);
int pc_unequipinvyitem (struct map_session_data *, int, int);
-int pc_checkitem (struct map_session_data *);
int pc_useitem (struct map_session_data *, int);
int pc_damage (struct block_list *, struct map_session_data *, int);
@@ -152,13 +151,13 @@ int pc_setparam (struct map_session_data *, int, int);
int pc_readreg (struct map_session_data *, int);
int pc_setreg (struct map_session_data *, int, int);
char *pc_readregstr (struct map_session_data *sd, int reg);
-int pc_setregstr (struct map_session_data *sd, int reg, char *str);
-int pc_readglobalreg (struct map_session_data *, char *);
-int pc_setglobalreg (struct map_session_data *, char *, int);
-int pc_readaccountreg (struct map_session_data *, char *);
-int pc_setaccountreg (struct map_session_data *, char *, int);
-int pc_readaccountreg2 (struct map_session_data *, char *);
-int pc_setaccountreg2 (struct map_session_data *, char *, int);
+int pc_setregstr (struct map_session_data *sd, int reg, const char *str);
+int pc_readglobalreg (struct map_session_data *, const char *);
+int pc_setglobalreg (struct map_session_data *, const char *, int);
+int pc_readaccountreg (struct map_session_data *, const char *);
+int pc_setaccountreg (struct map_session_data *, const char *, int);
+int pc_readaccountreg2 (struct map_session_data *, const char *);
+int pc_setaccountreg2 (struct map_session_data *, const char *, int);
int pc_percentrefinery (struct map_session_data *sd, struct item *item);
int pc_addeventtimer (struct map_session_data *sd, int tick,
@@ -202,8 +201,8 @@ enum
{ ADDITEM_EXIST, ADDITEM_NEW, ADDITEM_OVERAMOUNT };
// timer for night.day
-timer_id day_timer_tid;
-timer_id night_timer_tid;
+extern timer_id day_timer_tid;
+extern timer_id night_timer_tid;
void map_day_timer (timer_id, tick_t, custom_id_t, custom_data_t); // by [yor]
void map_night_timer (timer_id, tick_t, custom_id_t, custom_data_t); // by [yor]