From d15596d1935298707aa40e6139cad954509ffbc2 Mon Sep 17 00:00:00 2001
From: RealBadAngel <mk@realbadangel.pl>
Date: Thu, 8 Nov 2012 18:30:25 +0100
Subject: [PATCH] Adding backgrounds in Formspec

---
 doc/lua_api.txt         | 6 ++++--
 src/guiFormSpecMenu.cpp | 2 ++
 src/guiFormSpecMenu.h   | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 301832618..ed438ccee 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -694,6 +694,10 @@ image[<X>,<Y>;<W>,<H>;<texture name>]
 ^ Show an image
 ^ Position and size units are inventory slots
 
+background[<X>,<Y>;<W>,<H>;<texture name>]
+^ Use a background. When its used inventory rectangles are not drawn.
+^ Position and size units are inventory slots
+
 field[<X>,<Y>;<W>,<H>;<name>;<label>;<default>]
 ^ Textual field; will be sent to server when a button is clicked
 ^ x and y position the field relative to the top left of the menu
@@ -1347,8 +1351,6 @@ Node definition (register_node)
     liquid_alternative_flowing = "", -- Flowing version of source liquid
     liquid_alternative_source = "", -- Source version of flowing liquid
     liquid_viscosity = 0, -- Higher viscosity = slower flow (max. 7)
-    liquid_renewable = true, -- Can new liquid source be created by placing
-    two or more sources nearly?
     light_source = 0, -- Amount of light emitted by node
     damage_per_second = 0, -- If player is inside node, this damage is caused
     node_box = {type="regular"}, -- See "Node boxes"
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index ed0fad58b..7815089b2 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -199,6 +199,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 	
 	m_inventorylists.clear();
 	m_images.clear();
+	m_backgrounds.clear();
 	m_fields.clear();
 
 	Strfnd f(m_formspec_string);
@@ -1289,3 +1290,4 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 
 	return Parent ? Parent->OnEvent(event) : false;
 }
+
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 3033ddc07..890b54d61 100644
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -225,3 +225,4 @@ protected:
 };
 
 #endif
+