summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-09 18:56:27 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-09 18:56:27 +0000
commite35044d26d45bf7e9a4acc357be3738e3379f3e3 (patch)
tree5233ac4ef955794af13c8f928050a09f18fa3069 /src/common
parentc10d6dd38c9fff3ea0ec335465b7f632d5b086db (diff)
downloadhercules-e35044d26d45bf7e9a4acc357be3738e3379f3e3.tar.gz
hercules-e35044d26d45bf7e9a4acc357be3738e3379f3e3.tar.bz2
hercules-e35044d26d45bf7e9a4acc357be3738e3379f3e3.tar.xz
hercules-e35044d26d45bf7e9a4acc357be3738e3379f3e3.zip
- 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
Diffstat (limited to 'src/common')
-rw-r--r--src/common/mapindex.c2
-rw-r--r--src/common/mapindex.h1
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);