3 files changed, 8 insertions(+), 6 deletions(-)

M src/commands/all_command.rs
M src/commands/command_data.rs
M src/commands/reset_command.rs

@@ 8,7 8,7 @@ pub struct AllCommand;
 
 impl SpecificCommandHandler for AllCommand {
     fn handle(&self, command: CommandData) -> Result<(), CommandHandleError> {
-        let (cmd, map) = command.deconstruct();
+        let (cmd, map) = command.deconstruct_map();
 
         if cmd.parsed_arguments().len() < 4 {
             println!("Less than 4 args.");

@@ 36,4 36,8 @@ impl<'d, 'a> CommandData<'d, 'a> {
     pub fn deconstruct_animation(self) -> (&'d Command<'d>, &'d mut AnimationStorage) {
         (self.command, self.animation_storage)
     }
+
+    pub fn deconstruct(self) -> (&'d Command<'d>, &'d mut Map<'a>, &'d mut AnimationStorage) {
+        (self.command, self.map, self.animation_storage)
+    }
 }=
\ No newline at end of file

@@ 6,11 6,9 @@ pub struct ResetCommand;
 
 impl SpecificCommandHandler for ResetCommand {
     fn handle(&self, command: CommandData) -> Result<(), CommandHandleError> {
-        for led in command.map().get_map_mut() {
-            led.r = 0;
-            led.g = 0;
-            led.b = 0;
-        }
+        let (_, map, animation) = command.deconstruct();
+        map.clear();
+        animation.remove_animation();
         Ok(())
     }