From d57ce63c467c29f46dca7860a173fba2e704b921 Mon Sep 17 00:00:00 2001 From: Rogier Date: Tue, 6 May 2014 16:27:09 +0200 Subject: [PATCH] Move min/max mapblock defines to config.h, and rename them --- TileGenerator.cpp | 12 ++++++------ TileGenerator.h | 3 --- config.h | 5 ++++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/TileGenerator.cpp b/TileGenerator.cpp index f3466ac..a958437 100644 --- a/TileGenerator.cpp +++ b/TileGenerator.cpp @@ -101,12 +101,12 @@ TileGenerator::TileGenerator(): m_zMax(INT_MIN/16+1), m_yMin(INT_MAX/16-1), m_yMax(INT_MIN/16+1), - m_reqXMin(MINETEST_MAPBLOCK_MIN), - m_reqXMax(MINETEST_MAPBLOCK_MAX), - m_reqYMin(MINETEST_MAPBLOCK_MIN), - m_reqYMax(MINETEST_MAPBLOCK_MAX), - m_reqZMin(MINETEST_MAPBLOCK_MIN), - m_reqZMax(MINETEST_MAPBLOCK_MAX), + m_reqXMin(MAPBLOCK_MIN), + m_reqXMax(MAPBLOCK_MAX), + m_reqYMin(MAPBLOCK_MIN), + m_reqYMax(MAPBLOCK_MAX), + m_reqZMin(MAPBLOCK_MIN), + m_reqZMax(MAPBLOCK_MAX), m_reqYMinNode(0), m_reqYMaxNode(15), m_mapXStartNodeOffset(0), diff --git a/TileGenerator.h b/TileGenerator.h index 46289b4..053ed09 100644 --- a/TileGenerator.h +++ b/TileGenerator.h @@ -25,9 +25,6 @@ #include "Color.h" #include "db.h" -#define MINETEST_MAPBLOCK_MIN (-2048) -#define MINETEST_MAPBLOCK_MAX 2047 - #define TILECENTER_IS_WORLDCENTER INT_MAX #define TILECENTER_IS_MAPCENTER INT_MIN diff --git a/config.h b/config.h index f7536a2..2fa35e4 100644 --- a/config.h +++ b/config.h @@ -13,7 +13,10 @@ #define PATH_SEPARATOR '/' #endif -#define BLOCK_SIZE 16 +#define BLOCK_SIZE 16 +#define MAPBLOCK_MIN (-2048) +#define MAPBLOCK_MAX 2047 + #ifdef USE_CMAKE_CONFIG_H #include "cmake_config.h"