From 956ede52fbd78922f7f903cdf6fc2cbbb3610249 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Wed, 13 Sep 2023 21:56:02 +0300
Subject: [PATCH] NIFStream: remove getShort, getMatrix3, getQuaternion

---
 components/nif/controller.cpp | 6 +++---
 components/nif/controller.hpp | 2 +-
 components/nif/nifstream.hpp  | 3 ---
 components/nif/node.cpp       | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/components/nif/controller.cpp b/components/nif/controller.cpp
index a3d7f33e45..80cc74ce23 100644
--- a/components/nif/controller.cpp
+++ b/components/nif/controller.cpp
@@ -264,7 +264,7 @@ namespace Nif
         bankDir = nif->getInt();
         maxBankAngle = nif->getFloat();
         smoothing = nif->getFloat();
-        followAxis = nif->getShort();
+        nif->read(followAxis);
         posData.read(nif);
         floatData.read(nif);
     }
@@ -507,7 +507,7 @@ namespace Nif
     void NiTransformInterpolator::read(NIFStream* nif)
     {
         defaultPos = nif->getVector3();
-        defaultRot = nif->getQuaternion();
+        nif->read(defaultRot);
         defaultScale = nif->getFloat();
         if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109))
         {
@@ -655,7 +655,7 @@ namespace Nif
         if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 109))
         {
             mPosValue = nif->getVector3();
-            mRotValue = nif->getQuaternion();
+            nif->read(mRotValue);
             mScaleValue = nif->getFloat();
             if (!nif->getBoolean())
                 mPosValue = osg::Vec3f();
diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
index 68e795e7fc..07c042e047 100644
--- a/components/nif/controller.hpp
+++ b/components/nif/controller.hpp
@@ -203,7 +203,7 @@ namespace Nif
 
         int bankDir;
         float maxBankAngle, smoothing;
-        short followAxis;
+        uint16_t followAxis;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
index f4c35e6625..9c9a097662 100644
--- a/components/nif/nifstream.hpp
+++ b/components/nif/nifstream.hpp
@@ -149,7 +149,6 @@ namespace Nif
 
         /// DEPRECATED: Use read() or get()
         char getChar() { return get<char>(); }
-        short getShort() { return get<short>(); }
         unsigned short getUShort() { return get<unsigned short>(); }
         int getInt() { return get<int>(); }
         unsigned int getUInt() { return get<unsigned int>(); }
@@ -157,8 +156,6 @@ namespace Nif
         osg::Vec2f getVector2() { return get<osg::Vec2f>(); }
         osg::Vec3f getVector3() { return get<osg::Vec3f>(); }
         osg::Vec4f getVector4() { return get<osg::Vec4f>(); }
-        Matrix3 getMatrix3() { return get<Matrix3>(); }
-        osg::Quat getQuaternion() { return get<osg::Quat>(); }
         bool getBoolean() { return get<bool>(); }
         std::string getString() { return get<std::string>(); }
     };
diff --git a/components/nif/node.cpp b/components/nif/node.cpp
index d7b6c3945b..ad966097b0 100644
--- a/components/nif/node.cpp
+++ b/components/nif/node.cpp
@@ -25,7 +25,7 @@ namespace Nif
             case BOX_BV:
             {
                 box.center = nif->getVector3();
-                box.axes = nif->getMatrix3();
+                nif->read(box.axes);
                 box.extents = nif->getVector3();
                 break;
             }