mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 14:09:42 +00:00
Code Issues Releases Wiki Activity

Remove useless parameter

Browse source
This commit is contained in:
elsid 2018-07-07 20:30:07 +03:00
parent c3298d13a6
commit 330e596c64
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/nifbullet/bulletnifloader.cpp
View file

@ -131,16 +131,14 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
// Find a boundingBox in the node hierarchy. // Find a boundingBox in the node hierarchy.
// Return: use bounding box for collision? // Return: use bounding box for collision?
bool BulletNifLoader::findBoundingBox(const Nif::Node* node, int flags) bool BulletNifLoader::findBoundingBox(const Nif::Node* node)
{ {
flags |= node->flags;
if (node->hasBounds) if (node->hasBounds)
{ {
mShape->mCollisionBoxHalfExtents = node->boundXYZ; mShape->mCollisionBoxHalfExtents = node->boundXYZ;
mShape->mCollisionBoxTranslate = node->boundPos; mShape->mCollisionBoxTranslate = node->boundPos;
if (flags & Nif::NiNode::Flag_BBoxCollision) if (node->flags & Nif::NiNode::Flag_BBoxCollision)
{ {
return true; return true;
} }

2
components/nifbullet/bulletnifloader.hpp
View file

@ -53,7 +53,7 @@ public:
osg::ref_ptr<Resource::BulletShape> load(const Nif::File& file); osg::ref_ptr<Resource::BulletShape> load(const Nif::File& file);
private: private:
bool findBoundingBox(const Nif::Node* node, int flags = 0); bool findBoundingBox(const Nif::Node* node);
void handleNode(const std::string& fileName, Nif::Node const *node, int flags, bool isCollisionNode, bool isAnimated=false, bool autogenerated=false); void handleNode(const std::string& fileName, Nif::Node const *node, int flags, bool isCollisionNode, bool isAnimated=false, bool autogenerated=false);