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

Changed mob parsing order (#1573)

Browse Source 
Fixes #1572
This commit is contained in:
Lemongrass3110 2016-09-27 19:28:05 +02:00 committed by GitHub
parent 0c07b660b9
commit 8e3da7ffed
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/map/mob.c
View File

@ -4966,6 +4966,27 @@ static void mob_load(void)
"/"DBIMPORT, "/"DBIMPORT,
}; };
// First we parse all the possible monsters to add additional data in the second loop
if( db_use_sqldbs ){
mob_read_sqldb();
mob_read_sqlskilldb();
}else{
for(i=0; i<ARRAYLENGTH(dbsubpath); i++){
int n2 = strlen(db_path)+strlen(DBPATH)+strlen(dbsubpath[i])+1;
char* dbsubpath2 = (char*)aMalloc(n2+1);
if( i == 0 ){
safesnprintf(dbsubpath2,n2,"%s/%s%s",db_path,DBPATH,dbsubpath[i]);
}else{
safesnprintf(dbsubpath2,n2,"%s%s",db_path,dbsubpath[i]);
}
sv_readdb(dbsubpath2, "mob_db.txt", ',', 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, -1, &mob_readdb_sub, i);
aFree(dbsubpath2);
}
}
for(i=0; i<ARRAYLENGTH(dbsubpath); i++){ for(i=0; i<ARRAYLENGTH(dbsubpath); i++){
int n1 = strlen(db_path)+strlen(dbsubpath[i])+1; int n1 = strlen(db_path)+strlen(dbsubpath[i])+1;
int n2 = strlen(db_path)+strlen(DBPATH)+strlen(dbsubpath[i])+1; int n2 = strlen(db_path)+strlen(DBPATH)+strlen(dbsubpath[i])+1;
@ -4982,12 +5003,7 @@ static void mob_load(void)
safesnprintf(dbsubpath2,n1,"%s%s",db_path,dbsubpath[i]); safesnprintf(dbsubpath2,n1,"%s%s",db_path,dbsubpath[i]);
} }
if (db_use_sqldbs && i==0) //only read once for sql if( !db_use_sqldbs ){
{
mob_read_sqldb();
mob_read_sqlskilldb();
} else {
sv_readdb(dbsubpath2, "mob_db.txt", ',', 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, -1, &mob_readdb_sub, i);
mob_readskilldb(dbsubpath2,i); mob_readskilldb(dbsubpath2,i);
} }