LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge remote-tracking branches 'tswsl1989/biomesoverlay', 'socolin/patch-2', 'tswsl1989/upstream', 'counterpillow/ffscalefix' and 'maruohon/log-rotation-fix'

Browse Source
This commit is contained in:
Aaron Griffith
2012-09-14 22:36:34 -04:00
parent 34d0058efe 4c29cf453d ca0ec868ac ccf99fb61d 32b50c0550
commit 2b5de2f2de
7 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
overviewer_core/src/overviewer.h
View File

@@ -136,7 +136,7 @@ extern unsigned int max_blockid;
extern unsigned int max_data;
extern unsigned char *block_properties;
static inline int
block_has_property(unsigned char b, BlockProperty prop) {
block_has_property(unsigned short b, BlockProperty prop) {
if (b >= max_blockid || !(block_properties[b] & (1 << KNOWN))) {
/* block is unknown, return defaults */
if (prop == TRANSPARENT)