Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed normal StructureBlock variant

Browse Source
This commit is contained in:
Joshua Barretto 2019-08-18 15:33:16 +01:00
parent 749ec15bf9
commit 49426565dc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/terrain/structure.rs
View File

@ -20,7 +20,7 @@ pub enum StructureBlock {
GreenSludge,
Fruit,
Hollow,
Block(Rgb<u8>),
Normal(Rgb<u8>),
}
impl Vox for StructureBlock {
@ -30,7 +30,7 @@ impl Vox for StructureBlock {
fn is_empty(&self) -> bool {
match self {
StructureBlock::Block(block) => block.is_empty(),
StructureBlock::None => true,
_ => false,
}
}
@ -118,7 +118,7 @@ impl Asset for Structure {
.get(index as usize)
.copied()
.unwrap_or_else(|| Rgb::broadcast(0));
StructureBlock::Block(color)
StructureBlock::Normal(color)
}
};

2
world/src/block/mod.rs
View File

@ -510,7 +510,7 @@ fn block_from_structure(
.map(|e| e as u8),
)),
StructureBlock::Hollow => Some(Block::empty()),
StructureBlock::Block(color) => {
StructureBlock::Normal(color) => {
Some(Block::new(default_kind, color)).filter(|block| !block.is_empty())
}
}