diff --git a/contrib/vmap_extractor_v3/vmapextract/model.cpp b/contrib/vmap_extractor_v3/vmapextract/model.cpp index a2493f7e5..0b65e1541 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("VMAP003",8,1,output); + fwrite(szWMAPMAGIC,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 b215e601e..fe67821b8 100644 --- a/contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp +++ b/contrib/vmap_extractor_v3/vmapextract/vmapexport.cpp @@ -56,6 +56,7 @@ bool preciseVectorData = false; //static const char * szWorkDirMaps = ".\\Maps"; const char * szWorkDirWmo = "./Buildings"; +const char * szWMAPMAGIC = "VMAP003"; // Local testing functions diff --git a/contrib/vmap_extractor_v3/vmapextract/vmapexport.h b/contrib/vmap_extractor_v3/vmapextract/vmapexport.h index fa9a609ab..71e57aefb 100644 --- a/contrib/vmap_extractor_v3/vmapextract/vmapexport.h +++ b/contrib/vmap_extractor_v3/vmapextract/vmapexport.h @@ -9,5 +9,6 @@ enum ModelFlags }; extern const char * szWorkDirWmo; +extern const char * szWMAPMAGIC; #endif diff --git a/contrib/vmap_extractor_v3/vmapextract/wmo.cpp b/contrib/vmap_extractor_v3/vmapextract/wmo.cpp index 03cc2c16c..7fb84f7bf 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("VMAP003",1,8,pOutfile); + fwrite(szWMAPMAGIC,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 4b271d824..12f79162a 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 "11088" + #define REVISION_NR "11089" #endif // __REVISION_NR_H__