diff --git a/.gitignore b/.gitignore index 2ef5fff44..357e6de30 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ Ogre.log ogre.cfg build plugins.cfg +openmw.cfg diff --git a/nif/nif_file.cpp b/nif/nif_file.cpp index 40e923f7e..0decd77e1 100644 --- a/nif/nif_file.cpp +++ b/nif/nif_file.cpp @@ -156,7 +156,7 @@ void NIFFile::parse() fail("Unknown record type " + rec.toString()); assert(r != NULL); - assert(r->recType != RC_NONE); + assert(r->recType != RC_MISSING); r->recName = rec; records[i] = r; r->read(this); diff --git a/nif/node.hpp b/nif/node.hpp index 381dd7c2d..9e6b48885 100644 --- a/nif/node.hpp +++ b/nif/node.hpp @@ -139,7 +139,7 @@ struct NiCamera : Node struct Camera { // Camera frustrum - float left, right, top, bottom, near, far; + float left, right, top, bottom, nearDist, farDist; // Viewport float vleft, vright, vtop, vbottom; diff --git a/nif/record.hpp b/nif/record.hpp index 3e68489bc..9be3faf8d 100644 --- a/nif/record.hpp +++ b/nif/record.hpp @@ -31,7 +31,7 @@ class NIFFile; enum RecordType { - RC_NONE = 0, + RC_MISSING = 0, RC_NiNode, RC_NiTriShape, RC_NiRotatingParticles, @@ -89,7 +89,7 @@ struct Record int recType; SString recName; - Record() : recType(RC_NONE) {} + Record() : recType(RC_MISSING) {} /// Parses the record from file virtual void read(NIFFile *nif) = 0; diff --git a/nifogre/ogre_nif_loader.cpp b/nifogre/ogre_nif_loader.cpp index 32250305e..b4a6c8eb5 100644 --- a/nifogre/ogre_nif_loader.cpp +++ b/nifogre/ogre_nif_loader.cpp @@ -420,7 +420,7 @@ static void handleNiTriShape(Mesh *mesh, NiTriShape *shape, int flags) // Alpha modifiers int alphaFlags = -1; - ubyte alphaTest; + ubyte alphaTest = 0; if(a) { alphaFlags = a->flags;