Merge pull request #83 from scd31/world_format_bugfix

revert a small world change
louis-e · Nov 2, 2024 · 25e4b17 · 25e4b17
2 parents 7decd37 + 2068c1a
commit 25e4b17
Showing 1 changed file with 24 additions and 30 deletions.
diff --git a/src/world_editor.rs b/src/world_editor.rs
@@ -72,43 +72,37 @@ impl SectionToModify {
         palette.sort();
         palette.dedup();
 
-        let data = if palette.len() == 1 {
-            vec![]
-        } else {
-            let palette_lookup: FnvHashMap<_, _> = palette
-                .iter()
-                .enumerate()
-                .map(|(k, v)| (v, i64::try_from(k).unwrap()))
-                .collect();
-
-            let mut bits_per_block = 4; // minimum allowed
-            while (1 << bits_per_block) < palette.len() {
-                bits_per_block += 1;
-            }
-
-            let mut data = vec![];
+        let palette_lookup: FnvHashMap<_, _> = palette
+            .iter()
+            .enumerate()
+            .map(|(k, v)| (v, i64::try_from(k).unwrap()))
+            .collect();
 
-            let mut cur = 0;
-            let mut cur_idx = 0;
-            for block in &self.blocks {
-                let p = palette_lookup[block];
+        let mut bits_per_block = 4; // minimum allowed
+        while (1 << bits_per_block) < palette.len() {
+            bits_per_block += 1;
+        }
 
-                if cur_idx + bits_per_block > 64 {
-                    data.push(cur);
-                    cur = 0;
-                    cur_idx = 0;
-                }
+        let mut data = vec![];
 
-                cur |= p << cur_idx;
-                cur_idx += bits_per_block;
-            }
+        let mut cur = 0;
+        let mut cur_idx = 0;
+        for block in &self.blocks {
+            let p = palette_lookup[block];
 
-            if cur_idx > 0 {
+            if cur_idx + bits_per_block > 64 {
                 data.push(cur);
+                cur = 0;
+                cur_idx = 0;
             }
 
-            data
-        };
+            cur |= p << cur_idx;
+            cur_idx += bits_per_block;
+        }
+
+        if cur_idx > 0 {
+            data.push(cur);
+        }
 
         let palette = palette
             .iter()