diff options
| author | megamage <none@none> | 2009-01-17 17:54:11 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-17 17:54:11 -0600 |
| commit | 02c060be05b27dcd2d5d662027bae7fd91c3abfc (patch) | |
| tree | 1e3bddc4c459f48445cf45ff7e5253bd08cbe450 /src/shared | |
| parent | 2cf1a3be1b310feafc43781ab9178f0c1f35d352 (diff) | |
*Update to Mangos 7100.
--HG--
branch : trunk
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/Database/DBCStores.cpp | 2 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/Database/DBCStores.cpp b/src/shared/Database/DBCStores.cpp index cd02ed42252..cd4a2e5faf0 100644 --- a/src/shared/Database/DBCStores.cpp +++ b/src/shared/Database/DBCStores.cpp @@ -568,7 +568,7 @@ uint32 GetAreaFlagByMapId(uint32 mapid) uint32 GetVirtualMapForMapAndZone(uint32 mapid, uint32 zoneId) { - if(mapid != 530 || mapid != 571) // speed for most cases + if(mapid != 530 && mapid != 571) // speed for most cases return mapid; if(WorldMapAreaEntry const* wma = sWorldMapAreaStore.LookupEntry(zoneId)) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index d159296e986..60f75e4853c 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 "7092" + #define REVISION_NR "7100" #endif // __REVISION_NR_H__ |