From 59dc4717ad51d0d756a9097495868577b7433054 Mon Sep 17 00:00:00 2001
From: lordttseven <lordttseven@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 18 Mar 2012 13:32:13 +0000
Subject: * uncluttered DB paths between REMODE on/off a little

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15719 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/mob.c | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

(limited to 'src/map/mob.c')

diff --git a/src/map/mob.c b/src/map/mob.c
index e1c324ba1..82e75c9db 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -3730,11 +3730,7 @@ static bool mob_readdb_sub(char* fields[], int columns, int current)
 static void mob_readdb(void)
 {
 	const char* filename[] = {
-#if REMODE
-		"re/mob_db.txt",
-#else
-		"pre-re/mob_db.txt",
-#endif
+		DBPATH"mob_db.txt",
 		"mob_db2.txt" };
 	int fi;
 	
@@ -3861,15 +3857,9 @@ static int mob_read_randommonster(void)
 	char *str[10],*p;
 	int i,j;
 	const char* mobfile[] = {
-#if REMODE
-		"re/mob_branch.txt",
-		"mob_poring.txt",
-		"re/mob_boss.txt",
-#else
-		"pre-re/mob_branch.txt",
+		DBPATH"mob_branch.txt",
 		"mob_poring.txt",
-		"pre-re/mob_boss.txt",
-#endif
+		DBPATH"mob_boss.txt",
 		"mob_pouch.txt"};
 
 	memset(&summon, 0, sizeof(summon));
@@ -4304,11 +4294,7 @@ static bool mob_parse_row_mobskilldb(char** str, int columns, int current)
  *------------------------------------------*/
 static void mob_readskilldb(void) {
 	const char* filename[] = {
-#if REMODE
-		"re/mob_skill_db.txt",
-#else
-		"pre-re/mob_skill_db.txt",
-#endif
+		DBPATH"mob_skill_db.txt",
 		"mob_skill_db2.txt" };
 	int fi;
 
-- 
cgit v1.2.3-60-g2f50