Hotfix sv_enemies still being ignored

CHANGELOG.md

@@ -8,6 +8,12 @@ The format is based on [Keep a Changelog][Keep a Changelog] and this project adh
 
 ## [Released]
 
+## [1.5.2] - 2021-02-26
+
+### Fixed
+
+- Hotfixed `sv_enemies` folder still being ignored ([#24](https://github.com/erri120/rpgmpacker/issues/24))
+
 ## [1.5.1] - 2021-02-25
 
 ### Fixed

include/inputPaths.hpp

@@ -36,7 +36,7 @@ struct InputPaths {
     path actorsBattlerPath;
     //img/enemies/ for front-view
     path enemiesFrontViewBattlerPath;
-    //img/sv_enemies for side-view
+    //img/sv_enemies/ for side-view
     path enemiesSideViewBattlerPath;
 
     //MV only: img/animations/

src/utility.cpp

@@ -461,20 +461,16 @@ bool filterUnusedFiles(const ghc::filesystem::path& path, struct InputPaths* inp
     auto extension = path.extension().u8string();
     auto parent = path.parent_path();
 
-    if (parent.filename() == "sv_enemies") {
-        //sv_enemies will be completely ignored by RPG Maker and only the enemies folder is being used
-        //you can verify this by opening RPG Maker, going to the Database->Enemies and selecting an image
-        //the base Actor1_3 is different in sv_enemies/ and enemies/ but only the one from enemies/ turns up
-        return true;
-    }
-
     auto name = filename.substr(0, filename.find(extension));
 
     std::set<std::string>::iterator it;
 
     if (parent == inputPaths->bgmPath) {
         it = parsedData->bgmNames.find(name);
         return it == parsedData->bgmNames.end();
+    } else if (parent == inputPaths->enemiesFrontViewBattlerPath || parent == inputPaths->enemiesSideViewBattlerPath) {
+        it = parsedData->enemyBattlerNames.find(name);
+        return it == parsedData->enemyBattlerNames.end();
     }
     FIND(inputPaths->bgsPath, parsedData->bgsNames)
     FIND(inputPaths->mePath, parsedData->meNames)
@@ -486,8 +482,6 @@ bool filterUnusedFiles(const ghc::filesystem::path& path, struct InputPaths* inp
     FIND(inputPaths->charactersPath, parsedData->characterNames)
     FIND(inputPaths->facesPath, parsedData->faceNames)
     FIND(inputPaths->actorsBattlerPath, parsedData->actorBattlerNames)
-    FIND(inputPaths->enemiesFrontViewBattlerPath, parsedData->enemyBattlerNames)
-    FIND(inputPaths->enemiesSideViewBattlerPath, parsedData->enemyBattlerNames)
     FIND(inputPaths->tilesetsPath, parsedData->tilesetNames)
     FIND(inputPaths->battlebacks1Path, parsedData->battleback1Names)
     FIND(inputPaths->battlebacks2Path, parsedData->battleback2Names)