Move min/max mapblock defines to config.h, and rename them

This commit is contained in:
Rogier 2014-05-06 16:27:09 +02:00
parent c692d3d652
commit d57ce63c46
3 changed files with 10 additions and 10 deletions

View File

@ -101,12 +101,12 @@ TileGenerator::TileGenerator():
m_zMax(INT_MIN/16+1), m_zMax(INT_MIN/16+1),
m_yMin(INT_MAX/16-1), m_yMin(INT_MAX/16-1),
m_yMax(INT_MIN/16+1), m_yMax(INT_MIN/16+1),
m_reqXMin(MINETEST_MAPBLOCK_MIN), m_reqXMin(MAPBLOCK_MIN),
m_reqXMax(MINETEST_MAPBLOCK_MAX), m_reqXMax(MAPBLOCK_MAX),
m_reqYMin(MINETEST_MAPBLOCK_MIN), m_reqYMin(MAPBLOCK_MIN),
m_reqYMax(MINETEST_MAPBLOCK_MAX), m_reqYMax(MAPBLOCK_MAX),
m_reqZMin(MINETEST_MAPBLOCK_MIN), m_reqZMin(MAPBLOCK_MIN),
m_reqZMax(MINETEST_MAPBLOCK_MAX), m_reqZMax(MAPBLOCK_MAX),
m_reqYMinNode(0), m_reqYMinNode(0),
m_reqYMaxNode(15), m_reqYMaxNode(15),
m_mapXStartNodeOffset(0), m_mapXStartNodeOffset(0),

View File

@ -25,9 +25,6 @@
#include "Color.h" #include "Color.h"
#include "db.h" #include "db.h"
#define MINETEST_MAPBLOCK_MIN (-2048)
#define MINETEST_MAPBLOCK_MAX 2047
#define TILECENTER_IS_WORLDCENTER INT_MAX #define TILECENTER_IS_WORLDCENTER INT_MAX
#define TILECENTER_IS_MAPCENTER INT_MIN #define TILECENTER_IS_MAPCENTER INT_MIN

View File

@ -14,6 +14,9 @@
#endif #endif
#define BLOCK_SIZE 16 #define BLOCK_SIZE 16
#define MAPBLOCK_MIN (-2048)
#define MAPBLOCK_MAX 2047
#ifdef USE_CMAKE_CONFIG_H #ifdef USE_CMAKE_CONFIG_H
#include "cmake_config.h" #include "cmake_config.h"