fix: unintentional filename conflicts within raw_models in streaming (#120)

* Fix for unintentional filename conflicts within raw_models in streaming

* Inline comparison in lambda

* std.stream: store pre-init raw_models in a multimap by filename

Same basename in different .img paths no longer overwrites earlier entries. Look up and remove with equal_range/find_if instead of linear scan or erase-by-key.

---------

Co-authored-by: Denilson Amorim <denimorim@gmail.com>

Author: rokuniichi

src/plugins/gta3/std.stream/data.cpp

@@ -82,8 +82,9 @@ std::string CAbstractStreaming::TryLoadNonStreamedResource(std::string filepath,
 
     if(!this->bHasInitializedStreaming)
     {
-        auto it = this->raw_models.find(filename);
-        if(it != this->raw_models.end())
+        const auto range = this->raw_models.equal_range(filename);
+        auto it = range.first;
+        if(it != range.second)
         {
             // Log about non streamed resource and make sure it's unique
             plugin_ptr->Log("Using non-streamed resource \"%s\"", it->second->filepath());

src/plugins/gta3/std.stream/streaming.cpp

@@ -202,7 +202,7 @@ bool CAbstractStreaming::InstallFile(const modloader::file& file)
         // Just push it to this list and it will get loaded when the streaming initializes
         // At this point we don't know if this is a clothing item or an model, for that reason "raw"
         // The initializer will take care of filtering clothes and models from the list
-        this->raw_models[file.filename()] = &file;
+        this->raw_models.insert({ file.filename(), &file });
         return true;
     }
     else
@@ -242,7 +242,13 @@ bool CAbstractStreaming::UninstallFile(const modloader::file& file)
             return false;
 
         // Streaming hasn't initialized, just remove it from our raw list
-        raw_models.erase(file.filename());
+        const auto range = this->raw_models.equal_range(file.filename());
+        const auto it = std::find_if(range.first, range.second, [&file](const auto& p) {
+            return p.second == &file;
+        });
+        if(it != range.second)
+            this->raw_models.erase(it);
+
         return true;
     }
     else

src/plugins/gta3/std.stream/streaming.hpp

@@ -226,11 +226,11 @@ class CAbstractStreaming
         std::map<id_t, id_t> prev_on_cd;                // Original InfoForModel next on cd information, <next, prev>
 
         // Custom files
-        std::map<std::string, const modloader::file*>   raw_models; // Models installed before the streaming initialization ---- (sorted by name!!)
-        std::map<id_t, ModelInfo>                       imports;    // Imported abstract models
-        std::map<hash_t, const modloader::file*>        special;    // Abstract special models ---- (imported by me) (hashed filename has no extension)
-        std::map<uint32_t, const modloader::file*>      clothes;    // Imported abstract clothes --- (key is offset)
-        std::map<hash_t, NonStreamedInfo_t>             non_stream; // Non streamed resources (requested by default.dat/gta.dat) (.second.first may be nullptr)
+        std::multimap<std::string, const modloader::file*> raw_models; // Models installed before the streaming initialization. Sorted by name. Duplicates allowed (e.g. coach.dff which is both a streaming and a clothing item)
+        std::map<id_t, ModelInfo>                          imports;    // Imported abstract models
+        std::map<hash_t, const modloader::file*>           special;    // Abstract special models ---- (imported by me) (hashed filename has no extension)
+        std::map<uint32_t, const modloader::file*>         clothes;    // Imported abstract clothes --- (key is offset)
+        std::map<hash_t, NonStreamedInfo_t>                non_stream; // Non streamed resources (requested by default.dat/gta.dat) (.second.first may be nullptr)
 
         // Information for refreshing
         std::map<hash_t, const modloader::file*>        to_import;  // Files to be imported by the refresher --- (null pointer on mapped piece means uninstall)