Pre-select current game in world creation dialog

[dragonfireclient.git] / src / nodedef.cpp

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 7f6c8a054a7354b9a2f87737e353ede6aafcb190..ba3e42e980a36e9901183533c3d2f1aff6db11d5 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "nameidmapping.h"
 #include "util/serialize.h"
+//#include "profiler.h" // For TimeTaker
 
 /*
        NodeBox
@@ -275,9 +276,9 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version)
        serializeSimpleSoundSpec(sound_footstep, os);
        serializeSimpleSoundSpec(sound_dig, os);
        serializeSimpleSoundSpec(sound_dug, os);
+       writeU8(os, rightclickable);
        // Stuff below should be moved to correct place in a version that otherwise changes
        // the protocol version
-       writeU8(os, rightclickable);
 }
 
 void ContentFeatures::deSerialize(std::istream &is)
@@ -336,12 +337,12 @@ void ContentFeatures::deSerialize(std::istream &is)
        deSerializeSimpleSoundSpec(sound_footstep, is);
        deSerializeSimpleSoundSpec(sound_dig, is);
        deSerializeSimpleSoundSpec(sound_dug, is);
+       rightclickable = readU8(is);
        // If you add anything here, insert it primarily inside the try-catch
        // block to not need to increase the version.
        try{
                // Stuff below should be moved to correct place in a version that
                // otherwise changes the protocol version
-               rightclickable = readU8(is);
        }catch(SerializationError &e) {};
 }
 
@@ -452,6 +453,7 @@ class CNodeDefManager: public IWritableNodeDefManager
        virtual void getIds(const std::string &name, std::set<content_t> &result)
                        const
        {
+               //TimeTaker t("getIds", NULL, PRECISION_MICRO);
                if(name.substr(0,6) != "group:"){
                        content_t id = CONTENT_IGNORE;
                        if(getId(name, id))
@@ -459,6 +461,20 @@ class CNodeDefManager: public IWritableNodeDefManager
                        return;
                }
                std::string group = name.substr(6);
+
+#if 1  // Optimized version, takes less than 1 microsecond at -O1
+               std::map<std::string, GroupItems>::const_iterator
+                       i = m_group_to_items.find(group);
+               if (i == m_group_to_items.end())
+                       return;
+
+               const GroupItems &items = i->second;
+               for (GroupItems::const_iterator j = items.begin();
+                       j != items.end(); ++j) {
+                       if ((*j).second != 0)
+                               result.insert((*j).first);
+               }
+#else  // Old version, takes about ~150-200us at -O1
                for(u16 id=0; id<=MAX_CONTENT; id++)
                {
                        const ContentFeatures &f = m_content_features[id];
@@ -467,6 +483,8 @@ class CNodeDefManager: public IWritableNodeDefManager
                        if(itemgroup_get(f.groups, group) != 0)
                                result.insert(id);
                }
+#endif
+               //printf("getIds: %dus\n", t.stop());
        }
        virtual const ContentFeatures& get(const std::string &name) const
        {
@@ -498,6 +516,21 @@ class CNodeDefManager: public IWritableNodeDefManager
                m_content_features[c] = def;
                if(def.name != "")
                        addNameIdMapping(c, def.name);
+
+               // Add this content to the list of all groups it belongs to
+               for (ItemGroupList::const_iterator i = def.groups.begin();
+                       i != def.groups.end(); ++i) {
+                       std::string group_name = i->first;
+                       
+                       std::map<std::string, GroupItems>::iterator
+                               j = m_group_to_items.find(group_name);
+                       if (j == m_group_to_items.end()) {
+                               m_group_to_items[group_name].push_back(std::make_pair(c, i->second));
+                       } else {
+                               GroupItems &items = j->second;
+                               items.push_back(std::make_pair(c, i->second));
+                       }
+               }
        }
        virtual content_t set(const std::string &name,
                        const ContentFeatures &def)
@@ -560,7 +593,7 @@ class CNodeDefManager: public IWritableNodeDefManager
                        {
                                tiledef[j] = f->tiledef[j];
                                if(tiledef[j].name == "")
-                                       tiledef[j].name = "unknown_block.png";
+                                       tiledef[j].name = "unknown_node.png";
                        }
 
                        bool is_liquid = false;
@@ -595,6 +628,10 @@ class CNodeDefManager: public IWritableNodeDefManager
                                f->solidness = 0;
                                f->visual_solidness = 1;
                                break;
+                       case NDT_GLASSLIKE_FRAMED:
+                               f->solidness = 0;
+                               f->visual_solidness = 1;
+                               break;
                        case NDT_ALLFACES:
                                f->solidness = 0;
                                f->visual_solidness = 1;
@@ -625,15 +662,11 @@ class CNodeDefManager: public IWritableNodeDefManager
                                break;
                        }
 
-                       u8 material_type = 0;
-                       if(is_liquid){
-                               if(f->alpha == 255)
-                                       material_type = TILE_MATERIAL_LIQUID_OPAQUE;
-                               else
-                                       material_type = TILE_MATERIAL_LIQUID_TRANSPARENT;
-                       } else{
-                               material_type = TILE_MATERIAL_BASIC;
-                       }
+                       u8 material_type;
+                       if (is_liquid)
+                               material_type = (f->alpha == 255) ? TILE_MATERIAL_LIQUID_OPAQUE : TILE_MATERIAL_LIQUID_TRANSPARENT;
+                       else
+                               material_type = (f->alpha == 255) ? TILE_MATERIAL_BASIC : TILE_MATERIAL_ALPHA;
 
                        // Tiles (fill in f->tiles[])
                        for(u16 j=0; j<6; j++){
@@ -787,6 +820,10 @@ class CNodeDefManager: public IWritableNodeDefManager
        // item aliases too. Updated by updateAliases()
        // Note: Not serialized.
        std::map<std::string, content_t> m_name_id_mapping_with_aliases;
+       // A mapping from groups to a list of content_ts (and their levels)
+       // that belong to it.  Necessary for a direct lookup in getIds().
+       // Note: Not serialized.
+       std::map<std::string, GroupItems> m_group_to_items;
 };
 
 IWritableNodeDefManager* createNodeDefManager()