Added ability to select variations by model name

Author: ViperJohnGR

ModelVariations/IniParse.hpp

@@ -3,6 +3,8 @@
 #include <vector>
 #include <IniReader.h>
 
+#include <CModelInfo.h>
+
 inline std::vector<unsigned short> vectorUnion(std::vector<unsigned short>& vec1, std::vector<unsigned short>& vec2)
 {
     std::vector<unsigned short> vec;
@@ -30,6 +32,7 @@ inline std::vector<unsigned short> iniLineParser(std::string section, std::strin
         strcpy(tkString, iniString.c_str());
 
         char* token = strtok(tkString, ",");
+        int modelid = 0;
 
         while (token != NULL)
         {
@@ -40,6 +43,8 @@ inline std::vector<unsigned short> iniLineParser(std::string section, std::strin
             }
             else if(token[0] >= '0' && token[0] <= '9')
                 retVector.push_back((unsigned short)atoi(token));
+            else if (CModelInfo::GetModelInfo(token, &modelid) != NULL)
+                retVector.push_back((unsigned short)modelid);
 
             token = strtok(NULL, ",");
         }

ModelVariations/ModelVariations.cpp

@@ -358,8 +358,7 @@ void printCurrentVariations()
 
 void printVariations()
 {
-    logfile << std::endl;
-    logfile << "\nPed Variations:\n";
+    logfile << std::dec << "\nPed Variations:\n";
     for (unsigned int i = 0; i < 300; i++)
     {
         for (unsigned int j = 0; j < 16; j++)
@@ -682,7 +681,6 @@ class ModelVariations {
 
             if (logfile.is_open())
             {
-                printVariations();
                 logfile << "\nLoaded modules:" << std::endl;
 
                 getLoadedModules();
@@ -696,6 +694,7 @@ class ModelVariations {
         Events::initScriptsEvent += []
         {
             loadIniData(false);
+            printVariations();
 
             if (loadAllVehicles)
                 for (int i = 400; i < 612; i++)

ModelVariations/ModelVariations.vcxproj

@@ -85,6 +85,7 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <ExternalWarningLevel>TurnOffAllWarnings</ExternalWarningLevel>
       <TreatAngleIncludeAsExternal>true</TreatAngleIncludeAsExternal>
+      <DisableSpecificWarnings>5045;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>Debug</GenerateDebugInformation>