aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tools/vmap4_extractor/gameobject_extract.cpp8
-rw-r--r--src/tools/vmap4_extractor/vmapexport.cpp7
2 files changed, 1 insertions, 14 deletions
diff --git a/src/tools/vmap4_extractor/gameobject_extract.cpp b/src/tools/vmap4_extractor/gameobject_extract.cpp
index 82c0ab5b1c8..08777315470 100644
--- a/src/tools/vmap4_extractor/gameobject_extract.cpp
+++ b/src/tools/vmap4_extractor/gameobject_extract.cpp
@@ -66,12 +66,6 @@ struct GameObjectDisplayInfoMeta
}
};
-struct CascFileHandleDeleter
-{
- typedef HANDLE pointer;
- void operator()(HANDLE handle) const { CascCloseFile(handle); }
-};
-
enum ModelTypes : uint32
{
MODEL_MD20 = '02DM',
@@ -83,7 +77,7 @@ bool GetHeaderMagic(std::string const& fileName, uint32* magic)
{
*magic = 0;
CASC::FileHandle file = CASC::OpenFile(CascStorage, fileName.c_str(), CASC_LOCALE_ALL);
- if (!!file)
+ if (!file)
return false;
DWORD bytesRead = 0;
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index c76e0d948a8..571b8655646 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -541,13 +541,6 @@ int main(int argc, char ** argv)
return 1;
}
- if (!OpenCascStorage(FirstLocale))
- {
- if (GetLastError() != ERROR_PATH_NOT_FOUND)
- printf("Unable to open storage!\n");
- return 1;
- }
-
// Extract models, listed in GameObjectDisplayInfo.dbc
ExtractGameobjectModels();