Ticket #4582: detection.patch

engines/advancedDetector.cpp

@@ -144 +144 @@
         const char *title = 0;
 
         while (sg->gameid) {
-                if (!scumm_stricmp(g.gameid, sg->gameid))
+                if (g.gameid == sg->gameid)
                         title = sg->description;
                 sg++;
         }
 
         GameDescriptor gd(g.gameid, title, g.language, g.platform);
-        gd.updateDesc(g.extra);
+        gd.updateDesc(g.extra.c_str());
         return gd;
 }
 

engines/advancedDetector.h

@@ -51 +51 @@
 };
 
 struct ADGameDescription {
-        const char *gameid;
-        const char *extra;
+        Common::String gameid;
+        Common::String extra;
         ADGameFileDescription filesDescriptions[14];
         Common::Language language;
         Common::Platform platform;

engines/agos/agos.h

@@ -199 +199 @@
         int getGameId() const;
         int getGameType() const;
         uint32 getFeatures() const;
-        const char *getExtra() const;
+        Common::String getExtra() const;
         Common::Language getLanguage() const;
         Common::Platform getPlatform() const;
         const char *getFileName(int type) const;

engines/agos/detection.cpp

@@ -230 +230 @@
         return _gameDescription->features;
 }
 
-const char *AGOSEngine::getExtra() const {
+Common::String AGOSEngine::getExtra() const {
         return _gameDescription->desc.extra;
 }
 

engines/agos/script_ff.cpp

@@ -438 +438 @@
         // 135: switch CD
         uint16 disc = readVariable(97);
 
-        if (!strcmp(getExtra(), "4CD")) {
+        if (getExtra() == "4CD") {
                 _sound->switchVoiceFile(gss, disc);
-        } else if (!strcmp(getExtra(), "2CD")) {
+        } else if (getExtra() == "2CD") {
                 if (disc == 1 || disc == 2)
                         _sound->switchVoiceFile(gss, 1);
                 else if (disc == 3 || disc == 4)

engines/cruise/cruise.h

@@ -83 +83 @@
         virtual bool hasFeature(EngineFeature f) const;
 
         int getGameType() const;
-        const char *getGameId() const;
+        Common::String getGameId() const;
         uint32 getFeatures() const;
         Common::Language getLanguage() const;
         Common::Platform getPlatform() const;

engines/cruise/detection.cpp

@@ -41 +41 @@
         uint32 features;
 };
 
-const char *CruiseEngine::getGameId() const {
+Common::String CruiseEngine::getGameId() const {
         return _gameDescription->desc.gameid;
 }
 

engines/sci/detection.cpp

@@ -339 +339 @@
         delete resMan;
 
         // Distinguish demos from full versions
-        if (!strcmp(s_fallbackDesc.desc.gameid, "castlebrain") && !Common::File::exists("resource.002")) {
+        if (s_fallbackDesc.desc.gameid == "castlebrain" && !Common::File::exists("resource.002")) {
                 // The Spanish full version doesn't have resource.002, but we can distinguish it from the
                 // demo from the size of resource.000
                 if (smallResource000Size)
                         s_fallbackDesc.desc.flags |= ADGF_DEMO;
         }
 
-        if (!strcmp(s_fallbackDesc.desc.gameid, "islandbrain") && smallResource000Size)
+        if (s_fallbackDesc.desc.gameid == "islandbrain" && smallResource000Size)
                 s_fallbackDesc.desc.flags |= ADGF_DEMO;
 
-        if (!strcmp(s_fallbackDesc.desc.gameid, "kq6") && smallResource000Size)
+        if (s_fallbackDesc.desc.gameid == "kq6" && smallResource000Size)
                 s_fallbackDesc.desc.flags |= ADGF_DEMO;
 
         // Fill in extras field
-        if (!strcmp(s_fallbackDesc.desc.gameid, "lsl1sci") ||
-                !strcmp(s_fallbackDesc.desc.gameid, "pq1sci") ||
-                !strcmp(s_fallbackDesc.desc.gameid, "sq1sci"))
+        if (s_fallbackDesc.desc.gameid == "lsl1sci" ||
+                s_fallbackDesc.desc.gameid == "pq1sci" ||
+                s_fallbackDesc.desc.gameid == "sq1sci")
                 s_fallbackDesc.desc.extra = "VGA Remake";
 
-        if (!strcmp(s_fallbackDesc.desc.gameid, "qfg1") && !Common::File::exists("resource.001"))
+        if (s_fallbackDesc.desc.gameid == "qfg1" && !Common::File::exists("resource.001"))
                 s_fallbackDesc.desc.extra = "VGA Remake";
 
         SearchMan.remove("SCI_detection");

engines/sci/sci.cpp

@@ -235 +235 @@
         return _console;
 }
 
-const char* SciEngine::getGameID() const {
+Common::String SciEngine::getGameID() const {
         return _gameDescription->desc.gameid;
 }
 

engines/sci/sci.h

@@ -106 +106 @@
         virtual GUI::Debugger *getDebugger();
         Console *getSciDebugger();
 
-        const char* getGameID() const;
+        Common::String getGameID() const;
         int getResourceVersion() const;
         SciVersion getVersion() const;
         Common::Language getLanguage() const;

engines/tinsel/detection.cpp

@@ -679 +679 @@
         // Includes nifty stuff like removing trailing dots and ignoring case.
         for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
                 if (file->isDirectory()) {
-                        if (!scumm_stricmp(file->getName().c_str(), "dw2")) {
+                        if (file->getName().equalsIgnoreCase("dw2")) {
                                 // Probably Discworld 2 subfolder on CD, so add it's contents as well
                                 Common::FSList files;
                                 if (file->getChildren(files, Common::FSNode::kListAll)) {
@@ -704 +704 @@
         // Check which files are included in some dw2 ADGameDescription *and* present
         // in fslist without a '1' suffix character. Compute MD5s and file sizes for these files.
         for (g = &Tinsel::gameDescriptions[0]; g->desc.gameid != 0; ++g) {
-                if (strcmp(g->desc.gameid, "dw2") != 0)
+                if (g->desc.gameid == "dw2")
                         continue;
 
                 for (fileDesc = g->desc.filesDescriptions; fileDesc->fileName; fileDesc++) {
@@ -738 +738 @@
         // MD5 based matching
         uint i;
         for (i = 0, g = &Tinsel::gameDescriptions[0]; g->desc.gameid != 0; ++g) {
-                if (strcmp(g->desc.gameid, "dw2") != 0)
+                if (g->desc.gameid == "dw2")
                         continue;
 
                 bool fileMissing = false;