LocalPlayer::accelerateHorizontal: cleanups

[oweals/minetest.git] / src / guiFormSpecMenu.cpp

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 85d9ef48ad912c52e7aa43fe880d3d41924e80d9..a2a336b8471419176501eb749be269051ae3cc04 100644 (file)
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -36,6 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IGUIFont.h>
 #include <IGUITabControl.h>
 #include <IGUIComboBox.h>
+#include "client/renderingengine.h"
 #include "log.h"
 #include "client/tile.h" // ITextureSource
 #include "hud.h" // drawItemStack
@@ -78,14 +79,11 @@ static unsigned int font_line_height(gui::IGUIFont *font)
        return font->getDimension(L"Ay").Height + font->getKerningHeight();
 }
 
-GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
-               JoystickController *joystick,
-               gui::IGUIElement* parent, s32 id, IMenuManager *menumgr,
-               Client *client,
-               ISimpleTextureSource *tsrc, IFormSource* fsrc, TextDest* tdst,
+GUIFormSpecMenu::GUIFormSpecMenu(JoystickController *joystick,
+               gui::IGUIElement *parent, s32 id, IMenuManager *menumgr,
+               Client *client, ISimpleTextureSource *tsrc, IFormSource *fsrc, TextDest *tdst,
                bool remap_dbl_click) :
-       GUIModalMenu(dev->getGUIEnvironment(), parent, id, menumgr),
-       m_device(dev),
+       GUIModalMenu(RenderingEngine::get_gui_env(), parent, id, menumgr),
        m_invmgr(client),
        m_tsrc(tsrc),
        m_client(client),
@@ -2004,7 +2002,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 
        // Add tooltip
        {
-               assert(m_tooltip_element == NULL);
+               assert(!m_tooltip_element);
                // Note: parent != this so that the tooltip isn't clipped by the menu rectangle
                m_tooltip_element = addStaticText(Environment, L"",core::rect<s32>(0,0,110,18));
                m_tooltip_element->enableOverrideColor(true);
@@ -2054,7 +2052,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
        if (mydata.explicit_size) {
                // compute scaling for specified form size
                if (m_lock) {
-                       v2u32 current_screensize = m_device->getVideoDriver()->getScreenSize();
+                       v2u32 current_screensize = RenderingEngine::get_video_driver()->getScreenSize();
                        v2u32 delta = current_screensize - m_lockscreensize;
 
                        if (current_screensize.Y > m_lockscreensize.Y)
@@ -2075,7 +2073,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                }
 
                double gui_scaling = g_settings->getFloat("gui_scaling");
-               double screen_dpi = porting::getDisplayDensity() * 96;
+               double screen_dpi = RenderingEngine::getDisplayDensity() * 96;
 
                double use_imgsize;
                if (m_lock) {
@@ -2108,7 +2106,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
                                ((5.0/4.0) * (0.5 + mydata.invsize.X));
                        double fity_imgsize = mydata.screensize.Y /
                                ((15.0/13.0) * (0.85 * mydata.invsize.Y));
-                       double screen_dpi = porting::getDisplayDensity() * 96;
+                       double screen_dpi = RenderingEngine::getDisplayDensity() * 96;
                        double min_imgsize = 0.3 * screen_dpi * gui_scaling;
                        use_imgsize = MYMAX(min_imgsize, MYMIN(prefer_imgsize,
                                MYMIN(fitx_imgsize, fity_imgsize)));
@@ -2157,7 +2155,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
        m_tooltip_element->setOverrideFont(m_font);
 
        gui::IGUISkin* skin = Environment->getSkin();
-       sanity_check(skin != NULL);
+       sanity_check(skin);
        gui::IGUIFont *old_font = skin->getFont();
        skin->setFont(m_font);
 
@@ -2579,7 +2577,7 @@ void GUIFormSpecMenu::drawMenu()
 
 /* TODO find way to show tooltips on touchscreen */
 #ifndef HAVE_TOUCHSCREENGUI
-       m_pointer = m_device->getCursorControl()->getPosition();
+       m_pointer = RenderingEngine::get_raw_device()->getCursorControl()->getPosition();
 #endif
 
        /*
@@ -3282,7 +3280,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
                        return true;
                } else if (m_client != NULL && event.KeyInput.PressedDown &&
                                (kp == getKeySetting("keymap_screenshot"))) {
-                       m_client->makeScreenshot(m_device);
+                       m_client->makeScreenshot();
                }
                if (event.KeyInput.PressedDown &&
                        (event.KeyInput.Key==KEY_RETURN ||
@@ -3528,7 +3526,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 
                // Possibly send inventory action to server
                if (move_amount > 0) {
-                       // Send IACTION_MOVE
+                       // Send IAction::Move
 
                        assert(m_selected_item && m_selected_item->isValid());
                        assert(s.isValid());
@@ -3565,7 +3563,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
                                m_selected_content_guess = ItemStack(); // Clear
                        }
 
-                       infostream << "Handing IACTION_MOVE to manager" << std::endl;
+                       infostream << "Handing IAction::Move to manager" << std::endl;
                        IMoveAction *a = new IMoveAction();
                        a->count = move_amount;
                        a->from_inv = m_selected_item->inventoryloc;
@@ -3601,7 +3599,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
                                ItemStack stack_from = list_from->getItem(s.i);
                                assert(shift_move_amount <= stack_from.count);
                                if (m_client->getProtoVersion() >= 25) {
-                                       infostream << "Handing IACTION_MOVE to manager" << std::endl;
+                                       infostream << "Handing IAction::Move to manager" << std::endl;
                                        IMoveAction *a = new IMoveAction();
                                        a->count = shift_move_amount;
                                        a->from_inv = s.inventoryloc;
@@ -3619,7 +3617,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
                                                        && shift_move_amount > 0; slot_to++) {
                                                list_to->itemFits(slot_to, stack_from, &leftover);
                                                if (leftover.count < stack_from.count) {
-                                                       infostream << "Handing IACTION_MOVE to manager" << std::endl;
+                                                       infostream << "Handing IAction::Move to manager" << std::endl;
                                                        IMoveAction *a = new IMoveAction();
                                                        a->count = MYMIN(shift_move_amount,
                                                                (u32) (stack_from.count - leftover.count));
@@ -3639,7 +3637,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
                } else if (drop_amount > 0) {
                        m_selected_content_guess = ItemStack(); // Clear
 
-                       // Send IACTION_DROP
+                       // Send IAction::Drop
 
                        assert(m_selected_item && m_selected_item->isValid());
                        assert(inv_selected);
@@ -3652,7 +3650,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
                        assert(drop_amount > 0 && drop_amount <= m_selected_amount);
                        m_selected_amount -= drop_amount;
 
-                       infostream << "Handing IACTION_DROP to manager" << std::endl;
+                       infostream << "Handing IAction::Drop to manager" << std::endl;
                        IDropAction *a = new IDropAction();
                        a->count = drop_amount;
                        a->from_inv = m_selected_item->inventoryloc;
@@ -3662,12 +3660,12 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
                } else if (craft_amount > 0) {
                        m_selected_content_guess = ItemStack(); // Clear
 
-                       // Send IACTION_CRAFT
+                       // Send IAction::Craft
 
                        assert(s.isValid());
                        assert(inv_s);
 
-                       infostream << "Handing IACTION_CRAFT to manager" << std::endl;
+                       infostream << "Handing IAction::Craft to manager" << std::endl;
                        ICraftAction *a = new ICraftAction();
                        a->count = craft_amount;
                        a->craft_inv = s.inventoryloc;