diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-11 21:19:07 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-11 21:19:07 +0000 |
| commit | 3ac466e7e094d378706fa2ec4ac42136796a65ec (patch) | |
| tree | 447897993a6121dbdaec26cf9544abe650dd34b8 | |
| parent | a8db0b293ae542c5ebccb062b3459c0f74e917a0 (diff) | |
| download | hercules-3ac466e7e094d378706fa2ec4ac42136796a65ec.tar.gz hercules-3ac466e7e094d378706fa2ec4ac42136796a65ec.tar.bz2 hercules-3ac466e7e094d378706fa2ec4ac42136796a65ec.tar.xz hercules-3ac466e7e094d378706fa2ec4ac42136796a65ec.zip | |
added remode-specific exp files processing as per kenpachi request, special thanks to brianl
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15424 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/char_sql/int_guild.c | 4 | ||||
| -rw-r--r-- | src/map/homunculus.c | 8 | ||||
| -rw-r--r-- | src/map/pc.c | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c index 9b5692689..7b467f92a 100644 --- a/src/char_sql/int_guild.c +++ b/src/char_sql/int_guild.c @@ -651,8 +651,8 @@ int inter_guild_ReadEXP(void) FILE *fp; char line[1024]; for (i=0;i<100;i++) guild_exp[i]=0; - - sprintf(line, "%s/exp_guild.txt", db_path); + //this is going to be discussed, temp fix + sprintf(line, "%s/pre-re/exp_guild.txt", db_path); fp=fopen(line,"r"); if(fp==NULL){ ShowError("can't read %s\n", line); diff --git a/src/map/homunculus.c b/src/map/homunculus.c index d46c55a52..31cb5b012 100644 --- a/src/map/homunculus.c +++ b/src/map/homunculus.c @@ -1072,7 +1072,13 @@ void read_homunculus_expdb(void) FILE *fp; char line[1024]; int i, j=0; - char *filename[]={"exp_homun.txt","exp_homun2.txt"}; + char *filename[]={ +#if REMODE + "re/exp_homun.txt", +#else + "pre-re/exp_homun.txt", +#endif + "exp_homun2.txt"}; memset(hexptbl,0,sizeof(hexptbl)); for(i=0; i<2; i++){ diff --git a/src/map/pc.c b/src/map/pc.c index 032516810..7ca3e7c54 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -8272,7 +8272,11 @@ int pc_readdb(void) // 必要??値?み?み memset(exp_table,0,sizeof(exp_table)); memset(max_level,0,sizeof(max_level)); - sprintf(line, "%s/exp.txt", db_path); +#if REMODE + sprintf(line, "%s/re/exp.txt", db_path); +#else + sprintf(line, "%s/pre-re/exp.txt", db_path); +#endif fp=fopen(line, "r"); if(fp==NULL){ ShowError("can't read %s\n", line); |