From 4c642f09bdf54e32cf8332048952ab71ca6ca491 Mon Sep 17 00:00:00 2001
From: Kristofers Solo <kristians.cagulis@gmail.com>
Date: Thu, 24 Nov 2022 13:21:27 +0200
Subject: [PATCH] Removed errors

---
 src/main.rs | 107 ++++++++++++++++++++++++----------------------------
 1 file changed, 49 insertions(+), 58 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 34f51d3..8f1d2c8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,65 +2,61 @@ extern crate rand;
 
 use rand::Rng;
 
+use crossterm::terminal;
 use std::thread;
 use std::time::{Duration, Instant};
-use crossterm::terminal;
 
 fn main() {
     const COLOR_PALLET: [[u8; 3]; 37] = [
-    [0x07, 0x07, 0x07],
-    [0x1F, 0x07, 0x07],
-    [0x2F, 0x0F, 0x07],
-    [0x47, 0x0F, 0x07],
-    [0x57, 0x17, 0x07],
-    [0x67, 0x1F, 0x07],
-    [0x77, 0x1F, 0x07],
-    [0x8F, 0x27, 0x07],
-    [0x9F, 0x2F, 0x07],
-    [0xAF, 0x3F, 0x07],
-    [0xBF, 0x47, 0x07],
-    [0xC7, 0x47, 0x07],
-    [0xDF, 0x4F, 0x07],
-    [0xDF, 0x57, 0x07],
-    [0xDF, 0x57, 0x07],
-    [0xD7, 0x5F, 0x07],
-    [0xD7, 0x5F, 0x07],
-    [0xD7, 0x67, 0x0F],
-    [0xCF, 0x6F, 0x0F],
-    [0xCF, 0x77, 0x0F],
-    [0xCF, 0x7F, 0x0F],
-    [0xCF, 0x87, 0x17],
-    [0xC7, 0x87, 0x17],
-    [0xC7, 0x8F, 0x17],
-    [0xC7, 0x97, 0x1F],
-    [0xBF, 0x9F, 0x1F],
-    [0xBF, 0x9F, 0x1F],
-    [0xBF, 0xA7, 0x27],
-    [0xBF, 0xA7, 0x27],
-    [0xBF, 0xAF, 0x2F],
-    [0xB7, 0xAF, 0x2F],
-    [0xB7, 0xB7, 0x2F],
-    [0xB7, 0xB7, 0x37],
-    [0xCF, 0xCF, 0x6F],
-    [0xDF, 0xDF, 0x9F],
-    [0xEF, 0xEF, 0xC7],
-    [0xFF, 0xFF, 0xFF],
-];
+        [0x07, 0x07, 0x07],
+        [0x1F, 0x07, 0x07],
+        [0x2F, 0x0F, 0x07],
+        [0x47, 0x0F, 0x07],
+        [0x57, 0x17, 0x07],
+        [0x67, 0x1F, 0x07],
+        [0x77, 0x1F, 0x07],
+        [0x8F, 0x27, 0x07],
+        [0x9F, 0x2F, 0x07],
+        [0xAF, 0x3F, 0x07],
+        [0xBF, 0x47, 0x07],
+        [0xC7, 0x47, 0x07],
+        [0xDF, 0x4F, 0x07],
+        [0xDF, 0x57, 0x07],
+        [0xDF, 0x57, 0x07],
+        [0xD7, 0x5F, 0x07],
+        [0xD7, 0x5F, 0x07],
+        [0xD7, 0x67, 0x0F],
+        [0xCF, 0x6F, 0x0F],
+        [0xCF, 0x77, 0x0F],
+        [0xCF, 0x7F, 0x0F],
+        [0xCF, 0x87, 0x17],
+        [0xC7, 0x87, 0x17],
+        [0xC7, 0x8F, 0x17],
+        [0xC7, 0x97, 0x1F],
+        [0xBF, 0x9F, 0x1F],
+        [0xBF, 0x9F, 0x1F],
+        [0xBF, 0xA7, 0x27],
+        [0xBF, 0xA7, 0x27],
+        [0xBF, 0xAF, 0x2F],
+        [0xB7, 0xAF, 0x2F],
+        [0xB7, 0xB7, 0x2F],
+        [0xB7, 0xB7, 0x37],
+        [0xCF, 0xCF, 0x6F],
+        [0xDF, 0xDF, 0x9F],
+        [0xEF, 0xEF, 0xC7],
+        [0xFF, 0xFF, 0xFF],
+    ];
     let fire_width = 320;
     let fire_height = 168;
-    let time_per_frame = 1000/ 60;
+    let time_per_frame = 1000 / 60;
     let mut doom_fire = vec![0; fire_width * fire_height];
 
+    let mut term_width = 0;
+    let mut term_height = 0;
 
-    let mut term_width = 0 as u32;
-    let mut term_height = 0 as u32;
-
-    match terminal::size() {
-        Ok(res) => {
-            term_width = res.0 as u32 * 8;
-            term_height = res.1 as u32 * 8 * 2;
-        }
-        Err(_) => {}
+    if let Ok(res) = terminal::size() {
+        term_width = res.0 as u32 * 8;
+        term_height = res.1 as u32 * 8 * 2;
     }
 
     let mut engine = blockish::ThreadedEngine::new(term_width, term_height, false);
@@ -80,23 +76,18 @@ fn main() {
                     let dst = (src - r + 1) as usize;
                     let res = doom_fire[src] - (r & 1);
                     doom_fire[dst - fire_width] = res;
-                }
-                else {
+                } else {
                     doom_fire[src - fire_width] = 0;
                 }
             }
         }
 
         engine.render(&|x, y| {
-            let start = (y * fire_height as u32 / term_height * fire_width as u32 + (x * fire_width as u32 / term_width))
-                as usize;
+            let start = (y * fire_height as u32 / term_height * fire_width as u32
+                + (x * fire_width as u32 / term_width)) as usize;
             let pixel = doom_fire[start];
             let rgb = COLOR_PALLET[pixel];
-            (
-                rgb[0],
-                rgb[1],
-                rgb[2],
-            )
+            (rgb[0], rgb[1], rgb[2])
         });
         let end_time = Instant::now();
         let render_time = end_time - start_time;