diff options
author | TAW Dev <tawdev@taw> | 2009-07-08 11:04:59 -0400 |
---|---|---|
committer | TAW Dev <tawdev@taw> | 2009-07-08 11:04:59 -0400 |
commit | aa0bb68d762f72d8abb2b71079e98a8e27969412 (patch) | |
tree | 77e38010cc0443cc7480572e823dd13ee7ee555d /src/map/skill.c | |
parent | e9c1a79b6306783d63655eca5ddbcca0b6d825d0 (diff) | |
parent | 4673fd3ca06010e74f8223486b0f34e58c7b0a7e (diff) | |
download | tmwa-aa0bb68d762f72d8abb2b71079e98a8e27969412.tar.gz tmwa-aa0bb68d762f72d8abb2b71079e98a8e27969412.tar.bz2 tmwa-aa0bb68d762f72d8abb2b71079e98a8e27969412.tar.xz tmwa-aa0bb68d762f72d8abb2b71079e98a8e27969412.zip |
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
Diffstat (limited to 'src/map/skill.c')
-rw-r--r-- | src/map/skill.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 3a777ac..c661dc2 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -21,6 +21,7 @@ #include "pc.h" #include "script.h" #include "skill.h" +#include "../common/socket.h" #ifdef MEMWATCH #include "memwatch.h" @@ -9890,7 +9891,7 @@ int skill_readdb(void) /* The main skill database */ memset(skill_db,0,sizeof(skill_db)); - fp=fopen("db/skill_db.txt","r"); + fp=fopen_("db/skill_db.txt","r"); if(fp==NULL){ printf("can't read db/skill_db.txt\n"); return 1; @@ -9959,10 +9960,10 @@ int skill_readdb(void) for(k=0;k<MAX_SKILL_LEVEL;k++) skill_db[i].blewcount[k]=(split2[k])? atoi(split2[k]):atoi(split2[0]); } - fclose(fp); + fclose_(fp); printf("read db/skill_db.txt done\n"); - fp=fopen("db/skill_require_db.txt","r"); + fp=fopen_("db/skill_require_db.txt","r"); if(fp==NULL){ printf("can't read db/skill_require_db.txt\n"); return 1; @@ -10097,11 +10098,11 @@ int skill_readdb(void) skill_db[i].itemid[9]=atoi(split[28]); skill_db[i].amount[9]=atoi(split[29]); } - fclose(fp); + fclose_(fp); printf("read db/skill_require_db.txt done\n"); /* ? */ - fp=fopen("db/skill_cast_db.txt","r"); + fp=fopen_("db/skill_cast_db.txt","r"); if(fp==NULL){ printf("can't read db/skill_cast_db.txt\n"); return 1; @@ -10160,10 +10161,10 @@ int skill_readdb(void) for(k=0;k<MAX_SKILL_LEVEL;k++) skill_db[i].upkeep_time2[k]=(split2[k])? atoi(split2[k]):atoi(split2[0]); } - fclose(fp); + fclose_(fp); printf("read db/skill_cast_db.txt done\n"); - fp=fopen("db/skill_castnodex_db.txt","r"); + fp=fopen_("db/skill_castnodex_db.txt","r"); if(fp==NULL){ printf("can't read db/skill_castnodex_db.txt\n"); return 1; @@ -10193,7 +10194,7 @@ int skill_readdb(void) for(k=0;k<MAX_SKILL_LEVEL;k++) skill_db[i].castnodex[k]=(split2[k])? atoi(split2[k]):atoi(split2[0]); } - fclose(fp); + fclose_(fp); printf("read db/skill_castnodex_db.txt done\n"); return 0; |