summaryrefslogtreecommitdiff
path: root/core/os
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-04-05 12:39:30 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-04-05 12:39:30 -0300
commit9f33134c93ecbadda70e8eefc50563e29b2eb7f2 (patch)
tree299ded94fe74a61bf8094935d0f3283f6f30e435 /core/os
parent35b84d2c85fd152bee05d7d5a05e20a5f602a285 (diff)
-Support for changing fonts
-Detect when free() might crash the project and throw error -fixed 2D Bounce in physics (3d still broken) -renamed “on_top” property to “behind_parent”, which makes more sense, old on_top remains there for compatibility but is invisible. -large amount of fixes
Diffstat (limited to 'core/os')
-rw-r--r--core/os/os.cpp5
-rw-r--r--core/os/os.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp
index f678d38f56..65d6ed50b2 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -124,6 +124,11 @@ String OS::get_executable_path() const {
return _execpath;
}
+int OS::get_process_ID() const {
+
+ return -1;
+};
+
uint64_t OS::get_frames_drawn() {
return frames_drawn;
diff --git a/core/os/os.h b/core/os/os.h
index b41bf6ce73..e7fe0cb09e 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -162,6 +162,7 @@ public:
virtual String get_executable_path() const;
virtual Error execute(const String& p_path, const List<String>& p_arguments,bool p_blocking,ProcessID *r_child_id=NULL,String* r_pipe=NULL,int *r_exitcode=NULL)=0;
virtual Error kill(const ProcessID& p_pid)=0;
+ virtual int get_process_ID() const;
virtual Error shell_open(String p_uri);
virtual Error set_cwd(const String& p_cwd);