krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Windows compatibility patch

Browse source
This commit is contained in:
Nicolay Korslund 2010-06-12 09:48:58 +02:00
parent 522a5bbaf6
commit 10c1d78c38
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -10,3 +10,4 @@ Ogre.log
ogre.cfg ogre.cfg
build build
plugins.cfg plugins.cfg
openmw.cfg

2
nif/nif_file.cpp
View file

@ -156,7 +156,7 @@ void NIFFile::parse()
fail("Unknown record type " + rec.toString()); fail("Unknown record type " + rec.toString());
assert(r != NULL); assert(r != NULL);
assert(r->recType != RC_NONE); assert(r->recType != RC_MISSING);
r->recName = rec; r->recName = rec;
records[i] = r; records[i] = r;
r->read(this); r->read(this);

2
nif/node.hpp
View file

@ -139,7 +139,7 @@ struct NiCamera : Node
struct Camera struct Camera
{ {
// Camera frustrum // Camera frustrum
float left, right, top, bottom, near, far; float left, right, top, bottom, nearDist, farDist;
// Viewport // Viewport
float vleft, vright, vtop, vbottom; float vleft, vright, vtop, vbottom;

4
nif/record.hpp
View file

@ -31,7 +31,7 @@ class NIFFile;
enum RecordType enum RecordType
{ {
RC_NONE = 0, RC_MISSING = 0,
RC_NiNode, RC_NiNode,
RC_NiTriShape, RC_NiTriShape,
RC_NiRotatingParticles, RC_NiRotatingParticles,
@ -89,7 +89,7 @@ struct Record
int recType; int recType;
SString recName; SString recName;
Record() : recType(RC_NONE) {} Record() : recType(RC_MISSING) {}
/// Parses the record from file /// Parses the record from file
virtual void read(NIFFile *nif) = 0; virtual void read(NIFFile *nif) = 0;

2
nifogre/ogre_nif_loader.cpp
View file

@ -420,7 +420,7 @@ static void handleNiTriShape(Mesh *mesh, NiTriShape *shape, int flags)
// Alpha modifiers // Alpha modifiers
int alphaFlags = -1; int alphaFlags = -1;
ubyte alphaTest; ubyte alphaTest = 0;
if(a) if(a)
{ {
alphaFlags = a->flags; alphaFlags = a->flags;