aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMax Horn2006-04-08 11:38:41 +0000
committerMax Horn2006-04-08 11:38:41 +0000
commitdc77d02c7e63ab9185870a8c6028ccab9dbbf716 (patch)
tree4038a801a26a60cd9a8bc18ecf5cf5de248f9220 /engines
parent4572d0ba16b36bead1c02ec07b5c7ff357e0bc95 (diff)
downloadscummvm-rg350-dc77d02c7e63ab9185870a8c6028ccab9dbbf716.tar.gz
scummvm-rg350-dc77d02c7e63ab9185870a8c6028ccab9dbbf716.tar.bz2
scummvm-rg350-dc77d02c7e63ab9185870a8c6028ccab9dbbf716.zip
Removed common/map.h with the Common::Map template class (it was a very bad implementation, and our HashMap is simply better).
svn-id: r21688
Diffstat (limited to 'engines')
-rw-r--r--engines/saga/game.cpp6
-rw-r--r--engines/scumm/plugin.cpp2
-rw-r--r--engines/simon/game.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/saga/game.cpp b/engines/saga/game.cpp
index 63cf3f074e..20a2d39d16 100644
--- a/engines/saga/game.cpp
+++ b/engines/saga/game.cpp
@@ -28,7 +28,7 @@
#include "common/file.h"
#include "common/md5.h"
-#include "common/map.h"
+#include "common/hashmap.h"
#include "common/config-manager.h"
#include "base/plugins.h"
#include "base/gameDetector.h"
@@ -1508,10 +1508,10 @@ static int detectGame(const FSList *fslist, Common::Language language, Common::P
int gamesCount = ARRAYSIZE(gameDescriptions);
int filesCount;
- typedef Common::Map<Common::String, bool> StringSet;
+ typedef Common::HashMap<Common::String, bool> StringSet;
StringSet filesList;
- typedef Common::Map<Common::String, Common::String> StringMap;
+ typedef Common::HashMap<Common::String, Common::String> StringMap;
StringMap filesMD5;
Common::String tstr;
diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp
index 2e57dcbbba..6b7de39c6f 100644
--- a/engines/scumm/plugin.cpp
+++ b/engines/scumm/plugin.cpp
@@ -951,7 +951,7 @@ DetectedGameList Engine_SCUMM_detectGames(const FSList &fslist) {
char tempName[128];
SubstResFileNames subst = { 0, 0, kGenAsIs };
- typedef Common::Map<Common::String, bool> StringSet;
+ typedef Common::HashMap<Common::String, bool> StringSet;
StringSet fileSet;
for (g = scumm_settings; g->gameid; ++g) {
diff --git a/engines/simon/game.cpp b/engines/simon/game.cpp
index 0d70fb0ca8..16f879d25d 100644
--- a/engines/simon/game.cpp
+++ b/engines/simon/game.cpp
@@ -1253,10 +1253,10 @@ static int detectGame(const FSList *fslist, Common::Language language, Common::P
int gamesCount = ARRAYSIZE(gameDescriptions);
int filesCount;
- typedef Common::Map<Common::String, bool> StringSet;
+ typedef Common::HashMap<Common::String, bool> StringSet;
StringSet filesList;
- typedef Common::Map<Common::String, Common::String> StringMap;
+ typedef Common::HashMap<Common::String, Common::String> StringMap;
StringMap filesMD5;
Common::String tstr, tstr2;