summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-18 19:20:26 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-18 19:20:26 +0000
commit666438b258682bc676aba1330212165ba72a2440 (patch)
tree5db560a5f17783b721c90240183e21442016d856 /src/map
parent88354efc1f49fab4410ab9e6fdf670c1141ce33a (diff)
downloadhercules-666438b258682bc676aba1330212165ba72a2440.tar.gz
hercules-666438b258682bc676aba1330212165ba72a2440.tar.bz2
hercules-666438b258682bc676aba1330212165ba72a2440.tar.xz
hercules-666438b258682bc676aba1330212165ba72a2440.zip
- Follow up to r15155 and r15162 (bugreport:5126)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15163 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/mob.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index 1b8a44b85..97592d32b 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -4360,17 +4360,17 @@ static bool mob_readdb_race2(char* fields[], int columns, int current)
static void mob_load(void)
{
#ifndef TXT_ONLY
- if(db_use_sqldbs) {
+ if (db_use_sqldbs)
+ {
mob_read_sqldb();
mob_read_sqlskilldb();
- } else {
+ }
+ else
+#endif
+ {
mob_readdb();
mob_readskilldb();
}
-#else
- mob_readdb();
- mob_readskilldb();
-#endif /* TXT_ONLY */
sv_readdb(db_path, "mob_avail.txt", ',', 2, 12, -1, &mob_readdb_mobavail);
mob_read_randommonster();
mob_readchatdb();