[s2000] Fix a bug with vmap extraction

This bug appears to have no real impact in wotlk

(based on commit [12481] - c444465)

Signed-off-by: Schmoozerd <[email protected]>

Author: Schmoozerd

contrib/vmap_extractor/vmapextract/gameobject_extract.cpp

@@ -8,8 +8,7 @@
 
 bool ExtractSingleModel(std::string& fname, StringSet& failedPaths)
 {
-    char* name = GetPlainName((char*)fname.c_str());
-    char* ext = GetExtension(name);
+    char* ext = GetExtension(GetPlainName((char*)fname.c_str()));
 
     // < 3.1.0 ADT MMDX section store filename.mdx filenames for corresponded .m2 file
     if (!strcmp(ext, ".mdx"))
@@ -21,14 +20,15 @@ bool ExtractSingleModel(std::string& fname, StringSet& failedPaths)
     // >= 3.1.0 ADT MMDX section store filename.m2 filenames for corresponded .m2 file
     // nothing do
 
-    std::string output(szWorkDirWmo);
+    std::string output(szWorkDirWmo);                       // Stores output filename (possible changed)
     output += "/";
-    output += name;
+    output += GetPlainName(fname.c_str());
+
 
     if (FileExists(output.c_str()))
         return true;
 
-    Model mdl(fname);
+    Model mdl(fname);                                       // Possible changed fname
     if (!mdl.open(failedPaths))
         return false;
 

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "1999"
+ #define REVISION_NR "2000"
 #endif // __REVISION_NR_H__