Fixed shields and armors resolutions

- Fixed global variable in signs libs - Fixed reolutions for shields and armors
2015-07-30 14:53:23 +02:00 · 2015-07-30 14:53:23 +02:00 · e3cbc98695
parent cdb1150085
commit e3cbc98695
43 changed files with 1 additions and 1 deletions
--- a/mods/3d_armor/3d_armor/textures/3d_armor_boots_bronze.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_boots_bronze.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_boots_cactus.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_boots_cactus.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_boots_crystal.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_boots_crystal.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_boots_diamond.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_boots_diamond.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_boots_gold.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_boots_gold.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_boots_steel.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_boots_steel.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_boots_wood.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_boots_wood.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_bronze.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_bronze.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_cactus.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_cactus.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_crystal.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_crystal.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_diamond.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_diamond.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_gold.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_gold.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_steel.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_steel.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_wood.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_chestplate_wood.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_bronze.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_bronze.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_cactus.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_cactus.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_crystal.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_crystal.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_diamond.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_diamond.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_gold.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_gold.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_steel.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_steel.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_helmet_wood.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_helmet_wood.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_bronze.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_bronze.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_cactus.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_cactus.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_crystal.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_crystal.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_diamond.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_diamond.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_gold.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_gold.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_steel.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_steel.png
--- a/mods/3d_armor/3d_armor/textures/3d_armor_leggings_wood.png
+++ b/mods/3d_armor/3d_armor/textures/3d_armor_leggings_wood.png
--- a/mods/3d_armor/shields/textures/shields_inv_shield_black_mithril_warrior.png
+++ b/mods/3d_armor/shields/textures/shields_inv_shield_black_mithril_warrior.png
--- a/mods/3d_armor/shields/textures/shields_inv_shield_crystal.png
+++ b/mods/3d_armor/shields/textures/shields_inv_shield_crystal.png
--- a/mods/3d_armor/shields/textures/shields_shield_admin.png
+++ b/mods/3d_armor/shields/textures/shields_shield_admin.png
--- a/mods/3d_armor/shields/textures/shields_shield_blackmithril.png
+++ b/mods/3d_armor/shields/textures/shields_shield_blackmithril.png
--- a/mods/3d_armor/shields/textures/shields_shield_bronze.png
+++ b/mods/3d_armor/shields/textures/shields_shield_bronze.png
--- a/mods/3d_armor/shields/textures/shields_shield_cactus.png
+++ b/mods/3d_armor/shields/textures/shields_shield_cactus.png
--- a/mods/3d_armor/shields/textures/shields_shield_crystal.png
+++ b/mods/3d_armor/shields/textures/shields_shield_crystal.png
--- a/mods/3d_armor/shields/textures/shields_shield_diamond.png
+++ b/mods/3d_armor/shields/textures/shields_shield_diamond.png
--- a/mods/3d_armor/shields/textures/shields_shield_enhanced_cactus.png
+++ b/mods/3d_armor/shields/textures/shields_shield_enhanced_cactus.png
--- a/mods/3d_armor/shields/textures/shields_shield_enhanced_wood.png
+++ b/mods/3d_armor/shields/textures/shields_shield_enhanced_wood.png
--- a/mods/3d_armor/shields/textures/shields_shield_gold.png
+++ b/mods/3d_armor/shields/textures/shields_shield_gold.png
--- a/mods/3d_armor/shields/textures/shields_shield_mithril.png
+++ b/mods/3d_armor/shields/textures/shields_shield_mithril.png
--- a/mods/3d_armor/shields/textures/shields_shield_steel.png
+++ b/mods/3d_armor/shields/textures/shields_shield_steel.png
--- a/mods/3d_armor/shields/textures/shields_shield_wood.png
+++ b/mods/3d_armor/shields/textures/shields_shield_wood.png
--- a/mods/homedecor_modpack/signs_lib/init.lua
+++ b/mods/homedecor_modpack/signs_lib/init.lua
@ -437,7 +437,7 @@ signs_lib.update_sign = function(pos, fields, owner)

 	local meta = minetest.get_meta(pos)
 	local stored_text = meta:get_string("text") or ""
-	current_keyword = mki_interact_keyword or current_keyword
+	current_keyword = rawget(_G, "mki_interact_keyword") or current_keyword

 	if fields then -- ...we're editing the sign.
 		if fields.text and string.find(dump(fields.text), "@KEYWORD") then