diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/Color.cpp | 2 | ||||
| -rw-r--r-- | src/core/GodotGlobal.cpp | 2 | ||||
| -rw-r--r-- | src/core/NodePath.cpp | 2 | ||||
| -rw-r--r-- | src/core/PoolArrays.cpp | 2 | ||||
| -rw-r--r-- | src/core/RID.cpp | 2 | ||||
| -rw-r--r-- | src/core/String.cpp | 2 | ||||
| -rw-r--r-- | src/core/Variant.cpp | 10 | ||||
| -rw-r--r-- | src/core/Vector2.cpp | 2 |
8 files changed, 11 insertions, 13 deletions
diff --git a/src/core/Color.cpp b/src/core/Color.cpp index a41615e..aa356e2 100644 --- a/src/core/Color.cpp +++ b/src/core/Color.cpp @@ -1,6 +1,6 @@ #include "Color.hpp" -#include <godot/color.h> +#include <gdnative/color.h> #include <cmath> diff --git a/src/core/GodotGlobal.cpp b/src/core/GodotGlobal.cpp index 96a5fa6..823c2c1 100644 --- a/src/core/GodotGlobal.cpp +++ b/src/core/GodotGlobal.cpp @@ -2,7 +2,7 @@ #include "String.hpp" -#include <godot/gdnative.h> +#include <gdnative/gdnative.h> namespace godot { diff --git a/src/core/NodePath.cpp b/src/core/NodePath.cpp index 98c40c9..5681036 100644 --- a/src/core/NodePath.cpp +++ b/src/core/NodePath.cpp @@ -2,7 +2,7 @@ #include "String.hpp" -#include <godot/node_path.h> +#include <gdnative/node_path.h> namespace godot { diff --git a/src/core/PoolArrays.cpp b/src/core/PoolArrays.cpp index e33ce0e..fbd4d69 100644 --- a/src/core/PoolArrays.cpp +++ b/src/core/PoolArrays.cpp @@ -7,7 +7,7 @@ #include "Vector2.hpp" #include "Vector3.hpp" -#include <godot/pool_arrays.h> +#include <gdnative/pool_arrays.h> namespace godot { diff --git a/src/core/RID.cpp b/src/core/RID.cpp index 75419ba..12b4a2e 100644 --- a/src/core/RID.cpp +++ b/src/core/RID.cpp @@ -1,6 +1,6 @@ #include "RID.hpp" -#include <godot/rid.h> +#include <gdnative/rid.h> namespace godot { diff --git a/src/core/String.cpp b/src/core/String.cpp index 846241e..85a7b5f 100644 --- a/src/core/String.cpp +++ b/src/core/String.cpp @@ -2,7 +2,7 @@ #include "NodePath.hpp" -#include <godot/string.h> +#include <gdnative/string.h> #include <string.h> diff --git a/src/core/Variant.cpp b/src/core/Variant.cpp index fa72b66..24109dd 100644 --- a/src/core/Variant.cpp +++ b/src/core/Variant.cpp @@ -1,6 +1,6 @@ #include "Variant.hpp" -#include <godot/variant.h> +#include <gdnative/variant.h> #include "Defs.hpp" @@ -199,9 +199,7 @@ Variant &Variant::operator =(const Variant& v) Variant::operator bool() const { - bool valid = false; - bool result = booleanize(valid); - return valid && result; + return booleanize(); } Variant::operator signed int() const { @@ -423,9 +421,9 @@ bool Variant::hash_compare(const Variant& b) const return godot_variant_hash_compare(&_godot_variant, &b._godot_variant); } -bool Variant::booleanize(bool &valid) const +bool Variant::booleanize() const { - return godot_variant_booleanize(&_godot_variant, &valid); + return godot_variant_booleanize(&_godot_variant); } Variant::~Variant() diff --git a/src/core/Vector2.cpp b/src/core/Vector2.cpp index 46f1125..7dc78b6 100644 --- a/src/core/Vector2.cpp +++ b/src/core/Vector2.cpp @@ -2,7 +2,7 @@ #include <cmath> -#include <godot/vector2.h> +#include <gdnative/vector2.h> #include "String.hpp" |