PowerOlive
/
spheretest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make mapgen use mapgen_* node aliases rather than the LEGN macro

master
Perttu Ahola 2012-03-28 01:26:15 +03:00
parent 04172e3dd0
commit 49c2ca0216
2 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
games/minimal/mods/default/init.lua
View File

@ -1298,6 +1298,29 @@ minetest.add_to_creative_inventory('default:water_source')
minetest.add_to_creative_inventory('default:lava_source') minetest.add_to_creative_inventory('default:lava_source')
minetest.add_to_creative_inventory('default:ladder') minetest.add_to_creative_inventory('default:ladder')
--
-- Aliases for the current map generator outputs
--
minetest.register_alias("mapgen_air", "air")
minetest.register_alias("mapgen_stone", "default:stone")
minetest.register_alias("mapgen_tree", "default:tree")
minetest.register_alias("mapgen_leaves", "default:leaves")
minetest.register_alias("mapgen_apple", "default:apple")
minetest.register_alias("mapgen_water_source", "default:water_source")
minetest.register_alias("mapgen_dirt", "default:dirt")
minetest.register_alias("mapgen_sand", "default:sand")
minetest.register_alias("mapgen_gravel", "default:gravel")
minetest.register_alias("mapgen_clay", "default:clay")
minetest.register_alias("mapgen_lava_source", "default:lava_source")
minetest.register_alias("mapgen_cobble", "default:cobble")
minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal")
minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron")
minetest.register_alias("mapgen_mese", "default:mese")
-- --
-- Some common functions -- Some common functions
-- --

66
src/mapgen.cpp
View File

@ -70,8 +70,8 @@ static s16 find_ground_level_clever(VoxelManipulator &vmanip, v2s16 p2d,
s16 y_nodes_min = vmanip.m_area.MinEdge.Y; s16 y_nodes_min = vmanip.m_area.MinEdge.Y;
u32 i = vmanip.m_area.index(v3s16(p2d.X, y_nodes_max, p2d.Y)); u32 i = vmanip.m_area.index(v3s16(p2d.X, y_nodes_max, p2d.Y));
s16 y; s16 y;
content_t c_tree = LEGN(ndef, "CONTENT_TREE"); content_t c_tree = ndef->getId("mapgen_tree");
content_t c_leaves = LEGN(ndef, "CONTENT_LEAVES"); content_t c_leaves = ndef->getId("mapgen_leaves");
for(y=y_nodes_max; y>=y_nodes_min; y--) for(y=y_nodes_max; y>=y_nodes_min; y--)
{ {
MapNode &n = vmanip.m_data[i]; MapNode &n = vmanip.m_data[i];
@ -97,7 +97,7 @@ static s16 find_stone_level(VoxelManipulator &vmanip, v2s16 p2d,
s16 y_nodes_min = vmanip.m_area.MinEdge.Y; s16 y_nodes_min = vmanip.m_area.MinEdge.Y;
u32 i = vmanip.m_area.index(v3s16(p2d.X, y_nodes_max, p2d.Y)); u32 i = vmanip.m_area.index(v3s16(p2d.X, y_nodes_max, p2d.Y));
s16 y; s16 y;
content_t c_stone = LEGN(ndef, "CONTENT_STONE"); content_t c_stone = ndef->getId("mapgen_stone");
for(y=y_nodes_max; y>=y_nodes_min; y--) for(y=y_nodes_max; y>=y_nodes_min; y--)
{ {
MapNode &n = vmanip.m_data[i]; MapNode &n = vmanip.m_data[i];
@ -116,9 +116,9 @@ static s16 find_stone_level(VoxelManipulator &vmanip, v2s16 p2d,
void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0, void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0,
bool is_apple_tree, INodeDefManager *ndef) bool is_apple_tree, INodeDefManager *ndef)
{ {
MapNode treenode(LEGN(ndef, "CONTENT_TREE")); MapNode treenode(ndef->getId("mapgen_tree"));
MapNode leavesnode(LEGN(ndef, "CONTENT_LEAVES")); MapNode leavesnode(ndef->getId("mapgen_leaves"));
MapNode applenode(LEGN(ndef, "CONTENT_APPLE")); MapNode applenode(ndef->getId("mapgen_apple"));
s16 trunk_h = myrand_range(4, 5); s16 trunk_h = myrand_range(4, 5);
v3s16 p1 = p0; v3s16 p1 = p0;
@ -196,8 +196,8 @@ void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0,
static void make_jungletree(VoxelManipulator &vmanip, v3s16 p0, static void make_jungletree(VoxelManipulator &vmanip, v3s16 p0,
INodeDefManager *ndef) INodeDefManager *ndef)
{ {
MapNode treenode(LEGN(ndef, "CONTENT_JUNGLETREE")); MapNode treenode(ndef->getId("mapgen_jungletree"));
MapNode leavesnode(LEGN(ndef, "CONTENT_LEAVES")); MapNode leavesnode(ndef->getId("mapgen_leaves"));
for(s16 x=-1; x<=1; x++) for(s16 x=-1; x<=1; x++)
for(s16 z=-1; z<=1; z++) for(s16 z=-1; z<=1; z++)
@ -283,7 +283,7 @@ static void make_jungletree(VoxelManipulator &vmanip, v3s16 p0,
void make_papyrus(VoxelManipulator &vmanip, v3s16 p0, void make_papyrus(VoxelManipulator &vmanip, v3s16 p0,
INodeDefManager *ndef) INodeDefManager *ndef)
{ {
MapNode papyrusnode(LEGN(ndef, "CONTENT_PAPYRUS")); MapNode papyrusnode(ndef->getId("mapgen_papyrus"));
s16 trunk_h = myrand_range(2, 3); s16 trunk_h = myrand_range(2, 3);
v3s16 p1 = p0; v3s16 p1 = p0;
@ -298,7 +298,7 @@ void make_papyrus(VoxelManipulator &vmanip, v3s16 p0,
void make_cactus(VoxelManipulator &vmanip, v3s16 p0, void make_cactus(VoxelManipulator &vmanip, v3s16 p0,
INodeDefManager *ndef) INodeDefManager *ndef)
{ {
MapNode cactusnode(LEGN(ndef, "CONTENT_CACTUS")); MapNode cactusnode(ndef->getId("mapgen_cactus"));
s16 trunk_h = 3; s16 trunk_h = 3;
v3s16 p1 = p0; v3s16 p1 = p0;
@ -333,7 +333,7 @@ static void make_room1(VoxelManipulator &vmanip, v3s16 roomsize, v3s16 roomplace
u32 vi = vmanip.m_area.index(p); u32 vi = vmanip.m_area.index(p);
if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE) if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
continue; continue;
vmanip.m_data[vi] = MapNode(LEGN(ndef, "CONTENT_COBBLE")); vmanip.m_data[vi] = MapNode(ndef->getId("mapgen_cobble"));
} }
{ {
v3s16 p = roomplace + v3s16(roomsize.X-1,y,z); v3s16 p = roomplace + v3s16(roomsize.X-1,y,z);
@ -342,7 +342,7 @@ static void make_room1(VoxelManipulator &vmanip, v3s16 roomsize, v3s16 roomplace
u32 vi = vmanip.m_area.index(p); u32 vi = vmanip.m_area.index(p);
if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE) if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
continue; continue;
vmanip.m_data[vi] = MapNode(LEGN(ndef, "CONTENT_COBBLE")); vmanip.m_data[vi] = MapNode(ndef->getId("mapgen_cobble"));
} }
} }
@ -357,7 +357,7 @@ static void make_room1(VoxelManipulator &vmanip, v3s16 roomsize, v3s16 roomplace
u32 vi = vmanip.m_area.index(p); u32 vi = vmanip.m_area.index(p);
if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE) if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
continue; continue;
vmanip.m_data[vi] = MapNode(LEGN(ndef, "CONTENT_COBBLE")); vmanip.m_data[vi] = MapNode(ndef->getId("mapgen_cobble"));
} }
{ {
v3s16 p = roomplace + v3s16(x,y,roomsize.Z-1); v3s16 p = roomplace + v3s16(x,y,roomsize.Z-1);
@ -366,7 +366,7 @@ static void make_room1(VoxelManipulator &vmanip, v3s16 roomsize, v3s16 roomplace
u32 vi = vmanip.m_area.index(p); u32 vi = vmanip.m_area.index(p);
if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE) if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
continue; continue;
vmanip.m_data[vi] = MapNode(LEGN(ndef, "CONTENT_COBBLE")); vmanip.m_data[vi] = MapNode(ndef->getId("mapgen_cobble"));
} }
} }
@ -381,7 +381,7 @@ static void make_room1(VoxelManipulator &vmanip, v3s16 roomsize, v3s16 roomplace
u32 vi = vmanip.m_area.index(p); u32 vi = vmanip.m_area.index(p);
if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE) if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
continue; continue;
vmanip.m_data[vi] = MapNode(LEGN(ndef, "CONTENT_COBBLE")); vmanip.m_data[vi] = MapNode(ndef->getId("mapgen_cobble"));
} }
{ {
v3s16 p = roomplace + v3s16(x,roomsize.Y-1,z); v3s16 p = roomplace + v3s16(x,roomsize.Y-1,z);
@ -390,7 +390,7 @@ static void make_room1(VoxelManipulator &vmanip, v3s16 roomsize, v3s16 roomplace
u32 vi = vmanip.m_area.index(p); u32 vi = vmanip.m_area.index(p);
if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE) if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
continue; continue;
vmanip.m_data[vi] = MapNode(LEGN(ndef, "CONTENT_COBBLE")); vmanip.m_data[vi] = MapNode(ndef->getId("mapgen_cobble"));
} }
} }
@ -438,7 +438,7 @@ static void make_door1(VoxelManipulator &vmanip, v3s16 doorplace, v3s16 doordir,
{ {
make_hole1(vmanip, doorplace, ndef); make_hole1(vmanip, doorplace, ndef);
// Place torch (for testing) // Place torch (for testing)
//vmanip.m_data[vmanip.m_area.index(doorplace)] = MapNode(LEGN(ndef, "CONTENT_TORCH")); //vmanip.m_data[vmanip.m_area.index(doorplace)] = MapNode(ndef->getId("mapgen_torch"));
} }
static v3s16 rand_ortho_dir(PseudoRandom &random) static v3s16 rand_ortho_dir(PseudoRandom &random)
@ -525,7 +525,7 @@ static void make_corridor(VoxelManipulator &vmanip, v3s16 doorplace,
if(make_stairs) if(make_stairs)
{ {
make_fill(vmanip, p+v3s16(-1,-1,-1), v3s16(3,5,3), make_fill(vmanip, p+v3s16(-1,-1,-1), v3s16(3,5,3),
VMANIP_FLAG_DUNGEON_UNTOUCHABLE, MapNode(LEGN(ndef, "CONTENT_COBBLE")), 0); VMANIP_FLAG_DUNGEON_UNTOUCHABLE, MapNode(ndef->getId("mapgen_cobble")), 0);
make_fill(vmanip, p, v3s16(1,2,1), 0, MapNode(CONTENT_AIR), make_fill(vmanip, p, v3s16(1,2,1), 0, MapNode(CONTENT_AIR),
VMANIP_FLAG_DUNGEON_INSIDE); VMANIP_FLAG_DUNGEON_INSIDE);
make_fill(vmanip, p-dir, v3s16(1,2,1), 0, MapNode(CONTENT_AIR), make_fill(vmanip, p-dir, v3s16(1,2,1), 0, MapNode(CONTENT_AIR),
@ -534,7 +534,7 @@ static void make_corridor(VoxelManipulator &vmanip, v3s16 doorplace,
else else
{ {
make_fill(vmanip, p+v3s16(-1,-1,-1), v3s16(3,4,3), make_fill(vmanip, p+v3s16(-1,-1,-1), v3s16(3,4,3),
VMANIP_FLAG_DUNGEON_UNTOUCHABLE, MapNode(LEGN(ndef, "CONTENT_COBBLE")), 0); VMANIP_FLAG_DUNGEON_UNTOUCHABLE, MapNode(ndef->getId("mapgen_cobble")), 0);
make_hole1(vmanip, p, ndef); make_hole1(vmanip, p, ndef);
/*make_fill(vmanip, p, v3s16(1,2,1), 0, MapNode(CONTENT_AIR), /*make_fill(vmanip, p, v3s16(1,2,1), 0, MapNode(CONTENT_AIR),
VMANIP_FLAG_DUNGEON_INSIDE);*/ VMANIP_FLAG_DUNGEON_INSIDE);*/
@ -613,9 +613,9 @@ public:
continue; continue;
} }
if(vmanip.getNodeNoExNoEmerge(p).getContent() if(vmanip.getNodeNoExNoEmerge(p).getContent()
== LEGN(m_ndef, "CONTENT_COBBLE") == m_ndef->getId("mapgen_cobble")
&& vmanip.getNodeNoExNoEmerge(p1).getContent() && vmanip.getNodeNoExNoEmerge(p1).getContent()
== LEGN(m_ndef, "CONTENT_COBBLE")) == m_ndef->getId("mapgen_cobble"))
{ {
// Found wall, this is a good place! // Found wall, this is a good place!
result_place = p; result_place = p;
@ -629,25 +629,25 @@ public:
*/ */
// Jump one up if the actual space is there // Jump one up if the actual space is there
if(vmanip.getNodeNoExNoEmerge(p+v3s16(0,0,0)).getContent() if(vmanip.getNodeNoExNoEmerge(p+v3s16(0,0,0)).getContent()
== LEGN(m_ndef, "CONTENT_COBBLE") == m_ndef->getId("mapgen_cobble")
&& vmanip.getNodeNoExNoEmerge(p+v3s16(0,1,0)).getContent() && vmanip.getNodeNoExNoEmerge(p+v3s16(0,1,0)).getContent()
== LEGN(m_ndef, "CONTENT_AIR") == CONTENT_AIR
&& vmanip.getNodeNoExNoEmerge(p+v3s16(0,2,0)).getContent() && vmanip.getNodeNoExNoEmerge(p+v3s16(0,2,0)).getContent()
== LEGN(m_ndef, "CONTENT_AIR")) == CONTENT_AIR)
p += v3s16(0,1,0); p += v3s16(0,1,0);
// Jump one down if the actual space is there // Jump one down if the actual space is there
if(vmanip.getNodeNoExNoEmerge(p+v3s16(0,1,0)).getContent() if(vmanip.getNodeNoExNoEmerge(p+v3s16(0,1,0)).getContent()
== LEGN(m_ndef, "CONTENT_COBBLE") == m_ndef->getId("mapgen_cobble")
&& vmanip.getNodeNoExNoEmerge(p+v3s16(0,0,0)).getContent() && vmanip.getNodeNoExNoEmerge(p+v3s16(0,0,0)).getContent()
== LEGN(m_ndef, "CONTENT_AIR") == CONTENT_AIR
&& vmanip.getNodeNoExNoEmerge(p+v3s16(0,-1,0)).getContent() && vmanip.getNodeNoExNoEmerge(p+v3s16(0,-1,0)).getContent()
== LEGN(m_ndef, "CONTENT_AIR")) == CONTENT_AIR)
p += v3s16(0,-1,0); p += v3s16(0,-1,0);
// Check if walking is now possible // Check if walking is now possible
if(vmanip.getNodeNoExNoEmerge(p).getContent() if(vmanip.getNodeNoExNoEmerge(p).getContent()
!= LEGN(m_ndef, "CONTENT_AIR") != CONTENT_AIR
|| vmanip.getNodeNoExNoEmerge(p+v3s16(0,1,0)).getContent() || vmanip.getNodeNoExNoEmerge(p+v3s16(0,1,0)).getContent()
!= LEGN(m_ndef, "CONTENT_AIR")) != CONTENT_AIR)
{ {
// Cannot continue walking here // Cannot continue walking here
randomizeDir(); randomizeDir();
@ -799,7 +799,7 @@ static void make_dungeon1(VoxelManipulator &vmanip, PseudoRandom &random,
v3s16 room_center = roomplace + v3s16(roomsize.X/2,1,roomsize.Z/2); v3s16 room_center = roomplace + v3s16(roomsize.X/2,1,roomsize.Z/2);
// Place torch at room center (for testing) // Place torch at room center (for testing)
//vmanip.m_data[vmanip.m_area.index(room_center)] = MapNode(LEGN(ndef, "CONTENT_TORCH")); //vmanip.m_data[vmanip.m_area.index(room_center)] = MapNode(ndef->getId("mapgen_torch"));
// Quit if last room // Quit if last room
if(i == room_count-1) if(i == room_count-1)
@ -888,12 +888,12 @@ static void make_nc(VoxelManipulator &vmanip, PseudoRandom &random,
16+random.range(0,15), 16+random.range(0,15),
16+random.range(0,15), 16+random.range(0,15),
16+random.range(0,15)); 16+random.range(0,15));
vmanip.m_data[vmanip.m_area.index(p)] = MapNode(LEGN(ndef, "CONTENT_NC"), facedir_i); vmanip.m_data[vmanip.m_area.index(p)] = MapNode(ndef->getId("mapgen_nyancat"), facedir_i);
u32 length = random.range(3,15); u32 length = random.range(3,15);
for(u32 j=0; j<length; j++) for(u32 j=0; j<length; j++)
{ {
p -= dir; p -= dir;
vmanip.m_data[vmanip.m_area.index(p)] = MapNode(LEGN(ndef, "CONTENT_NC_RB")); vmanip.m_data[vmanip.m_area.index(p)] = MapNode(ndef->getId("mapgen_nyancat_rainbow"));
} }
} }
@ -1342,7 +1342,7 @@ void make_block(BlockMakeData *data)
// Creates variables c_name=id and n_name=node // Creates variables c_name=id and n_name=node
#define CONTENT_VARIABLE(ndef, name)\ #define CONTENT_VARIABLE(ndef, name)\
content_t c_##name = ndef->getId(#name);\ content_t c_##name = ndef->getId("mapgen_" #name);\
MapNode n_##name(c_##name); MapNode n_##name(c_##name);
CONTENT_VARIABLE(ndef, stone); CONTENT_VARIABLE(ndef, stone);