summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorcodemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-13 22:15:58 +0000
committercodemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-13 22:15:58 +0000
commitae6aa7431d176f3defab07234cdd7677523f0c4d (patch)
treeaead9f031a47c24081d13030d72fc6c63e1c8f50 /src/char
parent6ef9c57c9e27f1225ba4be518d980cfae17a10f5 (diff)
downloadhercules-ae6aa7431d176f3defab07234cdd7677523f0c4d.tar.gz
hercules-ae6aa7431d176f3defab07234cdd7677523f0c4d.tar.bz2
hercules-ae6aa7431d176f3defab07234cdd7677523f0c4d.tar.xz
hercules-ae6aa7431d176f3defab07234cdd7677523f0c4d.zip
* common/mmo.h: changed base_level and job_level to unsigned int to increase max levels
* char/char.c: added a NULL check for the file in parse_friend_txt * map/atcommand.c/.h: added @clearweather (thanks to Dexity) * map/charcommand.c/.h: added #spiritball * map/mob.c: fixed a compiler warning (ln was an int and was supposed to be an unsigned long int) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@563 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char')
-rw-r--r--src/char/char.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/char/char.c b/src/char/char.c
index 2d5c5ba7d..50e1c4f0a 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -577,6 +577,9 @@ int parse_friend_txt(struct mmo_charstatus *p)
// Open the file and look for the ID
fp = fopen(friends_txt, "r");
+
+ if(fp == NULL)
+ return 1;
while(fgets(line, sizeof(line)-1, fp)) {