From 84f919ac6a3eb097aa860e957b4dd9aca0ffbc97 Mon Sep 17 00:00:00 2001 From: Aaron Griffith Date: Thu, 21 Mar 2013 14:30:44 -0400 Subject: [PATCH] overviewer now pulls fire/lava/water textures from the right place fixes issue #910 --- overviewer_core/textures.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 33ec396..72db9c4 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -261,7 +261,7 @@ class Textures(object): watertexture = self.load_image("custom_water_still.png") watertexture = watertexture.crop((0, 0, watertexture.size[0], watertexture.size[0])) except TextureException: - watertexture = self.load_image("water.png") + watertexture = self.load_image_texture("textures/blocks/water.png") self.watertexture = watertexture return watertexture @@ -276,7 +276,7 @@ class Textures(object): lavatexture = self.load_image("custom_lava_still.png") lavatexture = lavatexture.crop((0, 0, lavatexture.size[0], lavatexture.size[0])) except TextureException: - lavatexture = self.load_image("lava.png") + lavatexture = self.load_image_texture("textures/blocks/lava.png") self.lavatexture = lavatexture return lavatexture @@ -294,8 +294,9 @@ class Textures(object): firetextureEW = firetextureEW.crop((0, 0, firetextureEW.size[0], firetextureEW.size[0])) firetexture = (firetextureNS,firetextureEW) except TextureException: - fire = self.load_image("fire.png") - firetexture = (fire, fire) + fireNS = self.load_image_texture("textures/blocks/fire_0.png") + fireEW = self.load_image_texture("textures/blocks/fire_1.png") + firetexture = (fireNS, fireEW) self.firetexture = firetexture return firetexture @@ -310,7 +311,7 @@ class Textures(object): portaltexture = self.load_image("custom_portal.png") portaltexture = portaltexture.crop((0, 0, portaltexture.size[0], portaltexture.size[1])) except TextureException: - portaltexture = self.load_image("portal.png") + portaltexture = self.load_image_texture("textures/blocks/portal.png") self.portaltexture = portaltexture return portaltexture