diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-09 21:01:39 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-09 21:01:39 +0100 |
| commit | cbf9324f61984727163150ed09a72288da45e3a4 (patch) | |
| tree | 518318f6a43aec6efabd1ac833f47d79dc64d816 /src | |
| parent | 5f15600e7a26170f0aacc77e9417df61db45a992 (diff) | |
Core: Fix build
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/mesh_extractor/DBC.cpp | 2 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 10 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/PathCommon.h | 2 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/TerrainBuilder.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/tools/mesh_extractor/DBC.cpp b/src/tools/mesh_extractor/DBC.cpp index 5c54d975487..3c846363d06 100644 --- a/src/tools/mesh_extractor/DBC.cpp +++ b/src/tools/mesh_extractor/DBC.cpp @@ -5,7 +5,7 @@ DBC::DBC( FILE* stream ) : StringBlock(NULL), StringBlockSize(0), IsFaulty(true) { char magic[5]; - uint count = 0; + uint32 count = 0; count += fread(&magic, sizeof(char), 4, stream); magic[4] = '\0'; count += fread(&RecordCount, sizeof(uint32), 1, stream); diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index 689ccdc906d..29591a406df 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -266,10 +266,10 @@ namespace MMAP return; } - uint verticesCount, indicesCount; - if (fread(&verticesCount, sizeof(uint), 1, file) != 1) + uint32 verticesCount, indicesCount; + if (fread(&verticesCount, sizeof(uint32), 1, file) != 1) return; - if (fread(&indicesCount, sizeof(uint), 1, file) != 1) + if (fread(&indicesCount, sizeof(uint32), 1, file) != 1) return; float* verts = new float[verticesCount]; @@ -282,10 +282,10 @@ namespace MMAP MeshData data; - for (uint i = 0; i < verticesCount; ++i) + for (uint32 i = 0; i < verticesCount; ++i) data.solidVerts.append(verts[i]); - for (uint i = 0; i < indicesCount; ++i) + for (uint32 i = 0; i < indicesCount; ++i) data.solidTris.append(inds[i]); TerrainBuilder::cleanVertices(data.solidVerts, data.solidTris); diff --git a/src/tools/mmaps_generator/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h index 966c12ec19e..8fad880212b 100644 --- a/src/tools/mmaps_generator/PathCommon.h +++ b/src/tools/mmaps_generator/PathCommon.h @@ -90,7 +90,7 @@ namespace MMAP return LISTFILE_DIRECTORY_NOT_FOUND; do { - if (includeSubDirs || (findFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) + if (findFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY == 0) fileList.push_back(string(findFileInfo.cFileName)); } while (FindNextFile(hFind, &findFileInfo)); diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index 22946df478a..97e504d5160 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -235,7 +235,7 @@ namespace MMAP if (!(lheader.flags & MAP_LIQUID_NO_HEIGHT)) { - uint toRead = lheader.width*lheader.height; + uint8 toRead = lheader.width*lheader.height; liquid_map = new float [toRead]; if (fread(liquid_map, sizeof(float), toRead, mapFile) != toRead) printf("TerrainBuilder::loadMap: Failed to read some data expected 1, read 0\n"); |