mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2024-12-22 11:56:49 +01:00
Fix warning.
This commit is contained in:
parent
e3e6e9e231
commit
1877ecd379
@ -617,7 +617,7 @@ public:
|
|||||||
fatal("no video module available.");
|
fatal("no video module available.");
|
||||||
screen_size = env->video->get_screen_size();
|
screen_size = env->video->get_screen_size();
|
||||||
}
|
}
|
||||||
void run_() { run(); }
|
void run_() { main_run(); }
|
||||||
int get_exit_code_() { return get_exit_code(); }
|
int get_exit_code_() { return get_exit_code(); }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -399,7 +399,7 @@ extern "C" int frt_godot_main(int argc, char *argv[]) {
|
|||||||
if (err != OK)
|
if (err != OK)
|
||||||
return 255;
|
return 255;
|
||||||
if (Main::start())
|
if (Main::start())
|
||||||
os.run();
|
os.main_run();
|
||||||
Main::cleanup();
|
Main::cleanup();
|
||||||
return os.get_exit_code();
|
return os.get_exit_code();
|
||||||
}
|
}
|
||||||
|
@ -323,7 +323,7 @@ public:
|
|||||||
virtual void _set_use_vsync(bool p_enable);
|
virtual void _set_use_vsync(bool p_enable);
|
||||||
//virtual bool is_vsync_enabled() const;
|
//virtual bool is_vsync_enabled() const;
|
||||||
|
|
||||||
void run();
|
void main_run();
|
||||||
|
|
||||||
void set_mouse_mode(MouseMode p_mode);
|
void set_mouse_mode(MouseMode p_mode);
|
||||||
MouseMode get_mouse_mode() const;
|
MouseMode get_mouse_mode() const;
|
||||||
|
@ -3402,7 +3402,7 @@ void OS_OSX::pre_wait_observer_cb(CFRunLoopObserverRef p_observer, CFRunLoopActi
|
|||||||
CFRunLoopWakeUp(CFRunLoopGetCurrent()); // Prevent main loop from sleeping.
|
CFRunLoopWakeUp(CFRunLoopGetCurrent()); // Prevent main loop from sleeping.
|
||||||
}
|
}
|
||||||
|
|
||||||
void OS_OSX::run() {
|
void OS_OSX::main_run() {
|
||||||
force_quit = false;
|
force_quit = false;
|
||||||
|
|
||||||
if (!main_loop) {
|
if (!main_loop) {
|
||||||
|
@ -190,7 +190,7 @@ bool OS_Server::_check_internal_feature_support(const String &p_feature) {
|
|||||||
return p_feature == "pc";
|
return p_feature == "pc";
|
||||||
}
|
}
|
||||||
|
|
||||||
void OS_Server::run() {
|
void OS_Server::main_run() {
|
||||||
force_quit = false;
|
force_quit = false;
|
||||||
|
|
||||||
if (!main_loop)
|
if (!main_loop)
|
||||||
|
@ -107,7 +107,7 @@ public:
|
|||||||
|
|
||||||
virtual void move_window_to_foreground();
|
virtual void move_window_to_foreground();
|
||||||
|
|
||||||
void run();
|
void main_run();
|
||||||
|
|
||||||
virtual OS::PowerState get_power_state();
|
virtual OS::PowerState get_power_state();
|
||||||
virtual int get_power_seconds_left();
|
virtual int get_power_seconds_left();
|
||||||
|
@ -39,7 +39,7 @@ int main(int argc, char *argv[]) {
|
|||||||
return 255;
|
return 255;
|
||||||
|
|
||||||
if (Main::start())
|
if (Main::start())
|
||||||
os.run(); // it is actually the OS that decides how to run
|
os.main_run(); // it is actually the OS that decides how to run
|
||||||
Main::cleanup();
|
Main::cleanup();
|
||||||
|
|
||||||
return os.get_exit_code();
|
return os.get_exit_code();
|
||||||
|
@ -3491,7 +3491,7 @@ void OS_Windows::force_process_input() {
|
|||||||
process_events(); // get rid of pending events
|
process_events(); // get rid of pending events
|
||||||
}
|
}
|
||||||
|
|
||||||
void OS_Windows::run() {
|
void OS_Windows::main_run() {
|
||||||
if (!main_loop)
|
if (!main_loop)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -571,7 +571,7 @@ public:
|
|||||||
|
|
||||||
virtual Error shell_open(String p_uri);
|
virtual Error shell_open(String p_uri);
|
||||||
|
|
||||||
void run();
|
void main_run();
|
||||||
|
|
||||||
virtual bool get_swap_ok_cancel() {
|
virtual bool get_swap_ok_cancel() {
|
||||||
return true;
|
return true;
|
||||||
|
@ -171,7 +171,7 @@ __declspec(dllexport) int widechar_main(int argc, wchar_t **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (Main::start())
|
if (Main::start())
|
||||||
os.run();
|
os.main_run();
|
||||||
Main::cleanup();
|
Main::cleanup();
|
||||||
|
|
||||||
for (int i = 0; i < argc; ++i) {
|
for (int i = 0; i < argc; ++i) {
|
||||||
|
@ -3898,7 +3898,7 @@ void OS_X11::force_process_input() {
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void OS_X11::run() {
|
void OS_X11::main_run() {
|
||||||
force_quit = false;
|
force_quit = false;
|
||||||
|
|
||||||
if (!main_loop) {
|
if (!main_loop) {
|
||||||
|
@ -354,7 +354,7 @@ public:
|
|||||||
virtual bool _check_internal_feature_support(const String &p_feature);
|
virtual bool _check_internal_feature_support(const String &p_feature);
|
||||||
|
|
||||||
virtual void force_process_input();
|
virtual void force_process_input();
|
||||||
void run();
|
void main_run();
|
||||||
|
|
||||||
void disable_crash_handler();
|
void disable_crash_handler();
|
||||||
bool is_disable_crash_handler() const;
|
bool is_disable_crash_handler() const;
|
||||||
|
@ -57,7 +57,7 @@ int main(int argc, char *argv[]) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (Main::start()) {
|
if (Main::start()) {
|
||||||
os.run(); // it is actually the OS that decides how to run
|
os.main_run(); // it is actually the OS that decides how to run
|
||||||
}
|
}
|
||||||
Main::cleanup();
|
Main::cleanup();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user