LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge branch 'master' into rendermode-options

Browse Source
This commit is contained in:
Aaron Griffith
2011-06-12 22:25:59 -04:00
parent bdee438060 13c9750a43
commit a0d1cd45d9
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/rendermode-normal.c
View File

@@ -165,6 +165,7 @@ static void
rendermode_normal_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObject *mask_light) { rendermode_normal_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObject *mask_light) {
RenderModeNormal *self = (RenderModeNormal *)data; RenderModeNormal *self = (RenderModeNormal *)data;
int randx = 0,randy = 0; int randx = 0,randy = 0;
unsigned char data_byte;
/* first, check to see if we should use biome-compatible src, mask */ /* first, check to see if we should use biome-compatible src, mask */
if (self->biome_data) { if (self->biome_data) {
@@ -176,10 +177,10 @@ rendermode_normal_draw(void *data, RenderState *state, PyObject *src, PyObject *
randy = rand() % 6 + 1 - 3; randy = rand() % 6 + 1 - 3;
state->imgx = state->imgx + randx; state->imgx = state->imgx + randx;
state->imgy = state->imgy + randy; state->imgy = state->imgy + randy;
unsigned char data = getArrayByte3D(state->blockdata_expanded, state->x, state->y, state->z); data_byte = getArrayByte3D(state->blockdata_expanded, state->x, state->y, state->z);
if (data == 1) { if (data_byte == 1) {
src = mask = self->tall_grass_texture; src = mask = self->tall_grass_texture;
} else if (data == 2) { } else if (data_byte == 2) {
src = mask = self->tall_fern_texture; src = mask = self->tall_fern_texture;
} }
} }

4
world.py
View File

@@ -209,7 +209,9 @@ class World(object):
## The filename of this chunk ## The filename of this chunk
chunkFile = self.get_region_path(chunkX, chunkY) chunkFile = self.get_region_path(chunkX, chunkY)
if chunkFile is not None:
data = nbt.load_from_region(chunkFile, chunkX, chunkY)[1] data = nbt.load_from_region(chunkFile, chunkX, chunkY)[1]
if data is not None:
level = data['Level'] level = data['Level']
blockArray = numpy.frombuffer(level['Blocks'], dtype=numpy.uint8).reshape((16,16,128)) blockArray = numpy.frombuffer(level['Blocks'], dtype=numpy.uint8).reshape((16,16,128))
@@ -224,7 +226,7 @@ class World(object):
break break
self.POI.append( dict(x=spawnX, y=spawnY, z=spawnZ, self.POI.append( dict(x=spawnX, y=spawnY, z=spawnZ,
msg="Spawn", type="spawn", chunk=(inChunkX,inChunkZ))) msg="Spawn", type="spawn", chunk=(chunkX, chunkY)))
self.spawn = (spawnX, spawnY, spawnZ) self.spawn = (spawnX, spawnY, spawnZ)
def go(self, procs): def go(self, procs):