diff options
| author | Dastgir <dastgirpojee@rocketmail.com> | 2015-04-11 15:34:16 +0530 |
|---|---|---|
| committer | Dastgir <dastgirpojee@rocketmail.com> | 2015-04-11 15:34:16 +0530 |
| commit | 3d314c5c4ae9b33bd722ce204fe4ffbc192b2087 (patch) | |
| tree | 6581ae77c87dadca1475707a14944e476c9fb70c | |
| parent | ad3c3f42eb9eaa5527108459f3221d75f804aae2 (diff) | |
| parent | f00811a93b0631283faebb43dcd2e0382d9e0ce1 (diff) | |
| download | hercules-3d314c5c4ae9b33bd722ce204fe4ffbc192b2087.tar.gz hercules-3d314c5c4ae9b33bd722ce204fe4ffbc192b2087.tar.bz2 hercules-3d314c5c4ae9b33bd722ce204fe4ffbc192b2087.tar.xz hercules-3d314c5c4ae9b33bd722ce204fe4ffbc192b2087.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
| -rw-r--r-- | src/char/int_auction.c | 4 | ||||
| -rw-r--r-- | src/char/int_guild.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/char/int_auction.c b/src/char/int_auction.c index 2c54db16b..f2ec347cd 100644 --- a/src/char/int_auction.c +++ b/src/char/int_auction.c @@ -161,8 +161,10 @@ static int inter_auction_end_timer(int tid, int64 tick, int id, intptr_t data) { void inter_auction_delete(struct auction_data *auction) { + unsigned int auction_id; nullpo_retv(auction); - unsigned int auction_id = auction->auction_id; + + auction_id = auction->auction_id; if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `auction_id` = '%d'", auction_db, auction_id) ) Sql_ShowDebug(inter->sql_handle); diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 13aaeb0b4..3ba51e1f0 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -944,9 +944,11 @@ int mapif_guild_memberadded(int fd, int guild_id, int account_id, int char_id, i // ACK member leave int mapif_guild_withdraw(int guild_id,int account_id,int char_id,int flag, const char *name, const char *mes) { + unsigned char buf[55+NAME_LENGTH]; + nullpo_ret(name); nullpo_ret(mes); - unsigned char buf[55+NAME_LENGTH]; + WBUFW(buf, 0)=0x3834; WBUFL(buf, 2)=guild_id; WBUFL(buf, 6)=account_id; |