Corrections for 2.4.2c

Author: WRIM

changelog.txt

@@ -2,6 +2,10 @@ mcmap changelog
 Latest version is available at: http://wrim.pl/mcmap/
 ------------------------------------------------------
 
+2.4.2c (jan 10 2014) - snapshot 14w02a compatible (MC 1.7.4)
+added:
+-slime block
+
 2.4.2b (dec 1 2013) - Minecraft 1.7.2 compatible
 added:
 -Windows 64bit version

colors.cpp

@@ -239,6 +239,7 @@ void loadColors()
 	SETCOLOR(174, 159, 189, 239, 255 ); //packed ice
 	SETCOLOR(175, 0, 255, 0, 254 ); //Large flower
 	SETCOLOR(206, 54, 24, 30, 255 ); //nether bricks slab
+	SETCOLOR(165, 61, 255, 61, 96  ); //slime block
 
 	// carpets
 	SETCOLOR(36 ,  255, 255, 255,  254   ); //White carpet
@@ -299,7 +300,7 @@ void loadColors()
 	SETCOLOR(185,   32,  27,  27,  40   ); //Black Stained Glass [pane]
 
 	// flowers
-	SETCOLOR(165, 120, 158, 241, 254   ); //BLUE_ORCHID 165
+//	SETCOLOR(165, 120, 158, 241, 254   ); //BLUE_ORCHID 165
 	SETCOLOR(176, 200,  75, 210, 254 ); //ALLIUM 176
 	SETCOLOR(235, 168, 172, 172, 254 ); //AZURE_BLUET 235
 	// 38, 173  44  40 254, ); //RED_TULIP 38

colors.h

@@ -108,7 +108,8 @@ bool loadBiomeColors(const char* path);
 #define BIRCHLEAVES 230
 #define JUNGLELEAVES 231
 
-#define BLUE_ORCHID 165
+#define BLUE_ORCHID 176
+//165
 #define ALLIUM 176
 #define AZURE_BLUET 235
 #define RED_TULIP 38

colors.txt

@@ -22,6 +22,7 @@
 174	 159	 189	 239	 255 	 0	# packed ice
 175	   0	 255	   0	 254	 0	# Large flower
 206	  54	  24	  30	 255 	 0	# nether bricks slab
+165	  61	 255	  61	  96 	 0	# slime block
 
 # carpets
 36   255 255 255  254   0	# White carpet
@@ -82,8 +83,7 @@
 185   32  27  27  40   0	# Black Stained Glass [pane]
 
 # flowers
-165	 120 158 241 254	 0	# BLUE_ORCHID 165
-176	 200  75 210 254	 0	# ALLIUM 176
+176	 200  75 210 254	 0	# BLUE_ORCHID / ALLIUM 176
 235	 168 172 172 254	 0	# AZURE_BLUET 235
 # 38	 173  44  40 254	 0	# RED_TULIP 38
 217	 244 137  54 254	 0	# ORANGE_TULIP 217

globals.h

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

worldloader.cpp

@@ -1216,13 +1216,13 @@ static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int
 				*targetBlock++ = 200 + col;
 			}
 		} else if (block == WOODEN_STEP) {
-			if (col != 0) {
+			if (col != 0 && col < 4) {
 				*targetBlock++ = 213 + col;
 			} else {
 				*targetBlock++ = block;
 			}
 		} else if (block == WOOD || block == WOODEN_DOUBLE_STEP) {
-			if (col != 0) {
+			if (col != 0 && col < 4) {
 				*targetBlock++ = 225 + (col & 0x3);
 			} else {
 				*targetBlock++ = block;