diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/game.cpp | 1 | ||||
| -rw-r--r-- | src/guiFurnaceMenu.cpp | 58 | ||||
| -rw-r--r-- | src/guiFurnaceMenu.h | 44 | ||||
| -rw-r--r-- | src/main.cpp | 3 |
5 files changed, 0 insertions, 107 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 64e63e272..e6df823b8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -95,7 +95,6 @@ set(minetest_SRCS keycode.cpp clouds.cpp clientobject.cpp - guiFurnaceMenu.cpp guiMainMenu.cpp guiMessageMenu.cpp guiTextInputMenu.cpp diff --git a/src/game.cpp b/src/game.cpp index c36688d12..d9bbe795e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -25,7 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "guiPasswordChange.h" #include "guiInventoryMenu.h" #include "guiTextInputMenu.h" -#include "guiFurnaceMenu.h" #include "materials.h" #include "config.h" #include "clouds.h" diff --git a/src/guiFurnaceMenu.cpp b/src/guiFurnaceMenu.cpp deleted file mode 100644 index 9a998ce73..000000000 --- a/src/guiFurnaceMenu.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com> - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#include "guiFurnaceMenu.h" -#include "client.h" - -GUIFurnaceMenu::GUIFurnaceMenu( - gui::IGUIEnvironment* env, - gui::IGUIElement* parent, s32 id, - IMenuManager *menumgr, - v3s16 nodepos, - Client *client - ): - GUIInventoryMenu(env, parent, id, menumgr, v2s16(8,9), - client->getInventoryContext(), client), - m_nodepos(nodepos), - m_client(client) -{ - std::string furnace_inv_id; - furnace_inv_id += "nodemeta:"; - furnace_inv_id += itos(nodepos.X); - furnace_inv_id += ","; - furnace_inv_id += itos(nodepos.Y); - furnace_inv_id += ","; - furnace_inv_id += itos(nodepos.Z); - - core::array<GUIInventoryMenu::DrawSpec> draw_spec; - draw_spec.push_back(GUIInventoryMenu::DrawSpec( - "list", furnace_inv_id, "fuel", - v2s32(2, 3), v2s32(1, 1))); - draw_spec.push_back(GUIInventoryMenu::DrawSpec( - "list", furnace_inv_id, "src", - v2s32(2, 1), v2s32(1, 1))); - draw_spec.push_back(GUIInventoryMenu::DrawSpec( - "list", furnace_inv_id, "dst", - v2s32(5, 1), v2s32(2, 2))); - draw_spec.push_back(GUIInventoryMenu::DrawSpec( - "list", "current_player", "main", - v2s32(0, 5), v2s32(8, 4))); - setDrawSpec(draw_spec); -} - diff --git a/src/guiFurnaceMenu.h b/src/guiFurnaceMenu.h deleted file mode 100644 index ccc2e9dc0..000000000 --- a/src/guiFurnaceMenu.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com> - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#ifndef GUIFURNACEMENU_HEADER -#define GUIFURNACEMENU_HEADER - -#include "guiInventoryMenu.h" - -class Client; - -class GUIFurnaceMenu : public GUIInventoryMenu -{ -public: - GUIFurnaceMenu( - gui::IGUIEnvironment* env, - gui::IGUIElement* parent, s32 id, - IMenuManager *menumgr, - v3s16 nodepos, - Client *client - ); -private: - - v3s16 m_nodepos; - Client *m_client; -}; - -#endif - diff --git a/src/main.cpp b/src/main.cpp index 71ab5d037..455e0ac9b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -335,9 +335,6 @@ Misc. stuff: - Finish the ActiveBlockModifier stuff and use it for something
- Move mineral to param2, increment map serialization version, add conversion
-TODO: Create a common interface-whatever-thing to implement custom
- special blocks with an inventory menu
-
Making it more portable:
------------------------
|