mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-19 04:37:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11090] Clarify use diff vmap magic strings.

Browse source
This commit is contained in:
VladimirMangos 2011-02-01 05:25:37 +03:00
parent deb31679bf
commit b315362b22
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/vmap/TileAssembler.cpp
View file

@ -27,8 +27,6 @@
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
static char const* VMAP_MAGIC = "VMAP003";
using G3D::Vector3; using G3D::Vector3;
using G3D::AABox; using G3D::AABox;
using G3D::inf; using G3D::inf;
@ -270,7 +268,7 @@ namespace VMAP
fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); }
READ_OR_RETURN(&ident, 8); READ_OR_RETURN(&ident, 8);
CMP_OR_RETURN(ident, VMAP_MAGIC); CMP_OR_RETURN(ident, RAW_VMAP_MAGIC);
// we have to read one int. This is needed during the export and we have to skip it here // we have to read one int. This is needed during the export and we have to skip it here
uint32 tempNVectors; uint32 tempNVectors;
@ -376,7 +374,7 @@ namespace VMAP
fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); }
READ_OR_RETURN(&ident, 8); READ_OR_RETURN(&ident, 8);
CMP_OR_RETURN(ident, VMAP_MAGIC); CMP_OR_RETURN(ident, RAW_VMAP_MAGIC);
// we have to read one int. This is needed during the export and we have to skip it here // we have to read one int. This is needed during the export and we have to skip it here
uint32 tempNVectors; uint32 tempNVectors;

3
src/game/vmap/VMapDefinitions.h
View file

@ -24,7 +24,8 @@
namespace VMAP namespace VMAP
{ {
const char VMAP_MAGIC[] = "VMAP_3.0"; const char VMAP_MAGIC[] = "VMAP_3.0"; // used in final vmap files
const char RAW_VMAP_MAGIC[] = "VMAP003"; // used in extracted vmap files with raw data
// defined in TileAssembler.cpp currently... // defined in TileAssembler.cpp currently...
bool readChunk(FILE *rf, char *dest, const char *compare, uint32 len); bool readChunk(FILE *rf, char *dest, const char *compare, uint32 len);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11089" #define REVISION_NR "11090"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__