diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-13 12:52:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 12:52:17 +0100 |
| commit | 835406cf04f0200a0504ae171964c687c559eb1e (patch) | |
| tree | a42d7429e37e7b9ab64240c70b00c521215ee0b5 | |
| parent | f1ac2920847eafb7e89a27dcb98ecd4ee68b9750 (diff) | |
| parent | b14bf4bcd07d549fc056d3cbfa7064a9e1907ef6 (diff) | |
Merge pull request #36163 from akien-mga/gdnative-godot_int-int64_t
GDNative: Make godot_int an int64_t
| -rw-r--r-- | modules/gdnative/gdnative/gdnative.cpp | 2 | ||||
| -rw-r--r-- | modules/gdnative/gdnative_api.json | 2 | ||||
| -rw-r--r-- | modules/gdnative/include/gdnative/gdnative.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdnative/gdnative/gdnative.cpp b/modules/gdnative/gdnative/gdnative.cpp index 119bb80659..bb868d3b52 100644 --- a/modules/gdnative/gdnative/gdnative.cpp +++ b/modules/gdnative/gdnative/gdnative.cpp @@ -171,7 +171,7 @@ bool GDAPI godot_is_instance_valid(const godot_object *p_object) { } godot_object GDAPI *godot_instance_from_id(godot_int p_instance_id) { - return (godot_object *)ObjectDB::get_instance(ObjectID((uint64_t)p_instance_id)); + return (godot_object *)ObjectDB::get_instance(ObjectID(p_instance_id)); } void *godot_get_class_tag(const godot_string_name *p_class) { diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json index c2cbe1e824..44e407218b 100644 --- a/modules/gdnative/gdnative_api.json +++ b/modules/gdnative/gdnative_api.json @@ -6475,7 +6475,7 @@ "name": "godot_arvr_blit", "return_type": "void", "arguments": [ - ["int", "p_eye"], + ["godot_int", "p_eye"], ["godot_rid *", "p_render_target"], ["godot_rect2 *", "p_screen_rect"] ] diff --git a/modules/gdnative/include/gdnative/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h index e19a2ec149..6fd0bdc87f 100644 --- a/modules/gdnative/include/gdnative/gdnative.h +++ b/modules/gdnative/include/gdnative/gdnative.h @@ -127,7 +127,7 @@ typedef bool godot_bool; /////// int -typedef int godot_int; +typedef int64_t godot_int; /////// real |