From 7cf1ed7c68e1aa2108f91cf0979804194540b5ac Mon Sep 17 00:00:00 2001 From: sanctum32 Date: Mon, 21 Oct 2013 07:09:07 +0300 Subject: [PATCH] [12691] Fix a bug with vmap extraction This bug appears to have no real impact in wotlk original author @Schmoozerd --- contrib/vmap_extractor/vmapextract/gameobject_extract.cpp | 5 ++--- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/vmap_extractor/vmapextract/gameobject_extract.cpp b/contrib/vmap_extractor/vmapextract/gameobject_extract.cpp index 85bb372aa..3e8a4dcf1 100644 --- a/contrib/vmap_extractor/vmapextract/gameobject_extract.cpp +++ b/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")) @@ -23,7 +22,7 @@ bool ExtractSingleModel(std::string& fname, StringSet& failedPaths) std::string output(szWorkDirWmo); // Stores output filename (possible changed) output += "/"; - output += name; + output += GetPlainName(fname.c_str()); if (FileExists(output.c_str())) return true; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 7cb40e8d0..fe88b3fce 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12690" + #define REVISION_NR "12691" #endif // __REVISION_NR_H__