Relintai/world_generator
1
0
Fork 0
mirror of https://github.com/Relintai/world_generator.git synced 2025-02-22 17:27:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix build for 4.0.

Browse Source
This commit is contained in:
Relintai 2020-04-09 12:35:10 +02:00
parent ccd54e340b
commit 52f7bcdd12
5 changed files with 106 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
data/biome_data.cpp
View File

@ -22,6 +22,8 @@ SOFTWARE.
#include "biome_data.h"
#include "core/version.h"
String BiomeData::get_target_class_name() {
return _target_class_name;
}
@ -85,7 +87,11 @@ int BiomeData::get_dungeon_data_count() const {
Vector<Variant> BiomeData::get_dungeon_datas() {
Vector<Variant> r;
for (int i = 0; i < _dungeon_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_dungeon_datas[i].get_ref_ptr());
#else
r.push_back(_dungeon_datas[i]);
#endif
}
return r;
}
@ -126,7 +132,11 @@ int BiomeData::get_prop_data_count() const {
Vector<Variant> BiomeData::get_prop_datas() {
Vector<Variant> r;
for (int i = 0; i < _prop_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_prop_datas[i].get_ref_ptr());
#else
r.push_back(_prop_datas[i]);
#endif
}
return r;
}
@ -167,7 +177,11 @@ int BiomeData::get_entity_data_count() const {
Vector<Variant> BiomeData::get_entity_datas() {
Vector<Variant> r;
for (int i = 0; i < _entity_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_entity_datas[i].get_ref_ptr());
#else
r.push_back(_entity_datas[i]);
#endif
}
return r;
}
@ -209,7 +223,11 @@ int BiomeData::get_environment_data_count() const {
Vector<Variant> BiomeData::get_environment_datas() {
Vector<Variant> r;
for (int i = 0; i < _environment_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_environment_datas[i].get_ref_ptr());
#else
r.push_back(_environment_datas[i]);
#endif
}
return r;
}
@ -248,7 +266,11 @@ int BiomeData::get_voxel_surface_count() const {
Vector<Variant> BiomeData::get_voxel_surfaces() {
Vector<Variant> r;
for (int i = 0; i < _voxel_surfaces.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_voxel_surfaces[i].get_ref_ptr());
#else
r.push_back(_voxel_surfaces[i]);
#endif
}
return r;
}
@ -287,7 +309,11 @@ int BiomeData::get_liquid_voxel_surface_count() const {
Vector<Variant> BiomeData::get_liquid_voxel_surfaces() {
Vector<Variant> r;
for (int i = 0; i < _liquid_voxel_surfaces.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_liquid_voxel_surfaces[i].get_ref_ptr());
#else
r.push_back(_liquid_voxel_surfaces[i]);
#endif
}
return r;
}

34
data/dungeon_data.cpp
View File

@ -22,6 +22,8 @@ SOFTWARE.
#include "dungeon_data.h"
#include "core/version.h"
String DungeonData::get_target_class_name() {
return _target_class_name;
}
@ -128,7 +130,11 @@ int DungeonData::get_dungeon_room_data_count() const {
Vector<Variant> DungeonData::get_dungeon_room_datas() {
Vector<Variant> r;
for (int i = 0; i < _dungeon_room_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_dungeon_room_datas[i].get_ref_ptr());
#else
r.push_back(_dungeon_room_datas[i]);
#endif
}
return r;
}
@ -168,7 +174,11 @@ int DungeonData::get_dungeon_start_room_data_count() const {
Vector<Variant> DungeonData::get_dungeon_start_room_datas() {
Vector<Variant> r;
for (int i = 0; i < _dungeon_start_room_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_dungeon_start_room_datas[i].get_ref_ptr());
#else
r.push_back(_dungeon_start_room_datas[i]);
#endif
}
return r;
}
@ -208,7 +218,11 @@ int DungeonData::get_dungeon_end_room_data_count() const {
Vector<Variant> DungeonData::get_dungeon_end_room_datas() {
Vector<Variant> r;
for (int i = 0; i < _dungeon_end_room_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_dungeon_end_room_datas[i].get_ref_ptr());
#else
r.push_back(_dungeon_end_room_datas[i]);
#endif
}
return r;
}
@ -248,7 +262,11 @@ int DungeonData::get_dungeon_corridor_data_count() const {
Vector<Variant> DungeonData::get_dungeon_corridor_datas() {
Vector<Variant> r;
for (int i = 0; i < _dungeon_corridor_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_dungeon_corridor_datas[i].get_ref_ptr());
#else
r.push_back(_dungeon_corridor_datas[i]);
#endif
}
return r;
}
@ -288,7 +306,11 @@ int DungeonData::get_entity_data_count() const {
Vector<Variant> DungeonData::get_entity_datas() {
Vector<Variant> r;
for (int i = 0; i < _entity_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_entity_datas[i].get_ref_ptr());
#else
r.push_back(_entity_datas[i]);
#endif
}
return r;
}
@ -329,7 +351,11 @@ int DungeonData::get_voxel_surface_count() const {
Vector<Variant> DungeonData::get_voxel_surfaces() {
Vector<Variant> r;
for (int i = 0; i < _voxel_surfaces.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_voxel_surfaces[i].get_ref_ptr());
#else
r.push_back(_voxel_surfaces[i]);
#endif
}
return r;
}
@ -368,7 +394,11 @@ int DungeonData::get_liquid_voxel_surface_count() const {
Vector<Variant> DungeonData::get_liquid_voxel_surfaces() {
Vector<Variant> r;
for (int i = 0; i < _liquid_voxel_surfaces.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_liquid_voxel_surfaces[i].get_ref_ptr());
#else
r.push_back(_liquid_voxel_surfaces[i]);
#endif
}
return r;
}
@ -407,7 +437,11 @@ int DungeonData::get_environment_data_count() const {
Vector<Variant> DungeonData::get_environment_datas() {
Vector<Variant> r;
for (int i = 0; i < _environment_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_environment_datas[i].get_ref_ptr());
#else
r.push_back(_environment_datas[i]);
#endif
}
return r;
}

22
data/dungeon_room_data.cpp
View File

@ -22,6 +22,8 @@ SOFTWARE.
#include "dungeon_room_data.h"
#include "core/version.h"
String DungeonRoomData::get_target_class_name() {
return _target_class_name;
}
@ -113,7 +115,11 @@ int DungeonRoomData::get_prop_data_count() const {
Vector<Variant> DungeonRoomData::get_prop_datas() {
Vector<Variant> r;
for (int i = 0; i < _prop_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_prop_datas[i].get_ref_ptr());
#else
r.push_back(_prop_datas[i]);
#endif
}
return r;
}
@ -153,7 +159,11 @@ int DungeonRoomData::get_environment_data_count() const {
Vector<Variant> DungeonRoomData::get_environment_datas() {
Vector<Variant> r;
for (int i = 0; i < _environment_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_environment_datas[i].get_ref_ptr());
#else
r.push_back(_environment_datas[i]);
#endif
}
return r;
}
@ -192,7 +202,11 @@ int DungeonRoomData::get_voxel_surface_count() const {
Vector<Variant> DungeonRoomData::get_voxel_surfaces() {
Vector<Variant> r;
for (int i = 0; i < _voxel_surfaces.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_voxel_surfaces[i].get_ref_ptr());
#else
r.push_back(_voxel_surfaces[i]);
#endif
}
return r;
}
@ -231,7 +245,11 @@ int DungeonRoomData::get_liquid_voxel_surface_count() const {
Vector<Variant> DungeonRoomData::get_liquid_voxel_surfaces() {
Vector<Variant> r;
for (int i = 0; i < _liquid_voxel_surfaces.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_liquid_voxel_surfaces[i].get_ref_ptr());
#else
r.push_back(_liquid_voxel_surfaces[i]);
#endif
}
return r;
}
@ -274,7 +292,11 @@ int DungeonRoomData::get_entity_data_count() const {
Vector<Variant> DungeonRoomData::get_entity_datas() {
Vector<Variant> r;
for (int i = 0; i < _entity_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_entity_datas[i].get_ref_ptr());
#else
r.push_back(_entity_datas[i]);
#endif
}
return r;
}

18
data/planet_data.cpp
View File

@ -22,6 +22,8 @@ SOFTWARE.
#include "planet_data.h"
#include "core/version.h"
int PlanetData::get_id() const {
return _id;
}
@ -92,7 +94,11 @@ int PlanetData::get_biome_data_count() const {
Vector<Variant> PlanetData::get_biome_datas() {
Vector<Variant> r;
for (int i = 0; i < _biome_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_biome_datas[i].get_ref_ptr());
#else
r.push_back(_biome_datas[i]);
#endif
}
return r;
}
@ -132,7 +138,11 @@ int PlanetData::get_environment_data_count() const {
Vector<Variant> PlanetData::get_environment_datas() {
Vector<Variant> r;
for (int i = 0; i < _environment_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_environment_datas[i].get_ref_ptr());
#else
r.push_back(_environment_datas[i]);
#endif
}
return r;
}
@ -171,7 +181,11 @@ int PlanetData::get_voxel_surface_count() const {
Vector<Variant> PlanetData::get_voxel_surfaces() {
Vector<Variant> r;
for (int i = 0; i < _voxel_surfaces.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_voxel_surfaces[i].get_ref_ptr());
#else
r.push_back(_voxel_surfaces[i]);
#endif
}
return r;
}
@ -210,7 +224,11 @@ int PlanetData::get_liquid_voxel_surface_count() const {
Vector<Variant> PlanetData::get_liquid_voxel_surfaces() {
Vector<Variant> r;
for (int i = 0; i < _liquid_voxel_surfaces.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_liquid_voxel_surfaces[i].get_ref_ptr());
#else
r.push_back(_liquid_voxel_surfaces[i]);
#endif
}
return r;
}

6
world_generator.cpp
View File

@ -22,6 +22,8 @@ SOFTWARE.
#include "world_generator.h"
#include "core/version.h"
Ref<PlanetData> WorldGenerator::get_planet_data(const int index) const {
ERR_FAIL_INDEX_V(index, _planet_datas.size(), Ref<PlanetData>());
@ -48,7 +50,11 @@ int WorldGenerator::get_planet_data_count() const {
Vector<Variant> WorldGenerator::get_planet_datas() {
Vector<Variant> r;
for (int i = 0; i < _planet_datas.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_planet_datas[i].get_ref_ptr());
#else
r.push_back(_planet_datas[i]);
#endif
}
return r;
}