Remove embedding of colors.txt in executable

.gitignore

@@ -1,4 +1,3 @@
-colors.h
 colors.txt
 minetestmapper
 minetestmapper.exe

CMakeLists.txt

@@ -60,24 +60,6 @@ if(ENABLE_LEVELDB)
 	endif(LEVELDB_LIBRARY AND LEVELDB_INCLUDE_DIR)
 endif(ENABLE_LEVELDB)
 
-# Find xxd
-find_program(XXD_EXECUTABLE xxd)
-
-if (XXD_EXECUTABLE)
-	message(STATUS "Found xxd")
-else (XXD_EXECUTABLE)
-	message(FATAL_ERROR "xxd not found")
-endif (XXD_EXECUTABLE)
-
-# Add command to turn colors.txt into a C header file
-add_custom_command(
-	OUTPUT colors.h
-	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/colors.txt colors.txt
-	COMMAND ${XXD_EXECUTABLE} -i colors.txt colors.h
-	DEPENDS colors.txt
-)
-set_property(SOURCE TileGenerator.cpp APPEND PROPERTY OBJECT_DEPENDS colors.h)
-
 include_directories(
 	"${PROJECT_BINARY_DIR}"
 	"${CMAKE_CURRENT_SOURCE_DIR}"

README.rst

@@ -8,7 +8,6 @@ Requirements
 
 * libgd
 * sqlite3
-* xxd binary (You can get xxd from your distribution packages or use '' wget -O xxd.c http://www.opensource.apple.com/source/vim/vim-43/vim/src/xxd/xxd.c?txt && gcc xxd.c -o xxd '')
 
 Compilation
 -----------
@@ -136,8 +135,3 @@ verbose:
     * number of blocks: in the world, and in the map area.
     * database access statistics.
 
-Customization of colors.txt
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Default `colors.txt` is included in binary. Color definitions can be redefined
-using external `colors.txt` file.

TileGenerator.cpp

@@ -21,7 +21,6 @@
 #include "PlayerAttributes.h"
 #include "TileGenerator.h"
 #include "ZlibDecompressor.h"
-#include "colors.h"
 #include "db-sqlite3.h"
 #if USE_LEVELDB
 #include "db-leveldb.h"
@@ -132,9 +131,6 @@ TileGenerator::TileGenerator():
 	m_tileMapXOffset(0),
 	m_tileMapYOffset(0)
 {
-	string colors_txt_data(reinterpret_cast<char *>(colors_txt), colors_txt_len);
-	istringstream colors_stream(colors_txt_data);
-	parseColorsStream(colors_stream);
 }
 
 TileGenerator::~TileGenerator()