Merge remote branch 'origin/master'

[minetest.git] / src / clouds.h

diff --git a/src/clouds.h b/src/clouds.h
index 59861371efd221c5e84a663cd1603e6619b8dff3..72923c2c5e9e19e3f0967039c4a984bbd2f31c03 100644 (file)
--- a/src/clouds.h
+++ b/src/clouds.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CLOUDS_HEADER
 #define CLOUDS_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include <iostream>
 
 class Clouds : public scene::ISceneNode
@@ -30,7 +30,6 @@ class Clouds : public scene::ISceneNode
                        scene::ISceneNode* parent,
                        scene::ISceneManager* mgr,
                        s32 id,
-                       float cloud_y,
                        u32 seed
        );
 
@@ -65,13 +64,14 @@ class Clouds : public scene::ISceneNode
 
        void step(float dtime);
 
-       void update(v2f camera_p, float brightness);
+       void update(v2f camera_p, video::SColorf color);
 
 private:
        video::SMaterial m_material;
        core::aabbox3d<f32> m_box;
        float m_cloud_y;
        float m_brightness;
+       video::SColorf m_color;
        u32 m_seed;
        v2f m_camera_pos;
        float m_time;