mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 04:10:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1593 from psi29a/fix_mips_builds

Browse source 
fix building on mips machines
This commit is contained in:
Bret Curtis 2018-01-02 11:45:42 +01:00 committed by GitHub
commit b86118f76f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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
{ {