bendns' repos / mindus
mindustry logic execution, map- and schematic- parsing and rendering
Diffstat (limited to 'src/block/simple.rs')
-rw-r--r--src/block/simple.rs14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/block/simple.rs b/src/block/simple.rs
index 20a9f22..f3053ee 100644
--- a/src/block/simple.rs
+++ b/src/block/simple.rs
@@ -124,18 +124,28 @@ macro_rules! make_simple {
($name: ident => $read: expr) => {
crate::block::simple::make_simple!(
$name,
- |m: &Self, n, _, _, _, s| crate::data::renderer::read(n, m.get_size(), s),
+ |_, n, _, _, _, s| crate::data::renderer::load(n, s),
$read
);
};
($name: ident) => {
crate::block::simple::make_simple!(
$name,
- |m: &Self, n, _, _, _, s| crate::data::renderer::read(n, m.get_size(), s),
+ |_, n, _, _, _, s| crate::data::renderer::load(n, s),
|_, _, _, _| Ok(()),
false
);
};
+ ($name: ident => $draw: expr, $read: expr) => {
+ crate::block::simple::make_simple!($name, |_, _, _, _, _, scl| $draw(scl), $read);
+ };
+ ($name: ident / $draw: expr) => {
+ crate::block::simple::make_simple!(
+ $name,
+ |_, _, _, _, _, scl| $draw(scl),
+ |_, _, _, _| Ok(())
+ );
+ };
}
pub(crate) use make_simple;