diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-04 17:08:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-04 17:08:44 +0300 |
| commit | 3732bd4a6b708651f6b4bcd32d6beb2b7f49c478 (patch) | |
| tree | 83155915c35c72d018108231437248cc78d5060d /src/map/pc.c | |
| parent | 0bd30a0fac1db1b478b3173a22a81bd5249113f8 (diff) | |
| parent | 9147fe9473b26ee32aafed65fd02b03f11397629 (diff) | |
| download | hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.tar.gz hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.tar.bz2 hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.tar.xz hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.zip | |
Merge pull request #1210 from HerculesWS/wcast_qual
Added -Wcast-qual compiler flag
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index e958f32b6..57b2fe19a 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -63,6 +63,7 @@ #include "common/random.h" #include "common/showmsg.h" #include "common/socket.h" +#include "common/sql.h" #include "common/strlib.h" // safestrncpy() #include "common/sysinfo.h" #include "common/timer.h" @@ -8990,7 +8991,7 @@ char* pc_readregstr(struct map_session_data* sd, int64 reg) { void pc_setregstr(struct map_session_data* sd, int64 reg, const char* str) { struct script_reg_str *p = NULL; unsigned int index = script_getvaridx(reg); - DBData prev; + struct DBData prev; if( str[0] ) { p = ers_alloc(pc->str_reg_ers, struct script_reg_str); @@ -9113,7 +9114,7 @@ int pc_setregistry(struct map_session_data *sd, int64 reg, int val) { if( !pc->reg_load ) p->flag.update = 1;/* either way, it will require either delete or replace */ } else if( val ) { - DBData prev; + struct DBData prev; if( index ) script->array_update(&sd->regs, reg, false); @@ -9166,7 +9167,7 @@ int pc_setregistry_str(struct map_session_data *sd, int64 reg, const char *val) if( !pc->reg_load ) p->flag.update = 1;/* either way, it will require either delete or replace */ } else if( val[0] ) { - DBData prev; + struct DBData prev; if( index ) script->array_update(&sd->regs, reg, false); @@ -11474,7 +11475,8 @@ void pc_autotrade_populate(struct map_session_data *sd) { /** * @see DBApply */ -int pc_autotrade_final(DBKey key, DBData *data, va_list ap) { +int pc_autotrade_final(union DBKey key, struct DBData *data, va_list ap) +{ struct autotrade_vending* at_v = DB->data2ptr(data); HPM->data_store_destroy(&at_v->hdata); return 0; |