From a9940c2ccf3cdbb5a93f719dcb6720eef2cae752 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Sun, 22 May 2011 23:56:57 +0100 Subject: [PATCH 1/3] Allow default privileges for new players to be set in the server config --- src/server.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server.cpp b/src/server.cpp index 5c03ea8f..9b4ee1fa 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -4185,6 +4185,9 @@ Player *Server::emergePlayer(const char *name, const char *password, u16 peer_id player->updateName(name); player->updatePassword(password); + if(g_settings.exists("default_privs")) + player->privs = g_settings.getU64("default_privs"); + /* Set player position */ From 8bbc512fe58d36ba1c89ec0160cf3390f25e4cc1 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Mon, 23 May 2011 20:40:25 +0100 Subject: [PATCH 2/3] Added 'shout' player privilege --- src/player.cpp | 4 ++++ src/player.h | 19 ++++++++++++------- src/server.cpp | 32 +++++++++++++++++++------------- 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/player.cpp b/src/player.cpp index 12f18de7..147b6c97 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -36,6 +36,8 @@ std::wstring privsToString(u64 privs) os<privs; + if(g_settings.get("name") == player->getName()) + privs = PRIV_ALL; + // Parse commands std::wstring commandprefix = L"/#"; if(message.substr(0, commandprefix.size()) == commandprefix) @@ -2916,12 +2922,6 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) message = message.substr(commandprefix.size()); - // Local player gets all privileges regardless of - // what's set on their account. - u64 privs = player->privs; - if(g_settings.get("name") == player->getName()) - privs = PRIV_ALL; - ServerCommandContext *ctx = new ServerCommandContext( str_split(message, L' '), this, @@ -2937,13 +2937,19 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) } else { - line += L"<"; - /*if(is_operator) - line += L"@";*/ - line += name; - line += L"> "; - line += message; - send_to_others = true; + if(privs & PRIV_SHOUT) + { + line += L"<"; + line += name; + line += L"> "; + line += message; + send_to_others = true; + } + else + { + line += L"Server: You are not allowed to shout"; + send_to_sender = true; + } } if(line != L"") From c5e583e059bc31c0dc57496b23f5c97db1f5a3e3 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 24 May 2011 17:52:04 +0100 Subject: [PATCH 3/3] Added fences (but still needs an icon or something to display in inventory) --- src/mapblock.cpp | 132 ++++++++++++++++++++++++++++++++++++++++++++++ src/mapnode.cpp | 7 +++ src/mapnode.h | 1 + src/materials.cpp | 1 + src/server.cpp | 18 +++++++ 5 files changed, 159 insertions(+) diff --git a/src/mapblock.cpp b/src/mapblock.cpp index d62928ce..c448ef23 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -729,6 +729,72 @@ private: core::array m_prebuffers; }; +void makeCuboid(video::SMaterial &material, MeshCollector *collector, + AtlasPointer* pa, video::SColor &c, + v3f &pos, f32 rx, f32 ry, f32 rz) +{ + video::S3DVertex v[4] = + { + video::S3DVertex(0,0,0, 0,0,0, c, + pa->x0(), pa->y1()), + video::S3DVertex(0,0,0, 0,0,0, c, + pa->x1(), pa->y1()), + video::S3DVertex(0,0,0, 0,0,0, c, + pa->x1(), pa->y0()), + video::S3DVertex(0,0,0, 0,0,0, c, + pa->x0(), pa->y0()) + }; + + for(int i=0;i<6;i++) + { + switch(i) + { + case 0: + v[0].Pos.X=-rx; v[0].Pos.Y= ry; v[0].Pos.Z=-rz; + v[1].Pos.X=-rx; v[1].Pos.Y= ry; v[1].Pos.Z= rz; + v[2].Pos.X= rx; v[2].Pos.Y= ry; v[2].Pos.Z= rz; + v[3].Pos.X= rx; v[3].Pos.Y= ry, v[3].Pos.Z=-rz; + break; + case 1: + v[0].Pos.X=-rx; v[0].Pos.Y= ry; v[0].Pos.Z=-rz; + v[1].Pos.X= rx; v[1].Pos.Y= ry; v[1].Pos.Z=-rz; + v[2].Pos.X= rx; v[2].Pos.Y=-ry; v[2].Pos.Z=-rz; + v[3].Pos.X=-rx; v[3].Pos.Y=-ry, v[3].Pos.Z=-rz; + break; + case 2: + v[0].Pos.X= rx; v[0].Pos.Y= ry; v[0].Pos.Z=-rz; + v[1].Pos.X= rx; v[1].Pos.Y= ry; v[1].Pos.Z= rz; + v[2].Pos.X= rx; v[2].Pos.Y=-ry; v[2].Pos.Z= rz; + v[3].Pos.X= rx; v[3].Pos.Y=-ry, v[3].Pos.Z=-rz; + break; + case 3: + v[0].Pos.X= rx; v[0].Pos.Y= ry; v[0].Pos.Z= rz; + v[1].Pos.X=-rx; v[1].Pos.Y= ry; v[1].Pos.Z= rz; + v[2].Pos.X=-rx; v[2].Pos.Y=-ry; v[2].Pos.Z= rz; + v[3].Pos.X= rx; v[3].Pos.Y=-ry, v[3].Pos.Z= rz; + break; + case 4: + v[0].Pos.X=-rx; v[0].Pos.Y= ry; v[0].Pos.Z= rz; + v[1].Pos.X=-rx; v[1].Pos.Y= ry; v[1].Pos.Z=-rz; + v[2].Pos.X=-rx; v[2].Pos.Y=-ry; v[2].Pos.Z=-rz; + v[3].Pos.X=-rx; v[3].Pos.Y=-ry, v[3].Pos.Z= rz; + break; + case 5: + v[0].Pos.X= rx; v[0].Pos.Y=-ry; v[0].Pos.Z= rz; + v[1].Pos.X=-rx; v[1].Pos.Y=-ry; v[1].Pos.Z= rz; + v[2].Pos.X=-rx; v[2].Pos.Y=-ry; v[2].Pos.Z=-rz; + v[3].Pos.X= rx; v[3].Pos.Y=-ry, v[3].Pos.Z=-rz; + break; + } + for(u16 i=0; i<4; i++) + v[i].Pos += pos; + u16 indices[] = {0,1,2,2,3,0}; + collector->append(material, v, 4, indices, 6); + + } + +} + scene::SMesh* makeMapBlockMesh(MeshMakeData *data) { // 4-21ms for MAP_BLOCKSIZE=16 @@ -911,6 +977,15 @@ scene::SMesh* makeMapBlockMesh(MeshMakeData *data) g_texturesource->getTextureId("glass.png")); material_glass.setTexture(0, pa_glass.atlas); + // Wood material + video::SMaterial material_wood; + material_wood.setFlag(video::EMF_LIGHTING, false); + material_wood.setFlag(video::EMF_BILINEAR_FILTER, false); + material_wood.setFlag(video::EMF_FOG_ENABLE, true); + material_wood.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; + AtlasPointer pa_wood = g_texturesource->getTexture( + g_texturesource->getTextureId("wood.png")); + material_wood.setTexture(0, pa_wood.atlas); for(s16 z=0; zm_daynight_ratio))); + video::SColor c(255,l,l,l); + + const f32 post_rad=(f32)BS/10; + const f32 bar_rad=(f32)BS/20; + const f32 bar_len=(f32)(BS/2)-post_rad; + + // The post - always present + v3f pos = intToFloat(p+blockpos_nodes, BS); + makeCuboid(material_wood, &collector, + &pa_wood, c, pos, + post_rad,BS/2,post_rad); + + // Now a section of fence, +X, if there's a post there + v3s16 p2 = p; + p2.X++; + MapNode n2 = data->m_vmanip.getNodeNoEx(blockpos_nodes + p2); + if(n2.d == CONTENT_FENCE) + { + pos = intToFloat(p+blockpos_nodes, BS); + pos.X += BS/2; + pos.Y += BS/4; + makeCuboid(material_wood, &collector, + &pa_wood, c, pos, + bar_len,bar_rad,bar_rad); + + pos.Y -= BS/2; + makeCuboid(material_wood, &collector, + &pa_wood, c, pos, + bar_len,bar_rad,bar_rad); + } + + // Now a section of fence, +Z, if there's a post there + p2 = p; + p2.Z++; + n2 = data->m_vmanip.getNodeNoEx(blockpos_nodes + p2); + if(n2.d == CONTENT_FENCE) + { + pos = intToFloat(p+blockpos_nodes, BS); + pos.Z += BS/2; + pos.Y += BS/4; + makeCuboid(material_wood, &collector, + &pa_wood, c, pos, + bar_rad,bar_rad,bar_len); + pos.Y -= BS/2; + makeCuboid(material_wood, &collector, + &pa_wood, c, pos, + bar_rad,bar_rad,bar_len); + + } + + } diff --git a/src/mapnode.cpp b/src/mapnode.cpp index 00ebef84..199a5c65 100644 --- a/src/mapnode.cpp +++ b/src/mapnode.cpp @@ -216,6 +216,13 @@ void init_mapnode() f->solidness = 0; // drawn separately, makes no faces f->setInventoryTextureCube("glass.png", "glass.png", "glass.png"); + i = CONTENT_FENCE; + f = &g_content_features[i]; + f->light_propagates = true; + f->param_type = CPT_LIGHT; + f->is_ground_content = true; + f->dug_item = std::string("MaterialItem ")+itos(i)+" 1"; + f->solidness = 0; // drawn separately, makes no faces // Deprecated i = CONTENT_COALSTONE; diff --git a/src/mapnode.h b/src/mapnode.h index 5a177023..50b257ba 100644 --- a/src/mapnode.h +++ b/src/mapnode.h @@ -100,6 +100,7 @@ void init_content_inventory_texture_paths(); #define CONTENT_COBBLE 18 #define CONTENT_STEEL 19 #define CONTENT_GLASS 20 +#define CONTENT_FENCE 21 /* Content feature list diff --git a/src/materials.cpp b/src/materials.cpp index e5f0c3b9..841f1d65 100644 --- a/src/materials.cpp +++ b/src/materials.cpp @@ -73,6 +73,7 @@ void initializeMaterialProperties() setWoodLikeDiggingProperties(CONTENT_TREE, 1.0); setWoodLikeDiggingProperties(CONTENT_LEAVES, 0.15); setWoodLikeDiggingProperties(CONTENT_GLASS, 0.15); + setWoodLikeDiggingProperties(CONTENT_FENCE, 0.75); setWoodLikeDiggingProperties(CONTENT_WOOD, 0.75); setWoodLikeDiggingProperties(CONTENT_CHEST, 1.0); diff --git a/src/server.cpp b/src/server.cpp index 6a4fe3c0..75b47e49 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3670,6 +3670,23 @@ void Server::UpdateCrafting(u16 peer_id) } } + // Fence + if(!found) + { + ItemSpec specs[9]; + specs[4] = ItemSpec(ITEM_CRAFT, "Stick"); + specs[5] = ItemSpec(ITEM_CRAFT, "Stick"); + specs[6] = ItemSpec(ITEM_CRAFT, "Stick"); + specs[7] = ItemSpec(ITEM_CRAFT, "Stick"); + specs[8] = ItemSpec(ITEM_CRAFT, "Stick"); + specs[9] = ItemSpec(ITEM_CRAFT, "Stick"); + if(checkItemCombination(items, specs)) + { + rlist->addItem(new MaterialItem(CONTENT_FENCE, 2)); + found = true; + } + } + // Sign if(!found) { @@ -4046,6 +4063,7 @@ void setCreativeInventory(Player *player) CONTENT_TREE, CONTENT_LEAVES, CONTENT_GLASS, + CONTENT_FENCE, CONTENT_MESE, CONTENT_WATERSOURCE, CONTENT_CLOUD,