diff --git a/contrib/vmap_extractor_v3/vmapextract/model.cpp b/contrib/vmap_extractor_v3/vmapextract/model.cpp index 0b65e1541..fc5850803 100644 --- a/contrib/vmap_extractor_v3/vmapextract/model.cpp +++ b/contrib/vmap_extractor_v3/vmapextract/model.cpp @@ -58,7 +58,7 @@ bool Model::ConvertToVMAPModel(char * outfilename) printf("Can't create the output file '%s'\n",outfilename); return false; } - fwrite(szWMAPMAGIC,8,1,output); + fwrite(szRawVMAPMagic,8,1,output); uint32 nVertices = 0; nVertices = header.nBoundingVertices; fwrite(&nVertices, sizeof(int), 1, output); diff --git a/contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp b/contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp index fe67821b8..9319c481f 100644 --- a/contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp +++ b/contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp @@ -56,7 +56,7 @@ bool preciseVectorData = false; //static const char * szWorkDirMaps = ".\\Maps"; const char * szWorkDirWmo = "./Buildings"; -const char * szWMAPMAGIC = "VMAP003"; +const char * szRawVMAPMagic = "VMAP003"; // Local testing functions diff --git a/contrib/vmap_extractor_v3/vmapextract/vmapexport.h b/contrib/vmap_extractor_v3/vmapextract/vmapexport.h index 71e57aefb..60f021542 100644 --- a/contrib/vmap_extractor_v3/vmapextract/vmapexport.h +++ b/contrib/vmap_extractor_v3/vmapextract/vmapexport.h @@ -9,6 +9,6 @@ enum ModelFlags }; extern const char * szWorkDirWmo; -extern const char * szWMAPMAGIC; +extern const char * szRawVMAPMagic; // vmap magic string for extracted raw vmap data #endif diff --git a/contrib/vmap_extractor_v3/vmapextract/wmo.cpp b/contrib/vmap_extractor_v3/vmapextract/wmo.cpp index 7fb84f7bf..b8b1b7936 100644 --- a/contrib/vmap_extractor_v3/vmapextract/wmo.cpp +++ b/contrib/vmap_extractor_v3/vmapextract/wmo.cpp @@ -107,7 +107,7 @@ bool WMORoot::ConvertToVMAPRootWmo(FILE *pOutfile) { //printf("Convert RootWmo...\n"); - fwrite(szWMAPMAGIC,1,8,pOutfile); + fwrite(szRawVMAPMagic,1,8,pOutfile); unsigned int nVectors = 0; fwrite(&nVectors,sizeof(nVectors),1,pOutfile); // will be filled later fwrite(&nGroups,4,1,pOutfile); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a18fb821d..78377e88f 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 "11090" + #define REVISION_NR "11091" #endif // __REVISION_NR_H__