diff options
| -rw-r--r-- | src/common/Collision/Management/MMapManager.cpp | 2 | ||||
| -rw-r--r-- | src/common/Collision/Maps/MMapDefines.h (renamed from src/common/Collision/Maps/MapDefines.h) | 6 | ||||
| -rw-r--r-- | src/server/game/Movement/PathGenerator.h | 2 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 2 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/TerrainBuilder.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp index e33ebf99c54..fc5f013a310 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapManager.cpp @@ -18,7 +18,7 @@ #include "MMapManager.h" #include "Errors.h" #include "Log.h" -#include "MapDefines.h" +#include "MMapDefines.h" namespace MMAP { diff --git a/src/common/Collision/Maps/MapDefines.h b/src/common/Collision/Maps/MMapDefines.h index d433b381cc8..185eee7a935 100644 --- a/src/common/Collision/Maps/MapDefines.h +++ b/src/common/Collision/Maps/MMapDefines.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _MAPDEFINES_H -#define _MAPDEFINES_H +#ifndef MMapDefines_h__ +#define MMapDefines_h__ #include "Define.h" #include "DetourNavMesh.h" @@ -64,4 +64,4 @@ enum NavTerrainFlag NAV_MAGMA_SLIME = 1 << (63 - NAV_AREA_MAGMA_SLIME) }; -#endif /* _MAPDEFINES_H */ +#endif // MMapDefines_h__ diff --git a/src/server/game/Movement/PathGenerator.h b/src/server/game/Movement/PathGenerator.h index 8109579dfbc..0030b62c62e 100644 --- a/src/server/game/Movement/PathGenerator.h +++ b/src/server/game/Movement/PathGenerator.h @@ -18,9 +18,9 @@ #ifndef _PATH_GENERATOR_H #define _PATH_GENERATOR_H -#include "MapDefines.h" #include "DetourNavMesh.h" #include "DetourNavMeshQuery.h" +#include "MMapDefines.h" #include "MoveSplineInitArgs.h" #include <G3D/Vector3.h> diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index fcf3f104ead..2bbdcd23c0e 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -16,8 +16,8 @@ */ #include "MapBuilder.h" -#include "MapDefines.h" #include "MapTree.h" +#include "MMapDefines.h" #include "ModelInstance.h" #include "PathCommon.h" #include "StringFormat.h" diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index 17b9d75ea0c..c9f0638fb1a 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -17,8 +17,8 @@ #include "TerrainBuilder.h" #include "MapBuilder.h" -#include "MapDefines.h" #include "MapTree.h" +#include "MMapDefines.h" #include "ModelInstance.h" #include "VMapFactory.h" #include "VMapManager2.h" |