summaryrefslogtreecommitdiff
path: root/src/char_sql
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-19 02:41:24 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-19 02:41:24 +0000
commit45a388cf0c7a1616dd10dba5b9cb5cd07ef47c27 (patch)
tree061471d91a31e50c08dfed97a61c05d0e91404c0 /src/char_sql
parent3c234c05cfde1c26bbb44b5a0cea3409fc0d4f13 (diff)
downloadhercules-45a388cf0c7a1616dd10dba5b9cb5cd07ef47c27.tar.gz
hercules-45a388cf0c7a1616dd10dba5b9cb5cd07ef47c27.tar.bz2
hercules-45a388cf0c7a1616dd10dba5b9cb5cd07ef47c27.tar.xz
hercules-45a388cf0c7a1616dd10dba5b9cb5cd07ef47c27.zip
guild_cache
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@619 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char_sql')
-rw-r--r--src/char_sql/Makefile6
-rw-r--r--src/char_sql/char.c2
-rw-r--r--src/char_sql/int_guild.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/src/char_sql/Makefile b/src/char_sql/Makefile
index c2e8afe35..faf2bbb64 100644
--- a/src/char_sql/Makefile
+++ b/src/char_sql/Makefile
@@ -1,12 +1,13 @@
all: char-server_sql
sql: char-server_sql
-COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/malloc.o ../common/showmsg.o
-COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/db.h ../common/malloc.h ../common/showmsg.h
+COMMON_OBJ = ../common/core.o ../common/socket.o ../common/timer.o ../common/db.o ../common/malloc.o ../common/showmsg.o ../common/utils.o
+COMMON_H = ../common/core.h ../common/socket.h ../common/timer.h ../common/db.h ../common/malloc.h ../common/showmsg.h ../common/utils.h
char-server_sql: char.o inter.o int_party.o int_guild.o int_storage.o int_pet.o strlib.o itemdb.o $(COMMON_OBJ)
$(CC) -o ../../$@ $^ $(LIB_S)
+
char.o: char.c char.h strlib.h itemdb.h ../common/showmsg.h
inter.o: inter.c inter.h int_party.h int_guild.h int_storage.h int_pet.h ../common/mmo.h char.h ../common/socket.h ../common/showmsg.h
int_party.o: int_party.c int_party.h inter.h ../common/mmo.h char.h ../common/socket.h ../common/timer.h ../common/db.h ../common/showmsg.h
@@ -15,6 +16,7 @@ int_storage.o: int_storage.c int_storage.h char.h itemdb.h ../common/showmsg.h
int_pet.o: int_pet.c int_pet.h inter.h char.h ../common/mmo.h ../common/socket.h ../common/db.h ../common/showmsg.h
strlib.o: strlib.c strlib.h ../common/showmsg.h
itemdb.o: itemdb.c itemdb.h ../common/db.h ../common/mmo.h ../common/showmsg.h
+$(COMMON_OBJ): $(COMMON_H)
clean:
rm -f *.o ../../char-server_sql
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index f87e1f791..73271b197 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -958,7 +958,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus *p, int online){
for(i=0;i<20;i++) {
p->friend_id[i] = 0;
- sprintf(p->friend_name[i], "");
+ p->friend_name[i][0] = '\0';
}
tmp_p += sprintf(tmp_p, "SELECT `id`, `account_id`");
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index e8e6a6360..def93d9f3 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -3,6 +3,10 @@
// SQL conversion by hack
//
+#ifdef TWILIGHT
+#define GUILDCACHE
+#endif
+
#include "char.h"
#include "strlib.h"
#include "int_storage.h"