- stable -> trunk sync

- battle.c and pc.c formatting
- fixed one badly defined npc shop format string
- removed the "selling item for no buying price" warning when the item has a buying price of 20 (see topic:157465)

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

2 files changed, 1 insertions, 2 deletions

diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index a7f7aca5a..f169538f7 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -72,7 +72,7 @@ const char* mapindex_getmapname_ext(const char* string, char* output)
 
 /// Adds a map to the specified index
 /// Returns 1 if successful, 0 oherwise
-int mapindex_addmap(int index, const char* name)
+static int mapindex_addmap(int index, const char* name)
 {
 	char map_name[MAP_NAME_LENGTH];
 
diff --git a/src/common/mapindex.h b/src/common/mapindex.h
index 0d2c0c46e..99e7de702 100644
--- a/src/common/mapindex.h
+++ b/src/common/mapindex.h
@@ -39,7 +39,6 @@ extern char mapindex_cfgfile[80];
 
 const char* mapindex_getmapname(const char* string, char* output);
 const char* mapindex_getmapname_ext(const char* string, char* output);
-int mapindex_addmap(int index, const char *name);
 unsigned short mapindex_name2id(const char*);
 const char* mapindex_id2name(unsigned short);
 void mapindex_init(void);