Relintai/world_generator
1
0
Fork 0
mirror of https://github.com/Relintai/world_generator.git synced 2024-11-14 10:17:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile without Voxelman.

Browse Source
This commit is contained in:
Relintai 2020-08-01 11:37:38 +02:00
parent bc2ee7171a
commit 2b17341ac2
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/biome.cpp
View File

@ -411,9 +411,6 @@ void Biome::_setup_library(Ref<VoxelmanLibrary> library) {
} }
#else #else
void Biome::setup_library(Ref<Resource> library) { void Biome::setup_library(Ref<Resource> library) {
if (!_data.is_valid())
return;
if (has_method("_setup_library")) { if (has_method("_setup_library")) {
call("_setup_library", library); call("_setup_library", library);
} }

4
main/dungeon.cpp
View File

@ -639,10 +639,8 @@ void Dungeon::generate_structure(Ref<VoxelStructure> structure, bool spawn_mobs)
} }
} }
#else #else
void Dungeon::setup_library(Ref<Resource> library) {
if (!_data.is_valid())
return;
void Dungeon::setup_library(Ref<Resource> library) {
if (has_method("_setup_library")) { if (has_method("_setup_library")) {
call("_setup_library", library); call("_setup_library", library);
} }

3
main/dungeon_room.cpp
View File

@ -447,9 +447,6 @@ void DungeonRoom::generate_room(Ref<VoxelStructure> structure, bool spawn_mobs)
#else #else
void DungeonRoom::setup_library(Ref<Resource> library) { void DungeonRoom::setup_library(Ref<Resource> library) {
if (!_data.is_valid())
return;
if (has_method("_setup_library")) { if (has_method("_setup_library")) {
call("_setup_library", library); call("_setup_library", library);
} }

5
main/planet.cpp
View File

@ -272,6 +272,7 @@ Ref<Planet> Planet::_instance(const int seed, Ref<Planet> inst) {
inst->set_temperature_noise_params(_temperature_noise_params->duplicate()); inst->set_temperature_noise_params(_temperature_noise_params->duplicate());
#endif #endif
#ifdef VOXELMAN_PRESENT
for (int i = 0; i < _environment_datas.size(); ++i) { for (int i = 0; i < _environment_datas.size(); ++i) {
Ref<EnvironmentData> d = _environment_datas[i]; Ref<EnvironmentData> d = _environment_datas[i];
@ -289,6 +290,7 @@ Ref<Planet> Planet::_instance(const int seed, Ref<Planet> inst) {
inst->add_voxel_surface(d); inst->add_voxel_surface(d);
} }
#endif
return inst; return inst;
} }
@ -344,9 +346,6 @@ void Planet::generate_chunk(Ref<VoxelChunk> chunk, bool spawn_mobs) {
#else #else
void Planet::setup_library(Ref<Resource> library) { void Planet::setup_library(Ref<Resource> library) {
if (!_data.is_valid())
return;
if (has_method("_setup_library")) { if (has_method("_setup_library")) {
call("_setup_library", library); call("_setup_library", library);
} }