Properly reverse the HRTF field order when loading it

And combine a couple arrays into an array structure

1 files changed, 7 insertions, 6 deletions

diff --git a/Alc/hrtf.h b/Alc/hrtf.h
index 68a4301b..0283de13 100644
--- a/Alc/hrtf.h
+++ b/Alc/hrtf.h
@@ -29,20 +29,21 @@ struct HrtfEntry {
     ALuint sampleRate;
     ALsizei irSize;
 
-    /* Base elevation index for the farthest field. */
-    ALsizei evFarBase;
     struct Field {
-        ALubyte evCount;
         ALfloat distance;
+        ALubyte evCount;
     };
     /* NOTE: Fields are stored *backwards*. field[0] is the farthest field, and
      * field[fdCount-1] is the nearest.
      */
     ALsizei fdCount;
-    Field *field;
+    const Field *field;
 
-    const ALubyte *azCount;
-    const ALushort *evOffset;
+    struct Elevation {
+        ALushort azCount;
+        ALushort irOffset;
+    };
+    Elevation *elev;
     const ALfloat (*coeffs)[2];
     const ALubyte (*delays)[2];