src/environment.cpp: Fix NULL pointer dereference

[dragonfireclient.git] / src / clouds.h

diff --git a/src/clouds.h b/src/clouds.h
index a7cde42bc8d7d2317cfd0815cde2b988247ce7bd..195f48de044e32cb121cb97b9afaca8ec31dd406 100644 (file)
--- a/src/clouds.h
+++ b/src/clouds.h
@@ -1,6 +1,6 @@
 /*
-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 Lesser General Public License as published by
@@ -22,6 +22,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes_extrabloated.h"
 #include <iostream>
+#include "constants.h"
+
+// Menu clouds
+class Clouds;
+extern Clouds *g_menuclouds;
+
+// Scene manager used for menu clouds
+namespace irr{namespace scene{class ISceneManager;}}
+extern irr::scene::ISceneManager *g_menucloudsmgr;
 
 class Clouds : public scene::ISceneNode
 {
@@ -30,7 +39,8 @@ class Clouds : public scene::ISceneNode
                        scene::ISceneNode* parent,
                        scene::ISceneManager* mgr,
                        s32 id,
-                       u32 seed
+                       u32 seed,
+                       s16 cloudheight=0
        );
 
        ~Clouds();
@@ -65,16 +75,28 @@ class Clouds : public scene::ISceneNode
        void step(float dtime);
 
        void update(v2f camera_p, video::SColorf color);
+       
+       void updateCameraOffset(v3s16 camera_offset)
+       {
+               m_camera_offset = camera_offset;
+               m_box = core::aabbox3d<f32>(-BS * 1000000, m_cloud_y - BS - BS * camera_offset.Y, -BS * 1000000,
+                       BS * 1000000, m_cloud_y + BS - BS * camera_offset.Y, BS * 1000000);
+       }
+
+       void readSettings();
 
 private:
        video::SMaterial m_material;
        core::aabbox3d<f32> m_box;
+       s16 m_passed_cloud_y;
        float m_cloud_y;
-       float m_brightness;
+       u16 m_cloud_radius_i;
+       bool m_enable_3d;
        video::SColorf m_color;
        u32 m_seed;
        v2f m_camera_pos;
        float m_time;
+       v3s16 m_camera_offset;
 };