* Fixed a bug in gettick cache when compiling in Windows

- Changed "read_map_from_bitmap" to "read_map_from_cache" in map_athena, "map_bitmap_path" to "map_cache_file"
- Fixed item effects not showing when only one was used
- Fixed a bug in Safety Wall
- Allow only either Storm Gust or Lord of Vermillion to cause damage if stacked together
- Added path_search_long, map_find_skill_unit_oncell

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@998 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 10 insertions, 6 deletions

diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf
index 39f5d97d8..d32e16ba6 100644
--- a/conf-tmpl/map_athena.conf
+++ b/conf-tmpl/map_athena.conf
@@ -45,14 +45,18 @@ char_port: 6121
 map_port: 5121
 
 //Preferred map loading method
-//0: Read directly from grf, 1: Read from bitmap file (without compression)
-//2: Read from bitmap file (with compression). It is possible to reduce the map cache
-// to 1MB for 400+ maps with compression enabled. If all maps are already loaded in the
-// cache, Athena can boot without reading the grf files.
-read_map_from_bitmap: 1
+// 0: Read directly from grf
+// 1: Read from cache (without compression)
+// 2: Read from cache (with compression)
+// If the cache was not found it will read the maps from the GRF and copy
+// any necessary data into a newly created cache.
+// It is possible to reduce the map cache to 1MB for 400+ maps with compression
+// enabled. If all maps are already loaded in the cache, Athena can boot without
+// reading the grf files.
+read_map_from_cache: 1
 //
 //Where is the bitmap file stored?
-map_bitmap_path: db/map.info
+map_cache_file: db/map.info
 
 // Console Commands
 // Allow for console commands to be used on/off