diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/mapmanager.cpp | 13 | ||||
| -rw-r--r-- | src/mapmanager.h | 5 | ||||
| -rw-r--r-- | tmwserv.dev | 14 |
4 files changed, 37 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2005-12-29 Eugenio Favalli <elvenprogrammer@gmail.com> + + * src/mapmanager.cpp, src/mapmanager.h, tmwserv.dev,: Forgot a way to + access maps. + 2005-12-28 Bjørn Lindeijer <bjorn@lindeijer.nl> * makeclient.sh, src/Makefile.am: Integrated the building of tmwclient @@ -35,8 +40,8 @@ 2005-12-18 Eugenio Favalli <elvenprogrammer@gmail.com> * src/main.cpp, src/mapreader.cpp, tmwserv.dev, - src/mapmanager.cpp, src/mapmanager.h: Added a map manager to - load/unload/relod maps. + src/mapmanager.cpp, src/mapmanager.h: Added a map manager to + load/unload/reload maps. 2005-12-18 Yohann Ferreira <bertram@cegetel.net> diff --git a/src/mapmanager.cpp b/src/mapmanager.cpp index 6e8137d1..4ce5e398 100644 --- a/src/mapmanager.cpp +++ b/src/mapmanager.cpp @@ -73,5 +73,18 @@ void MapManager::reloadMap(const std::string& mapFile) loadMap(mapFile); } +Map *MapManager::getMap(const std::string& mapFile) +{ + Map *result = NULL; + std::map<std::string, Map *>::iterator i; + + i = maps.find(mapFile); + if (i != maps.end()) + { + result = i->second; + } + return result; +} + } // namespace tmwserv diff --git a/src/mapmanager.h b/src/mapmanager.h index c4051c4a..e4edf196 100644 --- a/src/mapmanager.h +++ b/src/mapmanager.h @@ -57,6 +57,11 @@ class MapManager: public utils::Singleton<MapManager> * Reload the specified map */ void reloadMap(const std::string& mapFile); + + /** + * Return the requested map + */ + Map *getMap(const std::string& mapFile); protected: /** diff --git a/tmwserv.dev b/tmwserv.dev index e9073186..d106dad9 100644 --- a/tmwserv.dev +++ b/tmwserv.dev @@ -5,7 +5,7 @@ Name=tmwserv UnitCount=17 ======= Name=tmwserv -UnitCount=72 +UnitCount=74 >>>>>>> 1.2 Type=1 Ver=1 @@ -743,7 +743,7 @@ OverrideBuildCmd=0 BuildCmd= [Unit74] -FileName=src\resource.h +FileName=src\utils\slangsfilter.h CompileCpp=1 Folder=tmwserv Compile=1 @@ -782,3 +782,13 @@ Priority=1000 OverrideBuildCmd=0 BuildCmd= +[Unit73] +FileName=src\utils\slangsfilter.cpp +CompileCpp=1 +Folder=tmwserv +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + |