BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

ClientActiveObject::debugInfoText()

Browse Source
This commit is contained in:
Perttu Ahola 2012-03-09 20:28:55 +02:00
parent f60a5ec08f
commit 8c01ad8a9d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/clientobject.h
View File

@ -65,6 +65,7 @@ public:
virtual void processMessage(const std::string &data){} virtual void processMessage(const std::string &data){}
virtual std::string infoText() {return "";} virtual std::string infoText() {return "";}
virtual std::string debugInfoText() {return "";}
/* /*
This takes the return value of This takes the return value of

8
src/game.cpp
View File

@ -959,7 +959,7 @@ void the_game(
// Object infos are shown in this // Object infos are shown in this
gui::IGUIStaticText *guitext_info = guienv->addStaticText( gui::IGUIStaticText *guitext_info = guienv->addStaticText(
L"", L"",
core::rect<s32>(0,0,400,text_height+5) + v2s32(100,200), core::rect<s32>(0,0,400,text_height*5+5) + v2s32(100,200),
false, false); false, false);
// Status text (displays info when showing and hiding GUI stuff, etc.) // Status text (displays info when showing and hiding GUI stuff, etc.)
@ -2069,6 +2069,10 @@ void the_game(
{ {
infotext = narrow_to_wide(selected_object->infoText()); infotext = narrow_to_wide(selected_object->infoText());
if(infotext == L"" && show_debug){
infotext = narrow_to_wide(selected_object->debugInfoText());
}
//if(input->getLeftClicked()) //if(input->getLeftClicked())
if(input->getLeftState()) if(input->getLeftState())
{ {
@ -2292,7 +2296,7 @@ void the_game(
{ {
guitext_info->setText(infotext.c_str()); guitext_info->setText(infotext.c_str());
guitext_info->setVisible(show_hud); guitext_info->setVisible(show_hud && g_menumgr.menuCount() == 0);
} }
{ {