Added network protocol version number in protocol

[dragonfireclient.git] / src / environment.cpp

diff --git a/src/environment.cpp b/src/environment.cpp
index df41dc63f24fc40feb39300b772853bd5799ce49..e9b94f3fa8928be5ee820442e39a51186f64a7d6 100644 (file)
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -543,11 +543,11 @@ void spawnRandomObjects(MapBlock *block)
                {
                        v3s16 p(x0,y0,z0);
                        MapNode n = block->getNodeNoEx(p);
-                       if(n.d == CONTENT_IGNORE)
+                       if(n.getContent() == CONTENT_IGNORE)
                                continue;
-                       if(content_features(n.d).liquid_type != LIQUID_NONE)
+                       if(content_features(n).liquid_type != LIQUID_NONE)
                                continue;
-                       if(content_features(n.d).walkable)
+                       if(content_features(n).walkable)
                        {
                                last_node_walkable = true;
                                continue;
@@ -555,7 +555,7 @@ void spawnRandomObjects(MapBlock *block)
                        if(last_node_walkable)
                        {
                                // If block contains light information
-                               if(content_features(n.d).param_type == CPT_LIGHT)
+                               if(content_features(n).param_type == CPT_LIGHT)
                                {
                                        if(n.getLight(LIGHTBANK_DAY) <= 5)
                                        {
@@ -624,15 +624,15 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
 #if 1
                // Test something:
                // Convert all mud under proper day lighting to grass
-               if(n.d == CONTENT_MUD)
+               if(n.getContent() == CONTENT_MUD)
                {
                        if(dtime_s > 300)
                        {
                                MapNode n_top = block->getNodeNoEx(p0+v3s16(0,1,0));
-                               if(content_features(n_top.d).air_equivalent &&
+                               if(content_features(n_top).air_equivalent &&
                                                n_top.getLight(LIGHTBANK_DAY) >= 13)
                                {
-                                       n.d = CONTENT_GRASS;
+                                       n.setContent(CONTENT_GRASS);
                                        m_map->addNodeWithEvent(p, n);
                                }
                        }
@@ -686,9 +686,9 @@ void ServerEnvironment::step(float dtime)
                        v3s16 bottompos = floatToInt(playerpos + v3f(0,-BS/4,0), BS);
                        try{
                                MapNode n = m_map->getNode(bottompos);
-                               if(n.d == CONTENT_GRASS)
+                               if(n.getContent() == CONTENT_GRASS)
                                {
-                                       n.d = CONTENT_GRASS_FOOTSTEPS;
+                                       n.setContent(CONTENT_GRASS_FOOTSTEPS);
                                        m_map->setNode(bottompos, n);
                                }
                        }
@@ -816,7 +816,7 @@ void ServerEnvironment::step(float dtime)
        if(m_active_blocks_test_interval.step(dtime, 10.0))
        {
                //float dtime = 10.0;
-
+               
                for(core::map<v3s16, bool>::Iterator
                                i = m_active_blocks.m_list.getIterator();
                                i.atEnd()==false; i++)
@@ -846,6 +846,21 @@ void ServerEnvironment::step(float dtime)
                                searching loop to keep things fast.
                        */
                        // TODO: Implement usage of ActiveBlockModifier
+                       
+                       // Find out how many objects the block contains
+                       u32 active_object_count = block->m_static_objects.m_active.size();
+                       // Find out how many objects this and all the neighbors contain
+                       u32 active_object_count_wider = 0;
+                       for(s16 x=-1; x<=1; x++)
+                       for(s16 y=-1; y<=1; y++)
+                       for(s16 z=-1; z<=1; z++)
+                       {
+                               MapBlock *block = m_map->getBlockNoCreateNoEx(p+v3s16(x,y,z));
+                               if(block==NULL)
+                                       continue;
+                               active_object_count_wider +=
+                                               block->m_static_objects.m_active.size();
+                       }
 
                        v3s16 p0;
                        for(p0.X=0; p0.X<MAP_BLOCKSIZE; p0.X++)
@@ -859,15 +874,15 @@ void ServerEnvironment::step(float dtime)
                                        Test something:
                                        Convert mud under proper lighting to grass
                                */
-                               if(n.d == CONTENT_MUD)
+                               if(n.getContent() == CONTENT_MUD)
                                {
                                        if(myrand()%20 == 0)
                                        {
-                                               MapNode n_top = block->getNodeNoEx(p0+v3s16(0,1,0));
-                                               if(content_features(n_top.d).air_equivalent &&
+                                               MapNode n_top = m_map->getNodeNoEx(p+v3s16(0,1,0));
+                                               if(content_features(n_top).air_equivalent &&
                                                                n_top.getLightBlend(getDayNightRatio()) >= 13)
                                                {
-                                                       n.d = CONTENT_GRASS;
+                                                       n.setContent(CONTENT_GRASS);
                                                        m_map->addNodeWithEvent(p, n);
                                                }
                                        }
@@ -875,19 +890,39 @@ void ServerEnvironment::step(float dtime)
                                /*
                                        Convert grass into mud if under something else than air
                                */
-                               else if(n.d == CONTENT_GRASS)
+                               if(n.getContent() == CONTENT_GRASS)
                                {
                                        //if(myrand()%20 == 0)
                                        {
-                                               MapNode n_top = block->getNodeNoEx(p0+v3s16(0,1,0));
-                                               if(n_top.d != CONTENT_AIR
-                                                               && n_top.d != CONTENT_IGNORE)
+                                               MapNode n_top = m_map->getNodeNoEx(p+v3s16(0,1,0));
+                                               if(content_features(n_top).air_equivalent == false)
                                                {
-                                                       n.d = CONTENT_MUD;
+                                                       n.setContent(CONTENT_MUD);
                                                        m_map->addNodeWithEvent(p, n);
                                                }
                                        }
                                }
+                               /*
+                                       Rats spawn around regular trees
+                               */
+                               if(n.getContent() == CONTENT_TREE ||
+                                               n.getContent() == CONTENT_JUNGLETREE)
+                               {
+                                       if(myrand()%200 == 0 && active_object_count_wider == 0)
+                                       {
+                                               v3s16 p1 = p + v3s16(myrand_range(-2, 2),
+                                                               0, myrand_range(-2, 2));
+                                               MapNode n1 = m_map->getNodeNoEx(p1);
+                                               MapNode n1b = m_map->getNodeNoEx(p1+v3s16(0,-1,0));
+                                               if(n1b.getContent() == CONTENT_GRASS &&
+                                                               n1.getContent() == CONTENT_AIR)
+                                               {
+                                                       v3f pos = intToFloat(p1, BS);
+                                                       ServerActiveObject *obj = new RatSAO(this, 0, pos);
+                                                       addActiveObject(obj);
+                                               }
+                                       }
+                        }
                        }
                }
        }
@@ -1633,9 +1668,9 @@ void ClientEnvironment::step(float dtime)
                        v3s16 bottompos = floatToInt(playerpos + v3f(0,-BS/4,0), BS);
                        try{
                                MapNode n = m_map->getNode(bottompos);
-                               if(n.d == CONTENT_GRASS)
+                               if(n.getContent() == CONTENT_GRASS)
                                {
-                                       n.d = CONTENT_GRASS_FOOTSTEPS;
+                                       n.setContent(CONTENT_GRASS_FOOTSTEPS);
                                        m_map->setNode(bottompos, n);
                                        // Update mesh on client
                                        if(m_map->mapType() == MAPTYPE_CLIENT)
@@ -1874,7 +1909,7 @@ void ClientEnvironment::drawPostFx(video::IVideoDriver* driver, v3f camera_pos)
        v3f pos_f = camera_pos;
        v3s16 p_nodes = floatToInt(pos_f, BS);
        MapNode n = m_map->getNodeNoEx(p_nodes);
-       if(n.d == CONTENT_WATER || n.d == CONTENT_WATERSOURCE)
+       if(n.getContent() == CONTENT_WATER || n.getContent() == CONTENT_WATERSOURCE)
        {
                v2u32 ss = driver->getScreenSize();
                core::rect<s32> rect(0,0, ss.X, ss.Y);