Skip to content

Commit c6e8234

Browse files
committed
iron trapdoor support
1 parent 4e34b5b commit c6e8234

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

changelog.txt

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ mcmap changelog
22
Latest version is available at: http://wrim.pl/mcmap/
33
------------------------------------------------------
44

5+
2.4.2e (feb 20 2014) - snapshot 14w08a compatible (MC 1.7.4)
6+
added:
7+
-iron trapdoor
8+
59
2.4.2d (jan 31 2014) - snapshot 14w05a compatible (MC 1.7.4)
610
added:
711
-barrier block support (previous recognized as yellow glass pane)

globals.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _GLOBALS_H_
22
#define _GLOBALS_H_
33

4-
#define VERSION "2.4.2d (compatible with Minecraft 1.7.4)"
4+
#define VERSION "2.4.2e (compatible with Minecraft 1.7.4)"
55

66
#include <stdint.h>
77
#include <cstdlib>

worldloader.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@ static void loadBiomeChunk(const char* path, const int chunkX, const int chunkZ)
10311031
static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int &x, int &y, int &z, uint8_t* &justData)
10321032
{
10331033
if (block == WOOL || block == LOG || block == LEAVES || block == STEP || block == DOUBLESTEP || block == WOOD || block == WOODEN_STEP || block == WOODEN_DOUBLE_STEP
1034-
|| block == 95 || block == 160 || block == 159 || block == 171 || block == 38 || block == 175 || block == SAND || block == 153 || block == 166
1034+
|| block == 95 || block == 160 || block == 159 || block == 171 || block == 38 || block == 175 || block == SAND || block == 153 || block == 166 || block == 167
10351035
|| block == 141 || block == 142 || block == 158 || block == 149 || block == 157
10361036
|| block == 131 || block == 132 || block == 150 || block == 147 || block == 148 || block == 68 || block == 69 || block == 70
10371037
|| block == 72 || block == 77 || block == 143 || block == 36) { //three last lines contains colors for carpets
@@ -1054,6 +1054,8 @@ static inline void assignBlock(const uint8_t &block, uint8_t* &targetBlock, int
10541054
*targetBlock++ = 87;
10551055
} else if (block == 157) { //activator rail -> detector rail
10561056
*targetBlock++ = 28;
1057+
} else if (block == 167) { //iron trapdoor -> wooden trapdoor
1058+
*targetBlock++ = 96;
10571059
} else if (block == LEAVES) {
10581060
if ((col & 0x3) != 0) { // Map to pine or birch
10591061
*targetBlock++ = 228 + (col & 0x3);

0 commit comments

Comments
 (0)