diff --git a/components/nif/effect.cpp b/components/nif/effect.cpp index 8db6de06d4..ae4c7947cb 100644 --- a/components/nif/effect.cpp +++ b/components/nif/effect.cpp @@ -26,27 +26,27 @@ namespace Nif { NiDynamicEffect::read(nif); - mDimmer = nif->getFloat(); - mAmbient = nif->getVector3(); - mDiffuse = nif->getVector3(); - mSpecular = nif->getVector3(); + nif->read(mDimmer); + nif->read(mAmbient); + nif->read(mDiffuse); + nif->read(mSpecular); } void NiPointLight::read(NIFStream* nif) { NiLight::read(nif); - mConstantAttenuation = nif->getFloat(); - mLinearAttenuation = nif->getFloat(); - mQuadraticAttenuation = nif->getFloat(); + nif->read(mConstantAttenuation); + nif->read(mLinearAttenuation); + nif->read(mQuadraticAttenuation); } void NiSpotLight::read(NIFStream* nif) { NiPointLight::read(nif); - mCutoff = nif->getFloat(); - mExponent = nif->getFloat(); + nif->read(mCutoff); + nif->read(mExponent); } void NiTextureEffect::read(NIFStream* nif) diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp index 8a4ec847fc..95205c4fda 100644 --- a/components/nif/nifstream.hpp +++ b/components/nif/nifstream.hpp @@ -146,16 +146,6 @@ namespace Nif /// Read a sequence of null-terminated strings std::string getStringPalette(); - - /// DEPRECATED: Use read() or get() - char getChar() { return get(); } - unsigned short getUShort() { return get(); } - int getInt() { return get(); } - unsigned int getUInt() { return get(); } - float getFloat() { return get(); } - osg::Vec2f getVector2() { return get(); } - osg::Vec3f getVector3() { return get(); } - osg::Vec4f getVector4() { return get(); } }; template <>