Improved Killaura and Chat position

This commit is contained in:
Elias Fleckenstein 2020-07-26 15:35:02 +02:00
parent 678559bb63
commit 344fddc172
5 changed files with 55 additions and 2 deletions

View File

@ -2511,7 +2511,6 @@ void Game::handleKillaura(v3f origin, f32 max_d)
continue;
PointedThing pointed(id, v3f(0,0,0), v3s16(0,0,0), 0);
client->interact(INTERACT_START_DIGGING, pointed);
break;
}
}

View File

@ -223,7 +223,7 @@ void GameUI::setChatText(const EnrichedString &chat_text, u32 recent_chat_count)
const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
s32 chat_y = window_size.Y - 100 - m_guitext_chat->getTextHeight();
s32 chat_y = window_size.Y - 150 - m_guitext_chat->getTextHeight();
if (m_flags.show_debug)
chat_y += 2 * g_fontengine->getLineHeight();

View File

@ -6,6 +6,7 @@ set(gui_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/guiButtonImage.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiButtonItemImage.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiChatConsole.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiCheatMenu.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiConfirmRegistration.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiEditBoxWithScrollbar.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiEngine.cpp

19
src/gui/guiCheatMenu.cpp Normal file
View File

@ -0,0 +1,19 @@
/*
Dragonfire
Copyright (C) 2020 Elias Fleckenstein <eliasfleckenstein@web.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
You should have received a copy of the GNU Lesser 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.
*/

34
src/gui/guiCheatMenu.h Normal file
View File

@ -0,0 +1,34 @@
/*
Dragonfire
Copyright (C) 2020 Elias Fleckenstein <eliasfleckenstein@web.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
You should have received a copy of the GNU Lesser 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.
*/
#pragma once
#include "irrlichttypes_extrabloated.h"
#include "modalMenu.h"
#include "config.h"
class GUICheatMenuEntry : public gui::IGUIElement
{
GUICheatMenu(gui::IGUIEnvironment* env,
gui::IGUIElement* parent,
s32 id,
Client* client,
IMenuManager* menumgr);
};