Write common mapgen params to map_meta.txt on world initialization

[dragonfireclient.git] / src / content_cso.cpp

diff --git a/src/content_cso.cpp b/src/content_cso.cpp
index 73d5f2b480f47d3e181f9cabc55a02c4ba70b8b4..4779b20d1262fb7a218c35013a2a1934ee627d9e 100644 (file)
--- a/src/content_cso.cpp
+++ b/src/content_cso.cpp
@@ -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()->getTextureRaw("smoke_puff.png"));
+                               env->getGameDef()->tsrc()->getTexture("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);
        }