64bit version

Author: WRIM

Makefile

@@ -10,6 +10,7 @@ OBJECTS_TURBO=$(SOURCES:.cpp=.turbo.o)
 DOBJECTS=$(SOURCES:.cpp=.debug.o)
 OBJECTS64=$(SOURCES:.cpp=.64.o)
 EXECUTABLE=mcmap
+EXECUTABLE64=mcmap64
 
 CFLAGSX11=-O3 -c -Wall -fomit-frame-pointer -pedantic -DWITHPNG -I/usr/local/include -I/usr/X11/include
 LDFLAGSX11=-O3 -lz -lpng -fomit-frame-pointer -L/usr/local/lib -L/usr/X11/lib
@@ -28,7 +29,7 @@ static: $(OBJECTS)
 
 # crosscompile static version for win 64bit (using this one on windows)
 x64: $(OBJECTS64)
-	x86_64-w64-mingw32-g++ $(OBJECTS64) $(LDFLAGS) -m64 -static -o $(EXECUTABLE)
+	x86_64-w64-mingw32-g++ $(OBJECTS64) $(LDFLAGS) -m64 -static -o $(EXECUTABLE64)
 
 # debug, zlib shared
 debug: $(DOBJECTS)

changelog.txt

@@ -2,6 +2,12 @@ mcmap changelog
 Latest version is available at: http://wrim.pl/mcmap/
 ------------------------------------------------------
 
+2.4.2b (dec 1 2013) - Minecraft 1.7.2 compatible
+added:
+-Windows 64bit version
+fixed:
+-small fixes in loading colors
+
 2.4.2 (nov 27 2013) - Minecraft 1.7.2 compatible
 fixed:
 -ignoring empty lines in colors file

colors.cpp

@@ -349,7 +349,7 @@ bool loadColorsFromFile(const char *file)
 			while (*ptr == ' ' || *ptr == '\t') {
 				++ptr;
 			}
-			if (*ptr == '\0' || *ptr == '#') {
+			if (*ptr == '\0' || *ptr == '#' || *ptr == '\12') {
 				printf("Too few arguments for block %d, ignoring line.\n", blockid);
 				valid = false;
 				break;

globals.h

@@ -1,7 +1,7 @@
 #ifndef _GLOBALS_H_
 #define _GLOBALS_H_
 
-#define VERSION "2.4.2 (compatible with Minecraft 1.7.2)"
+#define VERSION "2.4.2b (compatible with Minecraft 1.7.2)"
 
 #include <stdint.h>
 #include <cstdlib>

main.cpp

@@ -268,7 +268,7 @@ int main(int argc, char **argv)
 	// ########## end of command line parsing ##########
 	if (g_Hell || g_ServerHell || end) g_UseBiomes = false;
 
-	printf("mcmap " VERSION " by Zahl\n");
+	printf("mcmap " VERSION " %dbit by Zahl\n", 8*sizeof(size_t));
 
 	if (sizeof(size_t) < 8 && memlimit > 1800 * uint64_t(1024 * 1024)) {
 		memlimit = 1800 * uint64_t(1024 * 1024);
@@ -1104,7 +1104,7 @@ void printHelp(char *binary)
 	printf(
 	   ////////////////////////////////////////////////////////////////////////////////
 	   "\nmcmap by Zahl - an isometric minecraft map rendering tool.\n"
-	   "Version " VERSION "\n\n"
+	   "Version " VERSION " %dbit\n\n"
 	   "Usage: %s [-from X Z -to X Z] [-night] [-cave] [-noise VAL] [...] WORLDPATH\n\n"
 	   "  -from X Z     sets the coordinate of the chunk to start rendering at\n"
 	   "  -to X Z       sets the coordinate of the chunk to end rendering at\n"
@@ -1157,5 +1157,5 @@ void printHelp(char *binary)
 	   "  - This would render the same world but at night, and only\n"
 	   "    from chunk (-10 -10) to chunk (10 10)\n"
 #endif
-	   , binary, binary, binary);
+	   , 8*sizeof(size_t), binary, binary, binary);
 }