diff options
Diffstat (limited to 'ecs/src/system')
| -rw-r--r-- | ecs/src/system/stateful.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ecs/src/system/stateful.rs b/ecs/src/system/stateful.rs index 7b136cf..3f71000 100644 --- a/ecs/src/system/stateful.rs +++ b/ecs/src/system/stateful.rs @@ -14,7 +14,7 @@ use crate::tuple::{ TakeOptionElementResult as TupleTakeOptionElementResult, WithOptionElements as TupleWithOptionElements, }; -use crate::ComponentStorage; +use crate::WorldData; /// A stateful system. pub struct Stateful<Func> @@ -76,7 +76,7 @@ macro_rules! impl_system { self } - fn run(&mut self, component_storage: &mut ComponentStorage) + fn run(&mut self, world_data: &mut WorldData) { #( check_params_are_compatible!(I, TParam~I, $c); @@ -91,11 +91,11 @@ macro_rules! impl_system { }; // SAFETY: All parameters are compatible so this is fine - let component_storage = unsafe { - &mut *addr_of_mut!(*component_storage) + let world_data = unsafe { + &mut *addr_of_mut!(*world_data) }; - TParam~I::new(this, component_storage) + TParam~I::new(this, world_data) },)*); } @@ -103,10 +103,10 @@ macro_rules! impl_system { { TypeErased { data: Box::new(self), - func: Box::new(|data, component_storage| { + func: Box::new(|data, world_data| { let me = data.downcast_mut::<Self>().unwrap(); - me.run(component_storage); + me.run(world_data); }), } } |