From 572d7c7493f386bdd998fc52ef465992e8f7730b Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 7 Nov 2019 21:31:58 +0100 Subject: [PATCH] Typo fix and update. --- data/world_generator_prop_data.cpp | 6 +++--- data/world_generator_prop_data.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/world_generator_prop_data.cpp b/data/world_generator_prop_data.cpp index f225ab9..6f229d4 100644 --- a/data/world_generator_prop_data.cpp +++ b/data/world_generator_prop_data.cpp @@ -8,12 +8,12 @@ bool WorldGeneratorPropData::can_spawn(int seed) { return false; } -Ref WorldGeneratorPropData::get_prop(int seed) { +Ref WorldGeneratorPropData::get_prop(int seed) { if (has_method("_get_prop")) { return call("_get_prop", seed); } - return Ref(NULL); + return Ref(NULL); } WorldGeneratorPropData::WorldGeneratorPropData() { @@ -25,7 +25,7 @@ WorldGeneratorPropData::~WorldGeneratorPropData() { void WorldGeneratorPropData::_bind_methods() { BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "can"), "_can_spawn", PropertyInfo(Variant::INT, "seed"))); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "prop", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanProp"), "_get_prop", PropertyInfo(Variant::INT, "seed"))); + BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "prop", PROPERTY_HINT_RESOURCE_TYPE, "PropData"), "_get_prop", PropertyInfo(Variant::INT, "seed"))); ClassDB::bind_method(D_METHOD("can_spawn", "seed"), &WorldGeneratorPropData::can_spawn); ClassDB::bind_method(D_METHOD("get_prop", "seed"), &WorldGeneratorPropData::get_prop); diff --git a/data/world_generator_prop_data.h b/data/world_generator_prop_data.h index c4fba73..eb21d5b 100644 --- a/data/world_generator_prop_data.h +++ b/data/world_generator_prop_data.h @@ -1,9 +1,9 @@ -#ifndef PROP_DATA_H -#define PROP_DATA_H +#ifndef WORLD_GENERATOR_PROP_DATA_H +#define WORLD_GENERATOR_PROP_DATA_H #include "core/resource.h" -#include "../../voxelman/props/voxelman_prop.h" +#include "../../voxelman/props/prop_data.h" class WorldGeneratorPropData : public Resource { GDCLASS(WorldGeneratorPropData, Resource); @@ -11,7 +11,7 @@ class WorldGeneratorPropData : public Resource { public: bool can_spawn(int seed); - Ref get_prop(int seed); + Ref get_prop(int seed); WorldGeneratorPropData(); ~WorldGeneratorPropData();