From d6b2c2829c09439860bc546a0f3fa113001bc7bd Mon Sep 17 00:00:00 2001 From: danij Date: Fri, 7 Nov 2014 16:50:16 +0000 Subject: [PATCH] Refactor|InputSystem|Client: Renamed input related source files following organization changes --- doomsday/client/client.pro | 8 ++-- doomsday/client/include/de_base.h | 12 ++---- doomsday/client/include/de_play.h | 2 +- doomsday/client/include/ui/b_main.h | 2 +- doomsday/client/include/ui/b_util.h | 2 +- doomsday/client/include/ui/commandbinding.h | 2 +- .../include/ui/{dd_input.h => ddevent.h} | 19 ++------- doomsday/client/include/ui/infine/finale.h | 2 +- .../include/ui/infine/finaleinterpreter.h | 2 +- doomsday/client/include/ui/inputdebug.h | 39 +++++++++++++++++++ doomsday/client/include/ui/inputsystem.h | 6 +-- .../ui/{p_control.h => playerimpulse.h} | 2 +- doomsday/client/include/ui/ui_main.h | 6 +-- doomsday/client/include/ui/widgetactions.h | 5 ++- doomsday/client/src/dd_main.cpp | 2 +- doomsday/client/src/network/net_main.cpp | 21 ++++------ doomsday/client/src/ui/b_main.cpp | 2 +- doomsday/client/src/ui/bindcontext.cpp | 2 +- .../src/ui/{dd_input.cpp => inputdebug.cpp} | 19 ++++----- doomsday/client/src/ui/inputsystem.cpp | 11 +++--- .../ui/{p_control.cpp => playerimpulse.cpp} | 4 +- doomsday/client/src/ui/widgets/gamewidget.cpp | 5 ++- .../src/ui/widgets/keygrabberwidget.cpp | 2 +- doomsday/server/server.pro | 4 +- 24 files changed, 100 insertions(+), 81 deletions(-) rename doomsday/client/include/ui/{dd_input.h => ddevent.h} (92%) create mode 100644 doomsday/client/include/ui/inputdebug.h rename doomsday/client/include/ui/{p_control.h => playerimpulse.h} (98%) rename doomsday/client/src/ui/{dd_input.cpp => inputdebug.cpp} (98%) rename doomsday/client/src/ui/{p_control.cpp => playerimpulse.cpp} (99%) diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro index 55e8b7cf7e..f872a8b29f 100644 --- a/doomsday/client/client.pro +++ b/doomsday/client/client.pro @@ -357,7 +357,7 @@ DENG_HEADERS += \ include/ui/clientwindowsystem.h \ include/ui/commandaction.h \ include/ui/commandbinding.h \ - include/ui/dd_input.h \ + include/ui/ddevent.h \ include/ui/dialogs/aboutdialog.h \ include/ui/dialogs/alertdialog.h \ include/ui/dialogs/audiosettingsdialog.h \ @@ -412,7 +412,7 @@ DENG_HEADERS += \ include/ui/joystick.h \ include/ui/mouse_qt.h \ include/ui/nativeui.h \ - include/ui/p_control.h \ + include/ui/playerimpulse.h \ include/ui/styledlogsinkformatter.h \ include/ui/sys_input.h \ include/ui/ui_main.h \ @@ -683,7 +683,6 @@ SOURCES += \ src/ui/clientwindow.cpp \ src/ui/clientwindowsystem.cpp \ src/ui/commandaction.cpp \ - src/ui/dd_input.cpp \ src/ui/dialogs/aboutdialog.cpp \ src/ui/dialogs/alertdialog.cpp \ src/ui/dialogs/audiosettingsdialog.cpp \ @@ -704,6 +703,7 @@ SOURCES += \ src/ui/infine/finaletextwidget.cpp \ src/ui/infine/finalewidget.cpp \ src/ui/infine/infinesystem.cpp \ + src/ui/inputdebug.cpp \ src/ui/inputdevice.cpp \ src/ui/inputdeviceaxiscontrol.cpp \ src/ui/inputdevicebuttoncontrol.cpp \ @@ -711,7 +711,7 @@ SOURCES += \ src/ui/inputsystem.cpp \ src/ui/mouse_qt.cpp \ src/ui/nativeui.cpp \ - src/ui/p_control.cpp \ + src/ui/playerimpulse.cpp \ src/ui/progress.cpp \ src/ui/styledlogsinkformatter.cpp \ src/ui/sys_input.cpp \ diff --git a/doomsday/client/include/de_base.h b/doomsday/client/include/de_base.h index 8847fd04a1..b7f620aced 100644 --- a/doomsday/client/include/de_base.h +++ b/doomsday/client/include/de_base.h @@ -1,7 +1,7 @@ -/** @file +/** @file de_base.h Engine Core. * * @authors Copyright © 2003-2013 Jaakko Keränen - * @authors Copyright © 2007-2013 Daniel Swanson + * @authors Copyright © 2007-2014 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -17,10 +17,6 @@ * http://www.gnu.org/licenses */ -/** - * Engine Core. - */ - #ifndef LIBDENG_BASE_H #define LIBDENG_BASE_H @@ -45,7 +41,7 @@ #include "dd_loop.h" #include "library.h" #include "busymode.h" -#include "ui/dd_input.h" +#include "ui/ddevent.h" #include "ui/nativeui.h" #include "ui/zonedebug.h" #include @@ -57,4 +53,4 @@ # include "server_dummies.h" #endif -#endif /* LIBDENG_BASE_H */ +#endif // LIBDENG_BASE_H diff --git a/doomsday/client/include/de_play.h b/doomsday/client/include/de_play.h index 22d2d651d4..d420fa3d7e 100644 --- a/doomsday/client/include/de_play.h +++ b/doomsday/client/include/de_play.h @@ -43,7 +43,7 @@ #include "world/p_players.h" #include "world/thinkers.h" #include "Material" -#include "ui/p_control.h" +#include "ui/playerimpulse.h" #include "r_util.h" #include "api_map.h" diff --git a/doomsday/client/include/ui/b_main.h b/doomsday/client/include/ui/b_main.h index c479ac1c59..ecc61ead98 100644 --- a/doomsday/client/include/ui/b_main.h +++ b/doomsday/client/include/ui/b_main.h @@ -21,7 +21,7 @@ #define CLIENT_INPUTSYSTEM_BINDINGS_H #include -#include "dd_input.h" +#include "ddevent.h" void B_Init(); diff --git a/doomsday/client/include/ui/b_util.h b/doomsday/client/include/ui/b_util.h index 2c58e32d25..cc4fae7af0 100644 --- a/doomsday/client/include/ui/b_util.h +++ b/doomsday/client/include/ui/b_util.h @@ -22,7 +22,7 @@ #include #include "dd_types.h" -#include "dd_input.h" +#include "ddevent.h" class BindContext; class InputDevice; diff --git a/doomsday/client/include/ui/commandbinding.h b/doomsday/client/include/ui/commandbinding.h index 8fcd3f986e..b40decf455 100644 --- a/doomsday/client/include/ui/commandbinding.h +++ b/doomsday/client/include/ui/commandbinding.h @@ -23,7 +23,7 @@ #include #include #include "b_util.h" -#include "dd_input.h" +#include "ddevent.h" struct CommandBinding { diff --git a/doomsday/client/include/ui/dd_input.h b/doomsday/client/include/ui/ddevent.h similarity index 92% rename from doomsday/client/include/ui/dd_input.h rename to doomsday/client/include/ui/ddevent.h index 4e0a4e19b6..21b1473cfd 100644 --- a/doomsday/client/include/ui/dd_input.h +++ b/doomsday/client/include/ui/ddevent.h @@ -1,4 +1,4 @@ -/** @file dd_input.h Input Subsystem. +/** @file ddevent.h Input system event. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2005-2014 Daniel Swanson @@ -17,8 +17,8 @@ * http://www.gnu.org/licenses */ -#ifndef CLIENT_CORE_INPUT_H -#define CLIENT_CORE_INPUT_H +#ifndef CLIENT_INPUTSYSTEM_DDEVENT_H +#define CLIENT_INPUTSYSTEM_DDEVENT_H #include #include @@ -109,15 +109,4 @@ struct ddevent_t #define IS_MOUSE_UP(evp) ((evp)->device == IDEV_MOUSE && IS_TOGGLE_UP(evp)) #define IS_MOUSE_MOTION(evp) ((evp)->device == IDEV_MOUSE && (evp)->type == E_AXIS) -void I_ConsoleRegister(); - -#ifdef DENG2_DEBUG -/** - * Render a visual representation of the current state of all input devices. - */ -void Rend_DrawInputDeviceVisuals(); -#else -# define Rend_DrawInputDeviceVisuals() -#endif - -#endif // CLIENT_CORE_INPUT_H +#endif // CLIENT_INPUTSYSTEM_DDEVENT_H diff --git a/doomsday/client/include/ui/infine/finale.h b/doomsday/client/include/ui/infine/finale.h index ca78d3bba4..59f4b8548c 100644 --- a/doomsday/client/include/ui/infine/finale.h +++ b/doomsday/client/include/ui/infine/finale.h @@ -22,7 +22,7 @@ #include #include -#include "../dd_input.h" // ddevent_t +#include "../ddevent.h" #include "api_infine.h" // finaleid_t class FinaleInterpreter; diff --git a/doomsday/client/include/ui/infine/finaleinterpreter.h b/doomsday/client/include/ui/infine/finaleinterpreter.h index 0a420352bd..6f33046768 100644 --- a/doomsday/client/include/ui/infine/finaleinterpreter.h +++ b/doomsday/client/include/ui/infine/finaleinterpreter.h @@ -22,7 +22,7 @@ #include #include -#include "../dd_input.h" // ddevent_t +#include "../ddevent.h" #include "api_infine.h" // finaleid_t class FinaleWidget; diff --git a/doomsday/client/include/ui/inputdebug.h b/doomsday/client/include/ui/inputdebug.h new file mode 100644 index 0000000000..7945eef69b --- /dev/null +++ b/doomsday/client/include/ui/inputdebug.h @@ -0,0 +1,39 @@ +/** @file inputedebug.h Input debug visualization. + * + * @authors Copyright © 2007-2014 Daniel Swanson + * + * @par License + * GPL: http://www.gnu.org/licenses/gpl.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 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 General + * Public License for more details. You should have received a copy of the GNU + * General Public License along with this program; if not, see: + * http://www.gnu.org/licenses + */ + +#ifndef CLIENT_INPUTDEBUG_H +#define CLIENT_INPUTDEBUG_H + +#include + +#ifdef DENG2_DEBUG + +void I_DebugDrawerConsoleRegister(); + +/** + * Render a visual representation of the current state of all input devices. + */ +void I_DebugDrawer(); + +#else +# define I_ConsoleRegister() + +# define I_DebugDrawer() +#endif + +#endif // CLIENT_INPUTDEBUG_H diff --git a/doomsday/client/include/ui/inputsystem.h b/doomsday/client/include/ui/inputsystem.h index e794395b3d..66ef13fa34 100644 --- a/doomsday/client/include/ui/inputsystem.h +++ b/doomsday/client/include/ui/inputsystem.h @@ -1,7 +1,7 @@ /** @file inputsystem.h Input subsystem. * - * @authors Copyright © 2013 Jaakko Keränen - * @authors Copyright © 2014 Daniel Swanson + * @authors Copyright © 2003-2013 Jaakko Keränen + * @authors Copyright © 2005-2014 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -25,7 +25,7 @@ #include #include #include -#include "dd_input.h" // ddevent_t +#include "ddevent.h" #include "ui/commandaction.h" #include "SettingsRegister" diff --git a/doomsday/client/include/ui/p_control.h b/doomsday/client/include/ui/playerimpulse.h similarity index 98% rename from doomsday/client/include/ui/p_control.h rename to doomsday/client/include/ui/playerimpulse.h index 66870d76a0..436aa4c043 100644 --- a/doomsday/client/include/ui/p_control.h +++ b/doomsday/client/include/ui/playerimpulse.h @@ -1,4 +1,4 @@ -/** @file p_control.h Player interaction impulse. +/** @file playerimpulse.h Player interaction impulse. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2014 Daniel Swanson diff --git a/doomsday/client/include/ui/ui_main.h b/doomsday/client/include/ui/ui_main.h index 794d2bdaca..8889f1d5cc 100644 --- a/doomsday/client/include/ui/ui_main.h +++ b/doomsday/client/include/ui/ui_main.h @@ -1,9 +1,9 @@ -/** @file ui_main.h Graphical User Interface (obsolete). +/** @file ui_main.h Graphical User Interface (obsolete). * * Has ties to the console routines. * * @authors Copyright © 2003-2013 Jaakko Keränen - * @authors Copyright © 2005-2013 Daniel Swanson + * @authors Copyright © 2005-2014 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -23,7 +23,7 @@ #define LIBDENG_UI_MAIN_H #include -#include "dd_input.h" // ddevent_t +#include "ddevent.h" #ifdef __CLIENT__ # include "MaterialVariantSpec" #endif diff --git a/doomsday/client/include/ui/widgetactions.h b/doomsday/client/include/ui/widgetactions.h index 30830f6b26..a7e8f15593 100644 --- a/doomsday/client/include/ui/widgetactions.h +++ b/doomsday/client/include/ui/widgetactions.h @@ -1,6 +1,7 @@ /** @file widgetactions.h User actions bound to widgets. * - * @authors Copyright (c) 2013 Jaakko Keränen + * @authors Copyright © 2013 Jaakko Keränen + * @authors Copyright © 2014 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -24,7 +25,7 @@ #include #include -#include "dd_input.h" +#include "ddevent.h" /** * User actions bound to widgets. Traditionally called the bindings and binding diff --git a/doomsday/client/src/dd_main.cpp b/doomsday/client/src/dd_main.cpp index 4c9ee07a9e..670f702535 100644 --- a/doomsday/client/src/dd_main.cpp +++ b/doomsday/client/src/dd_main.cpp @@ -56,7 +56,7 @@ #include "world/worldsystem.h" #include "world/map.h" #include "ui/infine/infinesystem.h" -#include "ui/p_control.h" +#include "ui/playerimpulse.h" #include "ui/progress.h" #include "ui/nativeui.h" diff --git a/doomsday/client/src/network/net_main.cpp b/doomsday/client/src/network/net_main.cpp index 154f72b1bc..78876d4404 100644 --- a/doomsday/client/src/network/net_main.cpp +++ b/doomsday/client/src/network/net_main.cpp @@ -1,7 +1,10 @@ -/** @file net_main.cpp +/** @file net_main.cpp Client/server networking. + * + * Player number zero is always the server. In single-player games there is only + * the server present. * * @authors Copyright © 2003-2013 Jaakko Keränen - * @authors Copyright © 2005-2013 Daniel Swanson + * @authors Copyright © 2005-2014 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -17,15 +20,6 @@ * http://www.gnu.org/licenses */ -/** - * Client/server networking. - * - * Player number zero is always the server. - * In single-player games there is only the server present. - */ - -// HEADER FILES ------------------------------------------------------------ - #include // for atoi() #include "de_platform.h" @@ -47,6 +41,7 @@ # include "render/lightgrid.h" # include "render/blockmapvisual.h" # include "edit_bias.h" +# include "ui/inputdebug.h" # include "ui/widgets/taskbarwidget.h" #endif @@ -739,8 +734,8 @@ void Net_Drawer() // Draw the light range debug display. Rend_DrawLightModMatrix(); - // Draw the input device debug display. - Rend_DrawInputDeviceVisuals(); + // Draw the input debug display. + I_DebugDrawer(); // Draw the demo recording overlay. Net_DrawDemoOverlay(); diff --git a/doomsday/client/src/ui/b_main.cpp b/doomsday/client/src/ui/b_main.cpp index a17b0a19ac..24f573bf12 100644 --- a/doomsday/client/src/ui/b_main.cpp +++ b/doomsday/client/src/ui/b_main.cpp @@ -32,7 +32,7 @@ #include "clientapp.h" #include "ui/commandbinding.h" #include "ui/bindcontext.h" -#include "ui/p_control.h" +#include "ui/playerimpulse.h" #include "ui/inputdevice.h" #include "ui/inputdeviceaxiscontrol.h" #include "ui/ui_main.h" diff --git a/doomsday/client/src/ui/bindcontext.cpp b/doomsday/client/src/ui/bindcontext.cpp index d079891edd..b48306581b 100644 --- a/doomsday/client/src/ui/bindcontext.cpp +++ b/doomsday/client/src/ui/bindcontext.cpp @@ -26,7 +26,7 @@ #include "clientapp.h" #include "ui/inputdevice.h" -#include "ui/p_control.h" +#include "ui/playerimpulse.h" /// @todo: remove #include "ui/inputdeviceaxiscontrol.h" diff --git a/doomsday/client/src/ui/dd_input.cpp b/doomsday/client/src/ui/inputdebug.cpp similarity index 98% rename from doomsday/client/src/ui/dd_input.cpp rename to doomsday/client/src/ui/inputdebug.cpp index 03e0485933..b3a70b7ee0 100644 --- a/doomsday/client/src/ui/dd_input.cpp +++ b/doomsday/client/src/ui/inputdebug.cpp @@ -1,7 +1,6 @@ -/** @file dd_input.cpp Platform-independent input subsystem. +/** @file inputdebug.cpp Input debug visualizer. * - * @authors Copyright © 2003-2013 Jaakko Keränen - * @authors Copyright © 2005-2014 Daniel Swanson + * @authors Copyright © 2007-2014 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -18,11 +17,10 @@ * 02110-1301 USA */ -#include "de_platform.h" // strdup macro - #ifdef DENG2_DEBUG -#include "ui/dd_input.h" +#include "de_platform.h" // strdup macro +#include "ui/inputdebug.h" #include #include @@ -471,7 +469,7 @@ void Rend_RenderInputDeviceStateVisual(InputDevice &device, inputdev_layout_t co #undef SPACING } -void Rend_DrawInputDeviceVisuals() +void I_DebugDrawer() { #define SPACING 2 #define NUMITEMS(x) (sizeof(x) / sizeof((x)[0])) @@ -801,13 +799,12 @@ void Rend_DrawInputDeviceVisuals() #undef NUMITEMS #undef SPACING } -#endif // DENG2_DEBUG -void I_ConsoleRegister() +void I_DebugDrawerConsoleRegister() { -#ifdef DENG2_DEBUG C_VAR_BYTE("rend-dev-input-joy-state", &devRendJoyState, CVF_NO_ARCHIVE, 0, 1); C_VAR_BYTE("rend-dev-input-key-state", &devRendKeyState, CVF_NO_ARCHIVE, 0, 1); C_VAR_BYTE("rend-dev-input-mouse-state", &devRendMouseState, CVF_NO_ARCHIVE, 0, 1); -#endif } + +#endif // DENG2_DEBUG diff --git a/doomsday/client/src/ui/inputsystem.cpp b/doomsday/client/src/ui/inputsystem.cpp index 9b13b6f215..39eb811d63 100644 --- a/doomsday/client/src/ui/inputsystem.cpp +++ b/doomsday/client/src/ui/inputsystem.cpp @@ -1,7 +1,7 @@ /** @file inputsystem.cpp Input subsystem. * - * @authors Copyright © 2013 Jaakko Keränen - * @authors Copyright © 2014 Daniel Swanson + * @authors Copyright © 2003-2014 Jaakko Keränen + * @authors Copyright © 2005-2014 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -39,17 +39,18 @@ #include "render/vr.h" #include "world/p_players.h" -#include "ui/dd_input.h" +#include "ui/ddevent.h" #include "ui/b_main.h" #include "ui/b_util.h" #include "ui/bindcontext.h" #include "ui/clientwindow.h" #include "ui/clientwindowsystem.h" +#include "ui/inputdebug.h" // Debug visualization. #include "ui/inputdevice.h" #include "ui/inputdeviceaxiscontrol.h" #include "ui/inputdevicebuttoncontrol.h" #include "ui/inputdevicehatcontrol.h" -#include "ui/p_control.h" +#include "ui/playerimpulse.h" #include "ui/sys_input.h" #include "sys_system.h" // novideo @@ -2275,7 +2276,7 @@ void InputSystem::consoleRegister() // static //C_CMD_FLAGS("setaxis", "ss", AxisChangeOption, CMDF_NO_DEDICATED); //C_CMD_FLAGS("setaxis", "sss", AxisChangeValue, CMDF_NO_DEDICATED); - I_ConsoleRegister(); + I_DebugDrawerConsoleRegister(); #undef PROTECTED_FLAGS } diff --git a/doomsday/client/src/ui/p_control.cpp b/doomsday/client/src/ui/playerimpulse.cpp similarity index 99% rename from doomsday/client/src/ui/p_control.cpp rename to doomsday/client/src/ui/playerimpulse.cpp index 922702afc0..0221d51b45 100644 --- a/doomsday/client/src/ui/p_control.cpp +++ b/doomsday/client/src/ui/playerimpulse.cpp @@ -1,4 +1,4 @@ -/** @file p_control.cpp Player interaction impulses. +/** @file playerimpulse.cpp Player interaction impulses. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2006-2014 Daniel Swanson @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#include "ui/p_control.h" +#include "ui/playerimpulse.h" #include #include diff --git a/doomsday/client/src/ui/widgets/gamewidget.cpp b/doomsday/client/src/ui/widgets/gamewidget.cpp index 4d59158822..e86805302c 100644 --- a/doomsday/client/src/ui/widgets/gamewidget.cpp +++ b/doomsday/client/src/ui/widgets/gamewidget.cpp @@ -1,6 +1,7 @@ /** @file gamewidget.cpp * - * @authors Copyright (c) 2013 Jaakko Keränen + * @authors Copyright © 2013-2014 Jaakko Keränen + * @authors Copyright © 2014 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -20,7 +21,7 @@ #include "ui/widgets/gamewidget.h" #include "clientapp.h" -#include "ui/dd_input.h" +#include "ui/ddevent.h" #include "ui/ui_main.h" #include "ui/sys_input.h" #include "ui/busyvisual.h" diff --git a/doomsday/client/src/ui/widgets/keygrabberwidget.cpp b/doomsday/client/src/ui/widgets/keygrabberwidget.cpp index 3c490a5ac0..ee0bef7315 100644 --- a/doomsday/client/src/ui/widgets/keygrabberwidget.cpp +++ b/doomsday/client/src/ui/widgets/keygrabberwidget.cpp @@ -18,7 +18,7 @@ #include "ui/widgets/keygrabberwidget.h" #include "clientapp.h" -#include "ui/dd_input.h" +#include "ui/ddevent.h" #include "ui/b_util.h" #include diff --git a/doomsday/server/server.pro b/doomsday/server/server.pro index 39189218f2..99bb962a00 100644 --- a/doomsday/server/server.pro +++ b/doomsday/server/server.pro @@ -208,7 +208,7 @@ DENG_HEADERS += \ $$SRC/include/ui/infine/finalepagewidget.h \ $$SRC/include/ui/infine/finaletextwidget.h \ $$SRC/include/ui/infine/finalewidget.h \ - $$SRC/include/ui/p_control.h \ + $$SRC/include/ui/playerimpulse.h \ $$SRC/include/world/dmuargs.h \ $$SRC/include/world/blockmap.h \ $$SRC/include/world/bsp/convexsubspaceproxy.h \ @@ -359,7 +359,7 @@ SOURCES += \ $$SRC/src/ui/infine/finaletextwidget.cpp \ $$SRC/src/ui/infine/finalewidget.cpp \ $$SRC/src/ui/infine/infinesystem.cpp \ - $$SRC/src/ui/p_control.cpp \ + $$SRC/src/ui/playerimpulse.cpp \ $$SRC/src/world/api_map.cpp \ $$SRC/src/world/api_mapedit.cpp \ $$SRC/src/world/blockmap.cpp \