From 724505e6dc3b15d5c4f92739686af1289f294cf0 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 12 Apr 2020 10:25:38 -0400
Subject: [PATCH] CAreaOctTree: Make use of std::array where applicable

Prevents any implicit array to pointer decay from occurring.
---
 Runtime/Collision/CAreaOctTree.cpp | 41 ++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/Runtime/Collision/CAreaOctTree.cpp b/Runtime/Collision/CAreaOctTree.cpp
index 0b40613aa..3e8fada5b 100644
--- a/Runtime/Collision/CAreaOctTree.cpp
+++ b/Runtime/Collision/CAreaOctTree.cpp
@@ -52,18 +52,39 @@ static bool BoxLineTest(const zeus::CAABox& aabb, const zeus::CLine& line, float
   return lT <= hT;
 }
 
-static const int SomeIndexA[] = {1, 2, 4};
+constexpr std::array SomeIndexA{1, 2, 4};
 
-static const int SomeIndexB[] = {1, 2, 0};
+constexpr std::array SomeIndexB{1, 2, 0};
 
-static const int SomeIndexC[8][8] = {{0, 1, 2, 4, 5, 6, 8, 0xA}, {0, 1, 2, 3, 5, 6, 8, 0xA}, {0, 1, 2, 4, 5, 6, 9, 0xB},
-                                     {0, 1, 2, 3, 5, 6, 9, 0xC}, {0, 1, 2, 4, 5, 7, 8, 0xD}, {0, 1, 2, 3, 5, 7, 8, 0xE},
-                                     {0, 1, 2, 4, 5, 7, 9, 0xF}, {0, 1, 2, 3, 5, 7, 9, 0xF}};
+constexpr std::array<std::array<int, 8>, 8> SomeIndexC{{
+    {0, 1, 2, 4, 5, 6, 8, 0xA},
+    {0, 1, 2, 3, 5, 6, 8, 0xA},
+    {0, 1, 2, 4, 5, 6, 9, 0xB},
+    {0, 1, 2, 3, 5, 6, 9, 0xC},
+    {0, 1, 2, 4, 5, 7, 8, 0xD},
+    {0, 1, 2, 3, 5, 7, 8, 0xE},
+    {0, 1, 2, 4, 5, 7, 9, 0xF},
+    {0, 1, 2, 3, 5, 7, 9, 0xF},
+}};
 
-static const std::pair<int, std::array<int, 3>> SubdivIndex[16] = {
-    {0, {0, 0, 0}}, {1, {0, 0, 0}}, {1, {1, 0, 0}}, {2, {0, 1, 0}}, {2, {1, 0, 0}}, {1, {2, 0, 0}},
-    {2, {0, 2, 0}}, {2, {2, 0, 0}}, {2, {2, 1, 0}}, {2, {1, 2, 0}}, {3, {0, 2, 1}}, {3, {1, 0, 2}},
-    {3, {0, 1, 2}}, {3, {2, 1, 0}}, {3, {2, 0, 1}}, {3, {1, 2, 0}}};
+constexpr std::array<std::pair<int, std::array<int, 3>>, 16> SubdivIndex{{
+    {0, {0, 0, 0}},
+    {1, {0, 0, 0}},
+    {1, {1, 0, 0}},
+    {2, {0, 1, 0}},
+    {2, {1, 0, 0}},
+    {1, {2, 0, 0}},
+    {2, {0, 2, 0}},
+    {2, {2, 0, 0}},
+    {2, {2, 1, 0}},
+    {2, {1, 2, 0}},
+    {3, {0, 2, 1}},
+    {3, {1, 0, 2}},
+    {3, {0, 1, 2}},
+    {3, {2, 1, 0}},
+    {3, {2, 0, 1}},
+    {3, {1, 2, 0}},
+}};
 
 bool CAreaOctTree::Node::LineTestInternal(const zeus::CLine& line, const CMaterialFilter& filter, float lT, float hT,
                                           float maxT, const zeus::CVector3f& vec) const {
@@ -149,7 +170,7 @@ bool CAreaOctTree::Node::LineTestInternal(const zeus::CLine& line, const CMateri
     int r28 = 0;
     int r25 = 0;
     int r26 = 0;
-    for (int i = 0; i < 3; ++i) {
+    for (size_t i = 0; i < 3; ++i) {
       if (r6[i] >= center[i])
         r28 |= SomeIndexA[i];
       if (r7[i] >= center[i])