From 1997cf2769a39faef0c986137d0920caf6833d1a Mon Sep 17 00:00:00 2001 From: patman128 Date: Sat, 29 May 2010 04:43:12 +0400 Subject: [PATCH] [10002] Fixed map loading .map build checks. Bug exist long time before recent code moves. But it not affect in cases proper .map files. Signed-off-by: VladimirMangos --- src/game/GridMap.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/GridMap.cpp b/src/game/GridMap.cpp index ce6e459e4..4df4083b6 100644 --- a/src/game/GridMap.cpp +++ b/src/game/GridMap.cpp @@ -77,8 +77,8 @@ bool GridMap::loadData(char *filename) fread(&header, sizeof(header),1,in); if (header.mapMagic == *((uint32 const*)(MAP_MAGIC)) && - header.versionMagic == *((uint32 const*)(MAP_VERSION_MAGIC)) || - !IsAcceptableClientBuild(header.buildMagic)) + header.versionMagic == *((uint32 const*)(MAP_VERSION_MAGIC)) && + IsAcceptableClientBuild(header.buildMagic)) { // loadup area data if (header.areaMapOffset && !loadAreaData(in, header.areaMapOffset, header.areaMapSize)) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 46bdc4173..5813fb483 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 "10001" + #define REVISION_NR "10002" #endif // __REVISION_NR_H__