Commented out debug statements again

[oweals/minetest.git] / src / environment.cpp

diff --git a/src/environment.cpp b/src/environment.cpp
index e293eb511f3ac0ddebdcce429582bebd218d66de..80f41f9fd44905dfc6673b00c1d82853e64f30ed 100644 (file)
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -1191,7 +1191,7 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
                delete object;
                return 0;
        }
-       /*dstream<<"INGO: ServerEnvironment::addActiveObjectRaw(): "
+       /*dstream<<"INFO: ServerEnvironment::addActiveObjectRaw(): "
                        <<"added (id="<<object->getId()<<")"<<std::endl;*/
                        
        m_active_objects.insert(object->getId(), object);
@@ -1512,6 +1512,11 @@ void ClientEnvironment::step(float dtime)
                Get the speed the player is going
        */
        bool is_climbing = lplayer->is_climbing;
+       
+       /*
+               Check if the player is frozen (don't apply physics)
+       */
+       bool is_frozen = lplayer->is_frozen;
 
        f32 player_speed = 0.001; // just some small value
        player_speed = lplayer->getSpeed().getLength();
@@ -1570,7 +1575,7 @@ void ClientEnvironment::step(float dtime)
                        v3f lplayerpos = lplayer->getPosition();
                        
                        // Apply physics
-                       if(free_move == false && is_climbing == false)
+                       if(free_move == false && is_climbing == false && is_frozen == false)
                        {
                                // Gravity
                                v3f speed = lplayer->getSpeed();
@@ -1632,6 +1637,38 @@ void ClientEnvironment::step(float dtime)
                }
        }
        
+       /*
+               A quick draft of lava damage
+       */
+       if(m_lava_hurt_interval.step(dtime, 1.0))
+       {
+               v3f pf = lplayer->getPosition();
+               
+               // Feet, middle and head
+               v3s16 p1 = floatToInt(pf + v3f(0, BS*0.1, 0), BS);
+               MapNode n1 = m_map->getNodeNoEx(p1);
+               v3s16 p2 = floatToInt(pf + v3f(0, BS*0.8, 0), BS);
+               MapNode n2 = m_map->getNodeNoEx(p2);
+               v3s16 p3 = floatToInt(pf + v3f(0, BS*1.6, 0), BS);
+               MapNode n3 = m_map->getNodeNoEx(p2);
+
+               u32 damage_per_second = 0;
+               damage_per_second = MYMAX(damage_per_second,
+                               content_features(n1).damage_per_second);
+               damage_per_second = MYMAX(damage_per_second,
+                               content_features(n2).damage_per_second);
+               damage_per_second = MYMAX(damage_per_second,
+                               content_features(n3).damage_per_second);
+               
+               if(damage_per_second != 0)
+               {
+                       ClientEnvEvent event;
+                       event.type = CEE_PLAYER_DAMAGE;
+                       event.player_damage.amount = damage_per_second;
+                       m_client_event_queue.push_back(event);
+               }
+       }
+       
        /*
                Stuff that can be done in an arbitarily large dtime
        */
@@ -1792,7 +1829,7 @@ u16 ClientEnvironment::addActiveObject(ClientActiveObject *object)
                delete object;
                return 0;
        }
-       dstream<<"INGO: ClientEnvironment::addActiveObject(): "
+       dstream<<"INFO: ClientEnvironment::addActiveObject(): "
                        <<"added (id="<<object->getId()<<")"<<std::endl;
        m_active_objects.insert(object->getId(), object);
        object->addToScene(m_smgr);
@@ -1903,22 +1940,6 @@ ClientEnvEvent ClientEnvironment::getClientEvent()
        return m_client_event_queue.pop_front();
 }
 
-void ClientEnvironment::drawPostFx(video::IVideoDriver* driver, v3f camera_pos)
-{
-       /*LocalPlayer *player = getLocalPlayer();
-       assert(player);
-       v3f pos_f = player->getPosition() + v3f(0,BS*1.625,0);*/
-       v3f pos_f = camera_pos;
-       v3s16 p_nodes = floatToInt(pos_f, BS);
-       MapNode n = m_map->getNodeNoEx(p_nodes);
-       if(n.getContent() == CONTENT_WATER || n.getContent() == CONTENT_WATERSOURCE)
-       {
-               v2u32 ss = driver->getScreenSize();
-               core::rect<s32> rect(0,0, ss.X, ss.Y);
-               driver->draw2DRectangle(video::SColor(64, 100, 100, 200), rect);
-       }
-}
-
 #endif // #ifndef SERVER