mirror of
https://github.com/godotengine/godot
synced 2024-09-04 22:28:26 +00:00
Fix build issues and typos after c69de2ba4
This commit is contained in:
parent
286c88bb50
commit
8c9e10553c
|
@ -667,7 +667,8 @@ void OS::set_restart_on_exit(bool p_restart, const List<String> &p_restart_argum
|
|||
bool OS::is_restart_on_exit_set() const {
|
||||
return restart_on_exit;
|
||||
}
|
||||
List<String> OS::get_restart_on_exit_argumens() const {
|
||||
|
||||
List<String> OS::get_restart_on_exit_arguments() const {
|
||||
return restart_commandline;
|
||||
}
|
||||
|
||||
|
|
|
@ -502,7 +502,7 @@ public:
|
|||
|
||||
void set_restart_on_exit(bool p_restart, const List<String> &p_restart_arguments);
|
||||
bool is_restart_on_exit_set() const;
|
||||
List<String> get_restart_on_exit_argumens() const;
|
||||
List<String> get_restart_on_exit_arguments() const;
|
||||
|
||||
OS();
|
||||
virtual ~OS();
|
||||
|
|
|
@ -64,16 +64,16 @@ protected:
|
|||
order(0),
|
||||
persist(false),
|
||||
hide_from_editor(false),
|
||||
overridden(false) {
|
||||
restart_if_changed = false;
|
||||
overridden(false),
|
||||
restart_if_changed(false) {
|
||||
}
|
||||
VariantContainer(const Variant &p_variant, int p_order, bool p_persist = false) :
|
||||
order(p_order),
|
||||
persist(p_persist),
|
||||
variant(p_variant),
|
||||
hide_from_editor(false),
|
||||
overridden(false) {
|
||||
restart_if_changed = false;
|
||||
overridden(false),
|
||||
restart_if_changed(false) {
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -1587,9 +1587,9 @@ void EditorInspector::update_tree() {
|
|||
ep->connect("resource_selected", this, "_resource_selected", varray(), CONNECT_DEFERRED);
|
||||
ep->connect("object_id_selected", this, "_object_id_selected", varray(), CONNECT_DEFERRED);
|
||||
if (doc_hint != String()) {
|
||||
ep->set_tooltip(TTR("Property: ") + property_prefix + p.name + "\n\n" + doc_hint);
|
||||
ep->set_tooltip(TTR("Property:") + " " + property_prefix + p.name + "\n\n" + doc_hint);
|
||||
} else {
|
||||
ep->set_tooltip(TTR("Property: ") + property_prefix + p.name);
|
||||
ep->set_tooltip(TTR("Property:") + " " + property_prefix + p.name);
|
||||
}
|
||||
ep->set_draw_red(draw_red);
|
||||
ep->set_use_folding(use_folding);
|
||||
|
@ -2107,6 +2107,7 @@ void EditorInspector::_vscroll_changed(double p_offset) {
|
|||
scroll_cache[object->get_instance_id()] = p_offset;
|
||||
}
|
||||
}
|
||||
|
||||
void EditorInspector::set_property_prefix(const String &p_prefix) {
|
||||
property_prefix = p_prefix;
|
||||
}
|
||||
|
|
|
@ -1960,7 +1960,7 @@ void Main::cleanup() {
|
|||
if (OS::get_singleton()->is_restart_on_exit_set()) {
|
||||
//attempt to restart with arguments
|
||||
String exec = OS::get_singleton()->get_executable_path();
|
||||
List<String> args = OS::get_singleton()->get_restart_on_exit_argumens();
|
||||
List<String> args = OS::get_singleton()->get_restart_on_exit_arguments();
|
||||
OS::ProcessID pid = 0;
|
||||
OS::get_singleton()->execute(exec, args, false, &pid);
|
||||
OS::get_singleton()->set_restart_on_exit(false, List<String>()); //clear list (uses memory)
|
||||
|
|
|
@ -123,6 +123,7 @@ void OS_Android::set_opengl_extensions(const char *p_gl_extensions) {
|
|||
ERR_FAIL_COND(!p_gl_extensions);
|
||||
gl_extensions = p_gl_extensions;
|
||||
}
|
||||
|
||||
int OS_Android::get_current_video_driver() const {
|
||||
return video_driver_index;
|
||||
}
|
||||
|
|
|
@ -99,7 +99,7 @@ int OSIPhone::get_current_video_driver() const {
|
|||
|
||||
Error OSIPhone::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) {
|
||||
|
||||
video_driver = p_video_driver; //this may be misleading
|
||||
video_driver_index = p_video_driver; //this may be misleading
|
||||
|
||||
RasterizerGLES3::register_config();
|
||||
RasterizerGLES3::make_current();
|
||||
|
|
|
@ -28,16 +28,17 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
#include "os_server.h"
|
||||
|
||||
#include "drivers/dummy/audio_driver_dummy.h"
|
||||
#include "drivers/dummy/rasterizer_dummy.h"
|
||||
#include "drivers/dummy/texture_loader_dummy.h"
|
||||
#include "print_string.h"
|
||||
#include "servers/visual/visual_server_raster.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "main/main.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
int OS_Server::get_video_driver_count() const {
|
||||
|
@ -58,6 +59,10 @@ const char *OS_Server::get_audio_driver_name(int p_driver) const {
|
|||
return "Dummy";
|
||||
}
|
||||
|
||||
int OS_Server::get_current_video_driver() const {
|
||||
return video_driver_index;
|
||||
}
|
||||
|
||||
void OS_Server::initialize_core() {
|
||||
|
||||
crash_handler.initialize();
|
||||
|
@ -73,6 +78,8 @@ Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int
|
|||
|
||||
RasterizerDummy::make_current();
|
||||
|
||||
video_driver_index = p_video_driver; // unused in server platform, but should still be initialized
|
||||
|
||||
visual_server = memnew(VisualServerRaster);
|
||||
visual_server->init();
|
||||
|
||||
|
|
|
@ -30,12 +30,12 @@
|
|||
#ifndef OS_SERVER_H
|
||||
#define OS_SERVER_H
|
||||
|
||||
#include "../x11/crash_handler_x11.h"
|
||||
#include "../x11/power_x11.h"
|
||||
#include "drivers/dummy/texture_loader_dummy.h"
|
||||
#include "drivers/rtaudio/audio_driver_rtaudio.h"
|
||||
#include "drivers/unix/os_unix.h"
|
||||
#include "main/input_default.h"
|
||||
#include "platform/x11/crash_handler_x11.h"
|
||||
#include "platform/x11/power_x11.h"
|
||||
#include "servers/audio_server.h"
|
||||
#include "servers/visual/rasterizer.h"
|
||||
#include "servers/visual_server.h"
|
||||
|
@ -66,6 +66,8 @@ class OS_Server : public OS_Unix {
|
|||
|
||||
CrashHandler crash_handler;
|
||||
|
||||
int video_driver_index;
|
||||
|
||||
ResourceFormatDummyTexture *resource_loader_dummy;
|
||||
|
||||
protected:
|
||||
|
@ -84,6 +86,8 @@ protected:
|
|||
public:
|
||||
virtual String get_name();
|
||||
|
||||
virtual int get_current_video_driver() const;
|
||||
|
||||
virtual void set_cursor_shape(CursorShape p_shape);
|
||||
virtual void set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot);
|
||||
|
||||
|
|
Loading…
Reference in a new issue