Skip to content

Commit 9def8a6

Browse files
committed
tiny cleanup
1 parent e5e1c92 commit 9def8a6

File tree

2 files changed

+6
-19
lines changed

2 files changed

+6
-19
lines changed

src/controller/physicaldevice/PhysicalDeviceType.h

+6-9
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
namespace Ship {
44

5-
#define PHYSICAL_DEVICE_TYPE_VALUES \
6-
X(Keyboard, 0) \
7-
X(Mouse, 1) \
8-
X(SDLGamepad, 2) \
9-
X(Max, 3)
10-
11-
#define X(name, value) name = value,
12-
enum PhysicalDeviceType { PHYSICAL_DEVICE_TYPE_VALUES };
13-
#undef X
5+
enum PhysicalDeviceType {
6+
Keyboard = 0,
7+
Mouse = 1,
8+
SDLGamepad = 2,
9+
Max = 3
10+
};
1411

1512
} // namespace Ship

src/window/gui/Gui.cpp

-10
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,11 @@ Gui::Gui(std::vector<std::shared_ptr<GuiWindow>> guiWindows) : mNeedsConsoleVari
7272
AddGuiWindow(std::make_shared<InputEditorWindow>(CVAR_CONTROLLER_CONFIGURATION_WINDOW_OPEN, "Input Editor"));
7373
}
7474

75-
// if (GetGuiWindow("Controller Disconnected") == nullptr) {
76-
// AddGuiWindow(std::make_shared<ControllerDisconnectedWindow>(CVAR_CONTROLLER_DISCONNECTED_WINDOW_OPEN,
77-
// "Controller Disconnected"));
78-
// }
79-
8075
if (GetGuiWindow("SDLAddRemoveDeviceEventHandler") == nullptr) {
8176
AddGuiWindow(std::make_shared<SDLAddRemoveDeviceEventHandler>("gOpenWindows.SDLAddRemoveDeviceEventHandler",
8277
"SDLAddRemoveDeviceEventHandler"));
8378
}
8479

85-
// if (GetGuiWindow("Controller Reordering") == nullptr) {
86-
// AddGuiWindow(std::make_shared<ControllerReorderingWindow>(CVAR_CONTROLLER_REORDERING_WINDOW_OPEN,
87-
// "Controller Reordering"));
88-
// }
89-
9080
if (GetGuiWindow("Console") == nullptr) {
9181
AddGuiWindow(std::make_shared<ConsoleWindow>(CVAR_CONSOLE_WINDOW_OPEN, "Console", ImVec2(520, 600),
9282
ImGuiWindowFlags_NoFocusOnAppearing));

0 commit comments

Comments
 (0)