diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-06 08:08:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 08:08:54 +0200 |
| commit | f5f9b220f9f2a4977df7c7888db650b67b12c8a5 (patch) | |
| tree | 23cf1a122b74024362bcee6548f572be6fb52c6a /modules/dlscript/godot | |
| parent | d681e571ac8464e15187f5e3aa9ca2ede2387903 (diff) | |
| parent | 7d914a289c13f2defd48b8edb9c86ab47046bd5f (diff) | |
Merge pull request #8276 from karroffel/dlscript-stl
[DLScript] API fixed and removed STL imports
Diffstat (limited to 'modules/dlscript/godot')
| -rw-r--r-- | modules/dlscript/godot/godot_node_path.cpp | 8 | ||||
| -rw-r--r-- | modules/dlscript/godot/godot_node_path.h | 1 | ||||
| -rw-r--r-- | modules/dlscript/godot/godot_quat.cpp | 2 | ||||
| -rw-r--r-- | modules/dlscript/godot/godot_string.cpp | 2 | ||||
| -rw-r--r-- | modules/dlscript/godot/godot_transform.cpp | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/modules/dlscript/godot/godot_node_path.cpp b/modules/dlscript/godot/godot_node_path.cpp index cc0652c75b..8b79175e44 100644 --- a/modules/dlscript/godot/godot_node_path.cpp +++ b/modules/dlscript/godot/godot_node_path.cpp @@ -2,8 +2,6 @@ #include "path_db.h" -#include <memory.h> // why is there no <cmemory> btw? - #ifdef __cplusplus extern "C" { #endif @@ -22,6 +20,12 @@ void GDAPI godot_node_path_new(godot_node_path *p_np, const godot_string *p_from memnew_placement_custom(np, NodePath, NodePath(*from)); } +void GDAPI godot_node_path_copy(godot_node_path *p_np, const godot_node_path *p_from) { + NodePath *np = (NodePath *)p_np; + NodePath *from = (NodePath *)p_from; + *np = *from; +} + godot_string GDAPI godot_node_path_get_name(const godot_node_path *p_np, const godot_int p_idx) { const NodePath *np = (const NodePath *)p_np; godot_string str; diff --git a/modules/dlscript/godot/godot_node_path.h b/modules/dlscript/godot/godot_node_path.h index b322e55d83..04f1e70c1d 100644 --- a/modules/dlscript/godot/godot_node_path.h +++ b/modules/dlscript/godot/godot_node_path.h @@ -16,6 +16,7 @@ typedef struct godot_node_path { #include "../godot.h" void GDAPI godot_node_path_new(godot_node_path *p_np, const godot_string *p_from); +void GDAPI godot_node_path_copy(godot_node_path *p_np, const godot_node_path *p_from); godot_string GDAPI godot_node_path_get_name(const godot_node_path *p_np, const godot_int p_idx); godot_int GDAPI godot_node_path_get_name_count(const godot_node_path *p_np); diff --git a/modules/dlscript/godot/godot_quat.cpp b/modules/dlscript/godot/godot_quat.cpp index 5571614e07..9bd2eb0639 100644 --- a/modules/dlscript/godot/godot_quat.cpp +++ b/modules/dlscript/godot/godot_quat.cpp @@ -2,8 +2,6 @@ #include "math/quat.h" -#include <memory.h> // why is there no <cmemory> btw? - #ifdef __cplusplus extern "C" { #endif diff --git a/modules/dlscript/godot/godot_string.cpp b/modules/dlscript/godot/godot_string.cpp index 1501743e02..43f05500fd 100644 --- a/modules/dlscript/godot/godot_string.cpp +++ b/modules/dlscript/godot/godot_string.cpp @@ -3,7 +3,7 @@ #include "string_db.h" #include "ustring.h" -#include <memory.h> // why is there no <cmemory> btw? +#include <memory.h> #ifdef __cplusplus extern "C" { diff --git a/modules/dlscript/godot/godot_transform.cpp b/modules/dlscript/godot/godot_transform.cpp index 18d218e6c4..c8da519f6b 100644 --- a/modules/dlscript/godot/godot_transform.cpp +++ b/modules/dlscript/godot/godot_transform.cpp @@ -2,8 +2,6 @@ #include "math/transform.h" -#include <memory.h> // why is there no <cmemory> btw? - #ifdef __cplusplus extern "C" { #endif |