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

[11086] Store vmap file version magic string in single place.

Browse source
This commit is contained in:
VladimirMangos 2011-01-31 05:56:45 +03:00
parent dcec49055d
commit 8ee7139de6
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,8 @@
#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;
@ -268,7 +270,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, "VMAP003"); CMP_OR_RETURN(ident, 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;
@ -374,7 +376,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, "VMAP003"); CMP_OR_RETURN(ident, 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;

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 "11085" #define REVISION_NR "11086"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__