From 54c6b9f6cb8e8f8d0e0284838bc1e9b2b3bbac8d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Nov 2014 20:43:58 +0300 Subject: In mapindex move check for default map into separate method. --- src/common/mapindex.c | 14 +++++++++++--- src/common/mapindex.h | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/common/mapindex.c b/src/common/mapindex.c index ec829ee56..e00fc107d 100644 --- a/src/common/mapindex.c +++ b/src/common/mapindex.c @@ -165,13 +165,20 @@ int mapindex_init(void) { } fclose(fp); - if( !strdb_iget(mapindex->db, MAP_DEFAULT) ) { - ShowError("mapindex_init: MAP_DEFAULT '%s' not found in cache! update mapindex.h MAP_DEFAULT var!!!\n",MAP_DEFAULT); - } + mapindex->check_default(); return total; } +bool mapindex_check_default(void) +{ + if (!strdb_iget(mapindex->db, MAP_DEFAULT)) { + ShowError("mapindex_init: MAP_DEFAULT '%s' not found in cache! update mapindex.h MAP_DEFAULT var!!!\n",MAP_DEFAULT); + return false; + } + return true; +} + void mapindex_removemap(int index){ strdb_remove(mapindex->db, mapindex->list[index].name); mapindex->list[index].name[0] = '\0'; @@ -201,4 +208,5 @@ void mapindex_defaults(void) { mapindex->getmapname_ext = mapindex_getmapname_ext; mapindex->name2id = mapindex_name2id; mapindex->id2name = mapindex_id2name_sub; + mapindex->check_default = mapindex_check_default; } diff --git a/src/common/mapindex.h b/src/common/mapindex.h index 446a2422d..53d08f8e6 100644 --- a/src/common/mapindex.h +++ b/src/common/mapindex.h @@ -84,6 +84,7 @@ struct mapindex_interface { /* TODO: Hello World! make up your mind, this thing is int on some places and unsigned short on others */ unsigned short (*name2id) (const char*); const char* (*id2name) (unsigned short,const char *file, int line, const char *func); + bool (*check_default) (void); }; struct mapindex_interface *mapindex; -- cgit v1.2.3-70-g09d2