summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-02-12 21:05:05 +0100
committerRémi Verschelde <rverschelde@gmail.com>2020-02-12 21:05:05 +0100
commitb14bf4bcd07d549fc056d3cbfa7064a9e1907ef6 (patch)
tree1ea914444199fc3b5393795c48d064445675bb6b
parent8080e5c4f3685b062190be3e1b54a18f0e2229a7 (diff)
GDNative: Make godot_int an int64_t
Redo of the change in cf8c679a23b21d6c6f29cba6a54eaa2eed88bf92 that caused a build issue, with the extra change needed to 'godot_arvr_blit'.
-rw-r--r--modules/gdnative/gdnative/gdnative.cpp2
-rw-r--r--modules/gdnative/gdnative_api.json2
-rw-r--r--modules/gdnative/include/gdnative/gdnative.h2
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