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

Merge pull request #365 from OpenMW/master

Browse source 
Add OpenMW commits up to 2 Jan 2017
This commit is contained in:
David Cernat 2018-01-04 12:12:18 +02:00 committed by GitHub
commit a818140c14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -705,7 +705,7 @@ namespace MWPhysics
if (physFramerate > 0) if (physFramerate > 0)
{ {
mPhysicsDt = 1.f / physFramerate; mPhysicsDt = 1.f / physFramerate;
std::cerr << "Warning: physics framerate was overriden (a new value is " << physFramerate << ")." << std::endl; std::cerr << "Warning: physics framerate was overridden (a new value is " << physFramerate << ")." << std::endl;
} }
} }
} }

4
components/nif/data.cpp
View file

@ -153,12 +153,12 @@ void NiPixelData::read(NIFStream *nif)
// Unknown // Unknown
nif->skip(12); nif->skip(12);
mips = nif->getInt(); numberOfMipmaps = nif->getInt();
// Bytes per pixel, should be bpp * 8 // Bytes per pixel, should be bpp * 8
/* int bytes = */ nif->getInt(); /* int bytes = */ nif->getInt();
for(int i=0; i<mips; i++) for(int i=0; i<numberOfMipmaps; i++)
{ {
// Image size and offset in the following data field // Image size and offset in the following data field
Mipmap m; Mipmap m;

2
components/nif/data.hpp
View file

@ -115,7 +115,7 @@ public:
Format fmt; Format fmt;
unsigned int rmask, gmask, bmask, amask; unsigned int rmask, gmask, bmask, amask;
int bpp, mips; int bpp, numberOfMipmaps;
struct Mipmap struct Mipmap
{ {