From fd7a0735c9aeaa7978190049319e3cdfe48920a4 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 10 Apr 2011 04:15:10 +0300
Subject: new object system

---
 src/main.cpp | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index d3f979cac..7749266d9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2620,10 +2620,8 @@ int main(int argc, char *argv[])
 			if(g_input->getLeftClicked())
 			{
 				std::cout<<DTIME<<"Left-clicked object"<<std::endl;
-#if 0
-				client.clickObject(0, selected_object->getBlock()->getPos(),
-						selected_object->getId(), g_selected_item);
-#endif
+				client.clickActiveObject(0,
+						selected_active_object->getId(), g_selected_item);
 			}
 			else if(g_input->getRightClicked())
 			{
@@ -2634,26 +2632,6 @@ int main(int argc, char *argv[])
 				*/
 				if(selected_object->getTypeId() == MAPBLOCKOBJECT_TYPE_SIGN)
 				{
-					dstream<<"Sign object right-clicked"<<std::endl;
-					
-					if(random_input == false)
-					{
-						// Get a new text for it
-
-						TextDest *dest = new TextDestSign(
-								selected_object->getBlock()->getPos(),
-								selected_object->getId(),
-								&client);
-
-						SignObject *sign_object = (SignObject*)selected_object;
-
-						std::wstring wtext =
-								narrow_to_wide(sign_object->getText());
-
-						(new GUITextInputMenu(guienv, guiroot, -1,
-								&g_menumgr, dest,
-								wtext))->drop();
-					}
 				}
 				/*
 					Otherwise pass the event to the server as-is
-- 
cgit v1.2.3