Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected RENEWAL_ASPD macro processing (#4259)

Browse Source 
* Resolves an issue with the RENEWAL_ASPD macro processing the wrong database as it would go off the current compiled mode.
Thanks to @rfperuch!
This commit is contained in:
Aleos 2019-07-25 08:06:40 -04:00 committed by GitHub
parent 4ea1b25483
commit d476934c93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/map/pc.cpp
View File

@ -11988,10 +11988,10 @@ void pc_readdb(void) {
s = pc_read_statsdb(dbsubpath2,s,i > 0); s = pc_read_statsdb(dbsubpath2,s,i > 0);
if (i == 0) if (i == 0)
#ifdef RENEWAL_ASPD #ifdef RENEWAL_ASPD // Paths are hardcoded here to specifically pick the correct database
sv_readdb(dbsubpath1, DBPATH "job_db1.txt",',',6+MAX_WEAPON_TYPE,6+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, false); sv_readdb(dbsubpath1, "re/job_db1.txt",',',6+MAX_WEAPON_TYPE,6+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, false);
#else #else
sv_readdb(dbsubpath1, DBPATH "job_db1.txt",',',5+MAX_WEAPON_TYPE,5+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, false); sv_readdb(dbsubpath1, "pre-re/job_db1.txt",',',5+MAX_WEAPON_TYPE,5+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, false);
#endif #endif
else else
sv_readdb(dbsubpath1, "job_db1.txt",',',5+MAX_WEAPON_TYPE,6+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, true); sv_readdb(dbsubpath1, "job_db1.txt",',',5+MAX_WEAPON_TYPE,6+MAX_WEAPON_TYPE,CLASS_COUNT,&pc_readdb_job1, true);