summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorxazax-hun <xazax-hun@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-08 09:56:24 +0000
committerxazax-hun <xazax-hun@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-08 09:56:24 +0000
commit14e3a29853167baa0c6217a85380b1c293320da7 (patch)
treefd877ba388459cc167931f048dc839af2f4c1009 /src/map
parenta5a50d59bade8e712ab765ce2e65342f8bc6e002 (diff)
downloadhercules-14e3a29853167baa0c6217a85380b1c293320da7.tar.gz
hercules-14e3a29853167baa0c6217a85380b1c293320da7.tar.bz2
hercules-14e3a29853167baa0c6217a85380b1c293320da7.tar.xz
hercules-14e3a29853167baa0c6217a85380b1c293320da7.zip
* item_trade.txt is split into re and pre-re folder as per Kenpachi's request.
* skill_tree.txt is split into re and pre-re folder. In renewal version only level 5 spear mastery is required for spiral pierce. * Removed an unnecessary new line on a message. * Enabled mechanic summons in pre-re/mob_db.txt to avoid some startup error messages. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15546 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/itemdb.c6
-rw-r--r--src/map/map.c2
-rw-r--r--src/map/pc.c6
3 files changed, 11 insertions, 3 deletions
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 6ea360e0c..3bb77ed34 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -1042,7 +1042,11 @@ static void itemdb_read(void)
itemdb_read_itemgroup();
sv_readdb(db_path, "item_avail.txt", ',', 2, 2, -1, &itemdb_read_itemavail);
sv_readdb(db_path, "item_noequip.txt", ',', 2, 2, -1, &itemdb_read_noequip);
- sv_readdb(db_path, "item_trade.txt", ',', 3, 3, -1, &itemdb_read_itemtrade);
+#if REMODE
+ sv_readdb(db_path, "re/item_trade.txt", ',', 3, 3, -1, &itemdb_read_itemtrade);
+#else
+ sv_readdb(db_path, "pre-re/item_trade.txt", ',', 3, 3, -1, &itemdb_read_itemtrade);
+#endif
sv_readdb(db_path, "item_delay.txt", ',', 2, 2, MAX_ITEMDELAYS, &itemdb_read_itemdelay);
sv_readdb(db_path, "item_buyingstore.txt", ',', 1, 1, -1, &itemdb_read_buyingstore);
}
diff --git a/src/map/map.c b/src/map/map.c
index 6103d9f77..fd6f41202 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3720,7 +3720,7 @@ int do_init(int argc, char *argv[])
char ip_str[16];
ip2str(addr_[0], ip_str);
- ShowError("\nNot all IP addresses in map_athena.conf configured, autodetecting...\n");
+ ShowError("Not all IP addresses in map_athena.conf configured, autodetecting...\n");
if (naddr_ == 0)
ShowError("Unable to determine your IP address...\n");
diff --git a/src/map/pc.c b/src/map/pc.c
index bbd6c3da9..50b24af99 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -8455,7 +8455,11 @@ int pc_readdb(void)
// スキルツリ?
memset(skill_tree,0,sizeof(skill_tree));
- sv_readdb(db_path, "skill_tree.txt", ',', 3+MAX_PC_SKILL_REQUIRE*2, 4+MAX_PC_SKILL_REQUIRE*2, -1, &pc_readdb_skilltree);
+#if REMODE
+ sv_readdb(db_path, "re/skill_tree.txt", ',', 3+MAX_PC_SKILL_REQUIRE*2, 4+MAX_PC_SKILL_REQUIRE*2, -1, &pc_readdb_skilltree);
+#else
+ sv_readdb(db_path, "pre-re/skill_tree.txt", ',', 3+MAX_PC_SKILL_REQUIRE*2, 4+MAX_PC_SKILL_REQUIRE*2, -1, &pc_readdb_skilltree);
+#endif
// ?性修正テ?ブル
for(i=0;i<4;i++)