diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-11 21:06:25 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-11 21:06:25 +0000 |
| commit | 415e738feb188909dea60831aef07c4fb0fe0f17 (patch) | |
| tree | 655d59ab571962a2b3fa2fdc492bee3b83b024cc /src/map | |
| parent | d187830a9f19239d7f43729a51198ed9dd8c176f (diff) | |
| download | hercules-415e738feb188909dea60831aef07c4fb0fe0f17.tar.gz hercules-415e738feb188909dea60831aef07c4fb0fe0f17.tar.bz2 hercules-415e738feb188909dea60831aef07c4fb0fe0f17.tar.xz hercules-415e738feb188909dea60831aef07c4fb0fe0f17.zip | |
* Merged changes up to eAthena 15032.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15065 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.h | 1 | ||||
| -rw-r--r-- | src/map/guild.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/map/clif.h b/src/map/clif.h index 8b6271075..def1178fd 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -6,6 +6,7 @@ #include "../common/cbasetypes.h" //#include "../common/mmo.h" +struct item; struct storage_data; struct guild_storage; //#include "map.h" diff --git a/src/map/guild.c b/src/map/guild.c index 8c5988dc8..49d92914e 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1155,7 +1155,7 @@ unsigned int guild_payexp(struct map_session_data *sd,unsigned int exp) exp = exp * per / 100; //Otherwise tax everything. - c = (struct guild_expcache*)guild_expcache_db->ensure(guild_expcache_db, i2key(sd->status.char_id), create_expcache, sd); + c = (struct guild_expcache*)guild_expcache_db->ensure(guild_expcache_db, db_i2key(sd->status.char_id), create_expcache, sd); if (c->exp > UINT64_MAX - exp) c->exp = UINT64_MAX; @@ -1174,7 +1174,7 @@ int guild_getexp(struct map_session_data *sd,int exp) if (sd->status.guild_id == 0 || guild_search(sd->status.guild_id) == NULL) return 0; - c = (struct guild_expcache*)guild_expcache_db->ensure(guild_expcache_db, i2key(sd->status.char_id), create_expcache, sd); + c = (struct guild_expcache*)guild_expcache_db->ensure(guild_expcache_db, db_i2key(sd->status.char_id), create_expcache, sd); if (c->exp > UINT64_MAX - exp) c->exp = UINT64_MAX; else |