From 496451c164af0b2e90c5b7a155a101ed55472e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Date: Wed, 8 Feb 2012 11:49:23 +0100 Subject: [PATCH 1/6] itemdef: handle the !render-to-target case --- src/itemdef.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/itemdef.cpp b/src/itemdef.cpp index aa888bb..22ca9f0 100644 --- a/src/itemdef.cpp +++ b/src/itemdef.cpp @@ -417,7 +417,13 @@ public: light_position, light_color, light_radius); - // Note: might have returned NULL + + // render-to-target didn't work + if(def->inventory_texture == NULL) + { + def->inventory_texture = + tsrc->getTextureRaw(f.tname_tiles[0]); + } } /* From abab3db23d3d6e6fd3d51555ab355110a6e0540f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Date: Wed, 8 Feb 2012 11:49:22 +0100 Subject: [PATCH 2/6] tile: don't duplicate std::string::find_last_of --- src/tile.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/tile.cpp b/src/tile.cpp index bc4c49c..0fa2e10 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -1023,15 +1023,9 @@ video::IImage* generate_image_from_scratch(std::string name, char separator = '^'; // Find last meta separator in name - s32 last_separator_position = -1; - for(s32 i=name.size()-1; i>=0; i--) - { - if(name[i] == separator) - { - last_separator_position = i; - break; - } - } + s32 last_separator_position = name.find_last_of(separator); + //if(last_separator_position == std::npos) + // last_separator_position = -1; /*infostream<<"generate_image_from_scratch(): " <<"last_separator_position="< Date: Wed, 8 Feb 2012 11:49:22 +0100 Subject: [PATCH 3/6] tile: remove redundant warning about failing render-to-target --- src/tile.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/tile.cpp b/src/tile.cpp index 0fa2e10..c39a655 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -1483,8 +1483,6 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg, if(rtt == NULL) { - errorstream<<"generate_image(): render to texture failed." - " Creating fallback image"< Date: Wed, 8 Feb 2012 11:49:21 +0100 Subject: [PATCH 4/6] mesh: warn only once about render-to-target not being supported --- src/mesh.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/mesh.cpp b/src/mesh.cpp index 5afb4af..d0d8b0a 100644 --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -422,8 +422,13 @@ video::ITexture *generateTextureFromMesh(scene::IMesh *mesh, video::IVideoDriver *driver = device->getVideoDriver(); if(driver->queryFeature(video::EVDF_RENDER_TO_TARGET) == false) { - errorstream<<"generateTextureFromMesh(): EVDF_RENDER_TO_TARGET" - " not supported."< Date: Thu, 16 Feb 2012 13:28:25 +0100 Subject: [PATCH 5/6] creative inventory: update to use default:fence_wood --- data/mods/default/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua index d073373..f11b611 100644 --- a/data/mods/default/init.lua +++ b/data/mods/default/init.lua @@ -1647,7 +1647,7 @@ minetest.add_to_creative_inventory('default:cactus') minetest.add_to_creative_inventory('default:papyrus') minetest.add_to_creative_inventory('default:bookshelf') minetest.add_to_creative_inventory('default:glass') -minetest.add_to_creative_inventory('default:fence') +minetest.add_to_creative_inventory('default:fence_wood') minetest.add_to_creative_inventory('default:rail') minetest.add_to_creative_inventory('default:mese') minetest.add_to_creative_inventory('default:chest') From 806f10524f6a2cdcc1f15e12b9991ad726876d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Date: Sat, 11 Feb 2012 03:16:44 +0100 Subject: [PATCH 6/6] server: /give: show the actual stackstring --- data/mods/default/init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua index f11b611..76c07d8 100644 --- a/data/mods/default/init.lua +++ b/data/mods/default/init.lua @@ -1778,6 +1778,9 @@ local function handle_give_command(cmd, giver, receiver, stackstring) else partiality = "partially " end + -- The actual item stack string may be different from what the "giver" + -- entered (e.g. big numbers are always interpreted as 2^16-1). + stackstring = itemstack:to_string() if giver == receiver then minetest.chat_send_player(giver, '"'..stackstring ..'" '..partiality..'added to inventory.');