summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorgepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-14 15:29:00 +0000
committergepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-14 15:29:00 +0000
commit27abf1bcb19ef14ec08dc7916cd383e3f045c88b (patch)
treea939536eb04ffe940f656d1f492f8d12083e39cc /src/char
parent4c1423ea04f98647576a952be6adbc1b0d8ce2cf (diff)
downloadhercules-27abf1bcb19ef14ec08dc7916cd383e3f045c88b.tar.gz
hercules-27abf1bcb19ef14ec08dc7916cd383e3f045c88b.tar.bz2
hercules-27abf1bcb19ef14ec08dc7916cd383e3f045c88b.tar.xz
hercules-27abf1bcb19ef14ec08dc7916cd383e3f045c88b.zip
Removed deprecated memory manager macros (follow-up to r14916).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15581 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char')
-rw-r--r--src/char/char.c2
-rw-r--r--src/char/inter.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/char/char.c b/src/char/char.c
index c2490efed..a569f5ca1 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -742,7 +742,7 @@ int memitemdata_to_sql(const struct item items[], int max, int id, int tableswit
SqlStmt_BindColumn(stmt, 8+j, SQLDT_SHORT, &item.card[j], 0, NULL, NULL);
// bit array indicating which inventory items have already been matched
- flag = (bool*) aCallocA(max, sizeof(bool));
+ flag = (bool*) aCalloc(max, sizeof(bool));
while( SQL_SUCCESS == SqlStmt_NextRow(stmt) )
{
diff --git a/src/char/inter.c b/src/char/inter.c
index 2137579be..75f6533fe 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -326,7 +326,7 @@ int inter_mapif_init(int fd)
// broadcast sending
int mapif_broadcast(unsigned char *mes, int len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY, int sfd)
{
- unsigned char *buf = (unsigned char*)aMallocA((len)*sizeof(unsigned char));
+ unsigned char *buf = (unsigned char*)aMalloc((len)*sizeof(unsigned char));
WBUFW(buf,0) = 0x3800;
WBUFW(buf,2) = len;