Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-23 05:31:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove unused force_quit variable from many OS abstractions

Browse Source
This commit is contained in:
Pedro J. Estébanez 2022-08-16 20:29:55 +02:00
parent f2a6168414
commit 6e647dea24
8 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/linuxbsd/os_linuxbsd.cpp
View File

@ -519,8 +519,6 @@ String OS_LinuxBSD::get_system_dir(SystemDir p_dir, bool p_shared_storage) const
}
void OS_LinuxBSD::run() {
force_quit = false;
if (!main_loop) {
return;
}
@ -532,7 +530,7 @@ void OS_LinuxBSD::run() {
//int frames=0;
//uint64_t frame=0;
while (!force_quit) {
while (true) {
DisplayServer::get_singleton()->process_events(); // get rid of pending events
#ifdef JOYDEV_ENABLED
joypad->process_joypads();
@ -730,7 +728,6 @@ Error OS_LinuxBSD::move_to_trash(const String &p_path) {
OS_LinuxBSD::OS_LinuxBSD() {
main_loop = nullptr;
force_quit = false;
#ifdef PULSEAUDIO_ENABLED
AudioDriverManager::add_driver(&driver_pulseaudio);

2
platform/linuxbsd/os_linuxbsd.h
View File

@ -43,8 +43,6 @@
class OS_LinuxBSD : public OS_Unix {
virtual void delete_main_loop() override;
bool force_quit;
#ifdef FONTCONFIG_ENABLED
bool font_config_initialized = false;
#endif

2
platform/macos/os_macos.h
View File

@ -40,8 +40,6 @@
#include "servers/audio_server.h"
class OS_MacOS : public OS_Unix {
bool force_quit = false;
JoypadMacOS *joypad_macos = nullptr;
#ifdef COREAUDIO_ENABLED

5
platform/macos/os_macos.mm
View File

@ -512,8 +512,6 @@ Error OS_MacOS::move_to_trash(const String &p_path) {
}
void OS_MacOS::run() {
force_quit = false;
if (!main_loop) {
return;
}
@ -521,7 +519,7 @@ void OS_MacOS::run() {
main_loop->initialize();
bool quit = false;
while (!force_quit && !quit) {
while (!quit) {
@try {
if (DisplayServer::get_singleton()) {
DisplayServer::get_singleton()->process_events(); // Get rid of pending events.
@ -541,7 +539,6 @@ void OS_MacOS::run() {
OS_MacOS::OS_MacOS() {
main_loop = nullptr;
force_quit = false;
Vector<Logger *> loggers;
loggers.push_back(memnew(MacOSTerminalLogger));

3
platform/uwp/os_uwp.cpp
View File

@ -781,7 +781,7 @@ void OS_UWP::run() {
int frames = 0;
uint64_t frame = 0;
while (!force_quit) {
while (true) {
CoreWindow::GetForCurrentThread()->Dispatcher->ProcessEvents(CoreProcessEventsOption::ProcessAllIfPresent);
if (managed_object->alert_close_handle) {
continue;
@ -811,7 +811,6 @@ bool OS_UWP::_check_internal_feature_support(const String &p_feature) {
OS_UWP::OS_UWP() {
key_event_pos = 0;
force_quit = false;
alt_mem = false;
gr_mem = false;
shift_mem = false;

1
platform/uwp/os_uwp.h
View File

@ -106,7 +106,6 @@ private:
bool shift_mem;
bool control_mem;
bool meta_mem;
bool force_quit;
MouseButton last_button_state = MouseButton::NONE;
CursorShape cursor_shape;

4
platform/windows/os_windows.cpp
View File

@ -902,7 +902,7 @@ void OS_Windows::run() {
main_loop->initialize();
while (!force_quit) {
while (true) {
DisplayServer::get_singleton()->process_events(); // get rid of pending events
if (Main::iteration()) {
break;
@ -1132,8 +1132,6 @@ OS_Windows::OS_Windows(HINSTANCE _hInstance) {
main_loop = nullptr;
process_map = nullptr;
force_quit = false;
hInstance = _hInstance;
#ifdef STDOUT_FILE
stdo = fopen("stdout.txt", "wb");

1
platform/windows/os_windows.h
View File

@ -110,7 +110,6 @@ class OS_Windows : public OS {
ErrorHandlerList error_handlers;
#endif
bool force_quit;
HWND main_window;
// functions used by main to initialize/deinitialize the OS