X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_cso.cpp;h=0790024fc9623f0319ac3523ae5c9d96452f4851;hb=ecc514f11b77690bc1d2d782c8f00a9b045b4f4f;hp=4f652a8a3127ffd8845363a370aba769e6485c73;hpb=8161ab573fd6f8a45b3986278ce7fc1596140526;p=dragonfireclient.git

diff --git a/src/content_cso.cpp b/src/content_cso.cpp
index 4f652a8a3..0790024fc 100644
--- a/src/content_cso.cpp
+++ b/src/content_cso.cpp
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "content_cso.h"
 #include <IBillboardSceneNode.h>
-#include "tile.h"
+#include "client/tile.h"
 #include "environment.h"
 #include "gamedef.h"
 #include "log.h"
@@ -50,7 +50,7 @@ class SmokePuffCSO: public ClientSimpleObject
 		m_spritenode = smgr->addBillboardSceneNode(
 				NULL, v2f(1,1), pos, -1);
 		m_spritenode->setMaterialTexture(0,
-				env->getGameDef()->tsrc()->getTexture("smoke_puff.png"));
+				env->getGameDef()->tsrc()->getTextureForMesh("smoke_puff.png"));
 		m_spritenode->setMaterialFlag(video::EMF_LIGHTING, false);
 		m_spritenode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false);
 		//m_spritenode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF);
@@ -60,13 +60,12 @@ class SmokePuffCSO: public ClientSimpleObject
 		m_spritenode->setVisible(true);
 		m_spritenode->setSize(size);
 		/* Update brightness */
-		u8 light = 64;
-		try{
-			MapNode n = env->getMap().getNode(floatToInt(pos, BS));
-			light = decode_light(n.getLightBlend(env->getDayNightRatio(),
-					env->getGameDef()->ndef()));
-		}
-		catch(InvalidPositionException &e){}
+		u8 light;
+		bool pos_ok;
+		MapNode n = env->getMap().getNodeNoEx(floatToInt(pos, BS), &pos_ok);
+		light = pos_ok ? decode_light(n.getLightBlend(env->getDayNightRatio(),
+							env->getGameDef()->ndef()))
+		               : 64;
 		video::SColor color(255,light,light,light);
 		m_spritenode->setColor(color);
 	}