diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-21 11:51:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 11:51:29 +0200 |
| commit | 1425c6def156840b359b90b4f32b9c7b8f005731 (patch) | |
| tree | 0390ed5ad9bcf481416061446f859b3f48955422 /src/touchscreengui.cpp | |
| parent | 12aad731adef495dec03f384d10b4f8f57b6a1d3 (diff) | |
| download | hax-minetest-server-1425c6def156840b359b90b4f32b9c7b8f005731.tar.gz hax-minetest-server-1425c6def156840b359b90b4f32b9c7b8f005731.zip | |
Cpp11 initializers: last src root changeset (#6022)
* Cpp11 initializers: last src root changeset
Finish to migrate all src root folder files to C++11 constructor initializers
Diffstat (limited to 'src/touchscreengui.cpp')
| -rw-r--r-- | src/touchscreengui.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp index 0139b8c4f..9a1ef4086 100644 --- a/src/touchscreengui.cpp +++ b/src/touchscreengui.cpp @@ -130,19 +130,10 @@ static void load_button_texture(button_info* btn, const char* path, AutoHideButtonBar::AutoHideButtonBar(IrrlichtDevice *device, IEventReceiver* receiver) : - m_texturesource(NULL), m_driver(device->getVideoDriver()), m_guienv(device->getGUIEnvironment()), - m_receiver(receiver), - m_active(false), - m_visible(true), - m_timeout(0), - m_timeout_value(3), - m_initialized(false), - m_dir(AHBB_Dir_Right_Left) + m_receiver(receiver) { - m_screensize = device->getVideoDriver()->getScreenSize(); - } void AutoHideButtonBar::init(ISimpleTextureSource* tsrc, @@ -416,16 +407,7 @@ void AutoHideButtonBar::show() TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver* receiver): m_device(device), m_guienv(device->getGUIEnvironment()), - m_camera_yaw_change(0.0), - m_camera_pitch(0.0), - m_visible(false), - m_move_id(-1), m_receiver(receiver), - m_move_has_really_moved(false), - m_move_downtime(0), - m_move_sent_as_mouse_event(false), - // use some downlocation way off screen as init value to avoid invalid behaviour - m_move_downlocation(v2s32(-10000, -10000)), m_settingsbar(device, receiver), m_rarecontrolsbar(device, receiver) { @@ -474,8 +456,6 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc) u32 button_size = getGuiButtonSize(); m_visible = true; m_texturesource = tsrc; - m_control_pad_rect = rect<s32>(0, m_screensize.Y - 3 * button_size, - 3 * button_size, m_screensize.Y); /* draw control pad 0 1 2 |