summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-11 21:06:25 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-11 21:06:25 +0000
commit415e738feb188909dea60831aef07c4fb0fe0f17 (patch)
tree655d59ab571962a2b3fa2fdc492bee3b83b024cc /src/char
parentd187830a9f19239d7f43729a51198ed9dd8c176f (diff)
downloadhercules-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/char')
-rw-r--r--src/char/int_status.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/char/int_status.c b/src/char/int_status.c
index 52b14ebbe..769d35f65 100644
--- a/src/char/int_status.c
+++ b/src/char/int_status.c
@@ -29,7 +29,7 @@ static void* create_scdata(DBKey key, va_list args)
*------------------------------------------*/
struct scdata* status_search_scdata(int aid, int cid)
{
- return (struct scdata*)scdata_db->ensure(scdata_db, i2key(cid), create_scdata, aid);
+ return (struct scdata*)scdata_db->ensure(scdata_db, db_i2key(cid), create_scdata, aid);
}
/*==========================================