Commit 0e6d4118 authored by bret curtis's avatar bret curtis

revert this if we need a new release, right now we want to fix daily builds on launchpad

parent d8c4dc8a
Corrects the appdata file to a more recent format.
diff --git a/files/openmw.appdata.xml b/files/openmw.appdata.xml
index 1c16cb9a4..932c82ad7 100644
--- a/files/openmw.appdata.xml
+++ b/files/openmw.appdata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2015 Alexandre Moine <nobrakal@gmail.com> -->
-<application>
- <id type="desktop">openmw.desktop</id>
+<!--
+Copyright 2015 Alexandre Moine <nobrakal@gmail.com>
+Copyright 2017 Bret Curtis <psi29a@gmail.com>
+-->
+<component>
+ <id>org.openmw.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
- <project_license> GPL-3.0 and MIT and zlib</project_license>
+ <project_license> GPL-3.0 and MIT</project_license>
<name>OpenMW</name>
<summary>Unofficial open source engine re-implementation of the game Morrowind</summary>
<description>
@@ -32,8 +35,7 @@
<caption>Vivec seen from Ebonheart on OpenMW</caption>
</screenshot>
</screenshots>
-<updatecontact>nobrakal@gmail.com</updatecontact>
<url type="homepage">https://openmw.org</url>
<url type="bugtracker">https://bugs.openmw.org/</url>
<url type="faq">https://openmw.org/faq/</url>
-</application>
+</component>
Fixes building on MIPS arches.
diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index a6721fde1..d19c8321e 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -153,12 +153,12 @@ void NiPixelData::read(NIFStream *nif)
// Unknown
nif->skip(12);
- mips = nif->getInt();
+ numberOfMipmaps = nif->getInt();
// Bytes per pixel, should be bpp * 8
/* 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
Mipmap m;
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index e6227b52a..9b4a3a67c 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -115,7 +115,7 @@ public:
Format fmt;
unsigned int rmask, gmask, bmask, amask;
- int bpp, mips;
+ int bpp, numberOfMipmaps;
struct Mipmap
{
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment