From 081a9da17aabf3636deeecf98e785e1de5a2ac76 Mon Sep 17 00:00:00 2001
From: emoose <abc@cock.li>
Date: Sat, 11 Jan 2020 09:31:31 +0000
Subject: [PATCH] [VFS] Fix BlockToHashBlockOffset's level 2 case (blockStep0
 -> blockStep1)

& changed code to switch statement instead.
---
 .../vfs/devices/stfs_container_device.cc      | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/xenia/vfs/devices/stfs_container_device.cc b/src/xenia/vfs/devices/stfs_container_device.cc
index 24f17b748..411547311 100644
--- a/src/xenia/vfs/devices/stfs_container_device.cc
+++ b/src/xenia/vfs/devices/stfs_container_device.cc
@@ -654,24 +654,28 @@ size_t StfsContainerDevice::BlockToHashBlockOffset(uint64_t block,
   }
 
   uint64_t backing_num = 0;
-  if (hash_level == 0) {
-    backing_num = (block / 0xAA) * blockStep0;
-    if (block / 0xAA == 0) {
-      return BackingBlockToOffsetSTFS(backing_num);
-    }
+  switch (hash_level) {
+    case 0:
+      backing_num = (block / 0xAA) * blockStep0;
+      if (block / 0xAA == 0) {
+        return BackingBlockToOffsetSTFS(backing_num);
+      }
 
-    backing_num = backing_num + ((block / 0x70E4) + 1) * numTables;
-    if (block / 0x70E4 == 0) {
-      return BackingBlockToOffsetSTFS(backing_num);
-    }
-  } else if (hash_level == 1) {
-    backing_num = (block / 0x70E4) * blockStep1;
-    if (block / 0x70E4 == 0) {
-      return BackingBlockToOffsetSTFS(backing_num + blockStep0);
-    }
-  } else {
-    return BackingBlockToOffsetSTFS(blockStep0);
+      backing_num += ((block / 0x70E4) + 1) * numTables;
+      if (block / 0x70E4 == 0) {
+        return BackingBlockToOffsetSTFS(backing_num);
+      }
+      break;
+    case 1:
+      backing_num = (block / 0x70E4) * blockStep1;
+      if (block / 0x70E4 == 0) {
+        return BackingBlockToOffsetSTFS(backing_num + blockStep0);
+      }
+      break;
+    default:
+      return BackingBlockToOffsetSTFS(blockStep1);
   }
+
   return BackingBlockToOffsetSTFS(backing_num + numTables);
 }