Hello community,
here is the log from the commit of package doomsday for openSUSE:Factory checked in at 2013-06-05 11:48:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/doomsday (Old)
and /work/SRC/openSUSE:Factory/.doomsday.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "doomsday"
Changes:
--------
--- /work/SRC/openSUSE:Factory/doomsday/doomsday.changes 2013-05-16 15:34:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.doomsday.new/doomsday.changes 2013-06-05 11:48:31.000000000 +0200
@@ -1,0 +2,8 @@
+Thu May 23 12:48:58 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 1.10.3
+* resolve stuck TEXTUREn lump loading with Hell Revealed II
+* fog should not be applied to weapon psprites
+- Remove deng-nodate.diff: kill __DATE__ with shell instead of patch
+
+-------------------------------------------------------------------
Old:
----
deng-nodate.diff
doomsday-1.10.0.tar.xz
New:
----
doomsday-1.10.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ doomsday.spec ++++++
--- /var/tmp/diff_new_pack.6fDfbm/_old 2013-06-05 11:48:32.000000000 +0200
+++ /var/tmp/diff_new_pack.6fDfbm/_new 2013-06-05 11:48:32.000000000 +0200
@@ -17,7 +17,7 @@
Name: doomsday
-Version: 1.10.0
+Version: 1.10.3
Release: 0
Summary: The Doomsday Engine: DOOM/Hertic/Hexen port with pretty graphics
License: GPL-2.0+ and GPL-2.0
@@ -25,10 +25,9 @@
# md2tool is the one being GPL-2.0-only
Url: http://dengine.net/
-#DL-URL: http://downloads.sf.net/deng/doomsday-1.10.0.tar.gz
+#DL-URL: http://downloads.sf.net/deng/doomsday-1.10.3.tar.gz
Source: %name-%version.tar.xz
Source2: %name-rpmlintrc
-Patch1: deng-nodate.diff
Patch3: deng-va-list.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -84,7 +83,7 @@
tar --use=xz -xf "%{S:0}";
%setup -DTq
%endif
-%patch -P 1 -P 3 -p1
+%patch -P 3 -p1
%build
pushd doomsday;
++++++ doomsday-1.10.0.tar.xz -> doomsday-1.10.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/distrib/autobuild.py new/doomsday-1.10.3/distrib/autobuild.py
--- old/doomsday-1.10.0/distrib/autobuild.py 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/distrib/autobuild.py 2013-05-20 07:18:42.000000000 +0200
@@ -145,12 +145,13 @@
# Also update the doomsday-fmod changelog (just version number).
os.chdir(os.path.join(builder.config.DISTRIB_DIR, 'dsfmod'))
-
+
fmodVer = build_version.parse_header_for_version('../../doomsday/plugins/fmod/include/version.h')
debVer = "%s.%s.%s-%s" % (fmodVer[0], fmodVer[1], fmodVer[2], todays_build_tag())
print "Marking new FMOD version:", debVer
msg = 'New release: Doomsday Engine build %i.' % builder.Event().number()
- os.system('dch --check-dirname-level 0 -v %s -b "%s"' % (debVer, msg))
+ os.system('rm -f debian/changelog && dch --check-dirname-level 0 --create --package doomsday-fmod -v %s "%s"' % (debVer, msg))
+
else:
# Save version information.
print >> file(builder.Event(toTag).file_path('version.txt'), 'wt'), \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/distrib/builder/changes.py new/doomsday-1.10.3/distrib/builder/changes.py
--- old/doomsday-1.10.0/distrib/builder/changes.py 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/distrib/builder/changes.py 2013-05-20 07:18:42.000000000 +0200
@@ -282,19 +282,19 @@
build_version.find_version()
# Append the changes to the debian package changelog.
- os.chdir(os.path.join(config.DISTRIB_DIR, 'linux'))
-
+ os.chdir(os.path.join(config.DISTRIB_DIR))
+
# First we need to update the version.
- if build_version.DOOMSDAY_RELEASE_TYPE == 'Stable':
- debVersion = build_version.DOOMSDAY_VERSION_FULL
- else:
- debVersion = build_version.DOOMSDAY_VERSION_FULL + '-' + Event().tag()
+ debVersion = build_version.DOOMSDAY_VERSION_FULL + '-' + Event().tag()
# Always make one entry.
print 'Marking new version...'
msg = 'New release: %s build %i.' % (build_version.DOOMSDAY_RELEASE_TYPE,
Event().number())
- os.system("dch -b --check-dirname-level 0 -v %s \"%s\"" % (debVersion, msg))
+
+ # Reset the changelog.
+ os.system('rm -f debian/changelog && ' + \
+ 'dch --check-dirname-level=0 --create --package doomsday -v %s "%s"' % (debVersion, msg))
for entry in self.debChangeEntries:
# Quote it for the command line.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/distrib/builder/utils.py new/doomsday-1.10.3/distrib/builder/utils.py
--- old/doomsday-1.10.0/distrib/builder/utils.py 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/distrib/builder/utils.py 2013-05-20 07:18:42.000000000 +0200
@@ -11,7 +11,7 @@
def omit_path(path, omitted):
if path.startswith(omitted):
path = path[len(omitted):]
- if path[0] == '/': path = path[1:]
+ if path[0] == '/' or path[0] == '\\': path = path[1:]
return path
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/distrib/linux/doomsday-builds-stable.list new/doomsday-1.10.3/distrib/linux/doomsday-builds-stable.list
--- old/doomsday-1.10.0/distrib/linux/doomsday-builds-stable.list 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/distrib/linux/doomsday-builds-stable.list 2013-05-20 07:18:24.000000000 +0200
@@ -1 +1,4 @@
-deb http://dl.dropbox.com/u/11948701/builds/apt stable main
+deb http://code.iki.fi/builds/apt stable main
+
+# Mirrored on Dropbox
+#deb http://dl.dropbox.com/u/11948701/builds/apt stable main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/distrib/linux/doomsday-builds-unstable.list new/doomsday-1.10.3/distrib/linux/doomsday-builds-unstable.list
--- old/doomsday-1.10.0/distrib/linux/doomsday-builds-unstable.list 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/distrib/linux/doomsday-builds-unstable.list 2013-05-20 07:18:24.000000000 +0200
@@ -1 +1,4 @@
-deb http://dl.dropbox.com/u/11948701/builds/apt unstable main
+deb http://code.iki.fi/builds/apt unstable main
+
+# Mirrored on Dropbox
+#deb http://dl.dropbox.com/u/11948701/builds/apt unstable main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/api/api_audiod.h new/doomsday-1.10.3/doomsday/api/api_audiod.h
--- old/doomsday-1.10.0/doomsday/api/api_audiod.h 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/api/api_audiod.h 2013-05-20 07:18:24.000000000 +0200
@@ -64,7 +64,7 @@
int (*Init) (void);
void (*Shutdown) (void);
void (*Event) (int type);
- int (*Set) (int prop, const void* ptr);
+ int (*Set) (int prop, void const *ptr);
} audiodriver_t;
typedef struct audiointerface_base_s {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/api/dd_version.h new/doomsday-1.10.3/doomsday/api/dd_version.h
--- old/doomsday-1.10.0/doomsday/api/dd_version.h 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/api/dd_version.h 2013-05-20 07:18:42.000000000 +0200
@@ -51,8 +51,8 @@
* Revision number increases with each small (maintenance) release.
*/
-#define DOOMSDAY_VERSION_BASE "1.10.0"
-#define DOOMSDAY_VERSION_NUMBER 1,10,0,0 // For WIN32 version info.
+#define DOOMSDAY_VERSION_BASE "1.10.3"
+#define DOOMSDAY_VERSION_NUMBER 1,10,3,0 // For WIN32 version info.
//#define DOOMSDAY_RELEASE_NAME "Example"
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/api.doxy new/doomsday-1.10.3/doomsday/client/api.doxy
--- old/doomsday-1.10.0/doomsday/client/api.doxy 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/api.doxy 2013-05-20 07:18:42.000000000 +0200
@@ -2,7 +2,7 @@
@INCLUDE = ../doomsday.doxy
PROJECT_NAME = "Doomsday and libdeng1"
-PROJECT_NUMBER = 1.10
+PROJECT_NUMBER = 1.10.3
PROJECT_BRIEF = "Public API"
OUTPUT_DIRECTORY = ../apidoc/api/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/client-mac.doxy new/doomsday-1.10.3/doomsday/client/client-mac.doxy
--- old/doomsday-1.10.0/doomsday/client/client-mac.doxy 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/client-mac.doxy 2013-05-20 07:18:42.000000000 +0200
@@ -2,7 +2,7 @@
@INCLUDE = ../doomsday.doxy
PROJECT_NAME = "Doomsday Client"
-PROJECT_NUMBER = 1.10
+PROJECT_NUMBER = 1.10.3
PROJECT_BRIEF = "Internal documentation (Mac OS X)"
OUTPUT_DIRECTORY = ../apidoc/mac/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/client-win32.doxy new/doomsday-1.10.3/doomsday/client/client-win32.doxy
--- old/doomsday-1.10.0/doomsday/client/client-win32.doxy 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/client-win32.doxy 2013-05-20 07:18:42.000000000 +0200
@@ -2,7 +2,7 @@
@INCLUDE = ../doomsday.doxy
PROJECT_NAME = "Doomsday Client"
-PROJECT_NUMBER = 1.10
+PROJECT_NUMBER = 1.10.3
PROJECT_BRIEF = "Internal documentation (Windows)"
OUTPUT_DIRECTORY = ../apidoc/win32/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/include/audio/audiodriver_music.h new/doomsday-1.10.3/doomsday/client/include/audio/audiodriver_music.h
--- old/doomsday-1.10.0/doomsday/client/include/audio/audiodriver_music.h 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/include/audio/audiodriver_music.h 2013-05-20 07:18:24.000000000 +0200
@@ -36,7 +36,7 @@
extern "C" {
#endif
-void AudioDriver_Music_Set(int property, void* ptr);
+void AudioDriver_Music_Set(int property, void const *ptr);
int AudioDriver_Music_PlayNativeFile(const char* fileName, boolean looped);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/include/resource/compositetexture.h new/doomsday-1.10.3/doomsday/client/include/resource/compositetexture.h
--- old/doomsday-1.10.0/doomsday/client/include/resource/compositetexture.h 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/include/resource/compositetexture.h 2013-05-20 07:18:42.000000000 +0200
@@ -19,15 +19,18 @@
* 02110-1301 USA</small>
*/
-#ifndef LIBDENG_RESOURCE_COMPOSITETEXTURE_H
-#define LIBDENG_RESOURCE_COMPOSITETEXTURE_H
+#ifndef DENG_RESOURCE_COMPOSITETEXTURE_H
+#define DENG_RESOURCE_COMPOSITETEXTURE_H
+
+#include <QList>
+#include <QMultiMap>
-#include "dd_types.h" // For lumpnum_t
-#include "patchname.h"
#include
#include
#include
-#include <QList>
+
+#include "dd_types.h" // For lumpnum_t
+#include "patchname.h"
namespace de {
@@ -181,6 +184,9 @@
Q_DECLARE_OPERATORS_FOR_FLAGS(CompositeTexture::Flags)
+/// A map from String -> CompositeTexture
+typedef QMultiMap CompositeTextureMap;
+
} // namespace de
-#endif // LIBDENG_RESOURCE_COMPOSITETEXTURE_H
+#endif // DENG_RESOURCE_COMPOSITETEXTURE_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/res/macx/Info.plist new/doomsday-1.10.3/doomsday/client/res/macx/Info.plist
--- old/doomsday-1.10.0/doomsday/client/res/macx/Info.plist 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/res/macx/Info.plist 2013-05-20 07:18:42.000000000 +0200
@@ -17,6 +17,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.10</string>
+ <string>1.10.3</string>
</dict>
</plist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/src/audio/audiodriver_music.cpp new/doomsday-1.10.3/doomsday/client/src/audio/audiodriver_music.cpp
--- old/doomsday-1.10.0/doomsday/client/src/audio/audiodriver_music.cpp 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/src/audio/audiodriver_music.cpp 2013-05-20 07:18:25.000000000 +0200
@@ -40,7 +40,7 @@
return Str_Appendf(AutoStr_NewStd(), "%s%i", BUFFERED_MUSIC_FILE, id);
}
-static void musicSet(audiointerface_music_t *iMusic, int property, void *ptr)
+static void musicSet(audiointerface_music_t *iMusic, int property, void const *ptr)
{
audiodriver_t *d = AudioDriver_Interface(iMusic);
if(!d || !d->Set) return;
@@ -140,7 +140,7 @@
return composeBufferedMusicFilename(currentBufFile, ext);
}
-void AudioDriver_Music_Set(int property, void *ptr)
+void AudioDriver_Music_Set(int property, void const *ptr)
{
void *ifs[MAX_AUDIO_INTERFACES];
int i, count = AudioDriver_FindInterfaces(AUDIO_IMUSIC, ifs);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/src/audio/s_mus.cpp new/doomsday-1.10.3/doomsday/client/src/audio/s_mus.cpp
--- old/doomsday-1.10.0/doomsday/client/src/audio/s_mus.cpp 2013-04-03 14:44:46.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/src/audio/s_mus.cpp 2013-05-20 07:18:25.000000000 +0200
@@ -109,7 +109,8 @@
}
// Tell the audio driver about our soundfont config.
- AudioDriver_Music_Set(AUDIOP_SOUNDFONT_FILENAME, soundFontPath);
+ AudioDriver_Music_Set(AUDIOP_SOUNDFONT_FILENAME,
+ de::NativePath(soundFontPath).expand().toString().toLatin1().constData());
musAvail = true;
return true;
@@ -447,7 +448,8 @@
static void Mus_UpdateSoundFont(void)
{
- AudioDriver_Music_Set(AUDIOP_SOUNDFONT_FILENAME, (void*)Con_GetString("music-soundfont"));
+ AudioDriver_Music_Set(AUDIOP_SOUNDFONT_FILENAME,
+ de::NativePath(Con_GetString("music-soundfont")).expand().toString().toLatin1().constData());
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/src/render/sky.cpp new/doomsday-1.10.3/doomsday/client/src/render/sky.cpp
--- old/doomsday-1.10.0/doomsday/client/src/render/sky.cpp 2013-04-03 14:44:47.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/src/render/sky.cpp 2013-05-20 07:18:43.000000000 +0200
@@ -999,6 +999,8 @@
// Is there a sky to be rendered?
if(!Sky_FirstActiveLayer()) return;
+ if(usingFog) glEnable(GL_FOG);
+
// If sky models have been inited, they will be used.
if(!skyModelsInited || alwaysDrawSphere)
{
@@ -1042,6 +1044,8 @@
glDepthMask(GL_TRUE);
glEnable(GL_DEPTH_TEST);
}
+
+ if(usingFog) glDisable(GL_FOG);
}
/// @note A CVar callback.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/src/render/sprite.cpp new/doomsday-1.10.3/doomsday/client/src/render/sprite.cpp
--- old/doomsday-1.10.0/doomsday/client/src/render/sprite.cpp 2013-04-03 14:44:47.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/src/render/sprite.cpp 2013-05-20 07:18:43.000000000 +0200
@@ -158,9 +158,6 @@
// Setup the modelview matrix.
Rend_ModelViewMatrix(false);
- if(usingFog)
- glEnable(GL_FOG);
-
// Clear Z buffer. This will prevent the psprites from being clipped
// by nearby polygons.
glClear(GL_DEPTH_BUFFER_BIT);
@@ -175,11 +172,6 @@
setupModelParamsForVisPSprite(&parm, spr);
Rend_RenderModel(&parm);
}
-
- if(usingFog)
- {
- glDisable(GL_FOG);
- }
}
/**
@@ -310,8 +302,11 @@
Texture const &tex = ms.texture(MTU_PRIMARY).generalCase();
variantspecification_t const &texSpec = TS_GENERAL(ms.texture(MTU_PRIMARY).spec());
- params->pos[VX] = psp->pos[VX] - -tex.origin().x + pspOffset[VX] + -texSpec.border;
- params->pos[VY] = offScaleY * (psp->pos[VY] - -tex.origin().y) + pspOffset[VY] + -texSpec.border;
+#define WEAPONTOP 32 /// @todo Currently hardcoded here and in the plugins.
+
+ params->pos[VX] = psp->pos[VX] + tex.origin().x + pspOffset[VX] - texSpec.border;
+ params->pos[VY] = WEAPONTOP + offScaleY * (psp->pos[VY] - WEAPONTOP) + tex.origin().y +
+ pspOffset[VY] - texSpec.border;
params->width = ms.width() + texSpec.border*2;
params->height = ms.height() + texSpec.border*2;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/src/resource/r_data.cpp new/doomsday-1.10.3/doomsday/client/src/resource/r_data.cpp
--- old/doomsday-1.10.0/doomsday/client/src/resource/r_data.cpp 2013-04-03 14:44:47.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/src/resource/r_data.cpp 2013-05-20 07:18:43.000000000 +0200
@@ -434,7 +434,7 @@
CompositeTexture::ArchiveFormat format =
(gameDataFormat == 0? CompositeTexture::DoomFormat : CompositeTexture::StrifeFormat);
- de::Reader reader = de::Reader(data);
+ de::Reader reader(data);
// First is a count of the total number of definitions.
dint32 definitionCount;
@@ -477,7 +477,7 @@
if(it->lumpNum() >= 0)
{
// Its valid - include in the result.
- result.push_back(def);
+ result.append(def);
def = 0;
break;
}
@@ -555,77 +555,84 @@
// Print a summary.
LOG_INFO("Loaded %s texture definitions from \"%s:%s\".")
- << (newDefs.count() == archiveCount? "all" : String("%1 of %1").arg(newDefs.count()).arg(archiveCount))
+ << (newDefs.count() == archiveCount? String("all %1").arg(newDefs.count())
+ : String("%1 of %1").arg(newDefs.count()).arg(archiveCount))
<< NativePath(file.container().composeUri().asText()).pretty()
<< NativePath(file.composeUri().asText()).pretty();
}
- if(customDefs.count())
+ if(!customDefs.isEmpty())
{
// Custom definitions were found - we must cross compare them.
+
+ // Map the definitions for O(log n) lookup performance,
+ CompositeTextureMap mappedCustomDefs;
+ foreach(CompositeTexture *custom, customDefs)
+ {
+ mappedCustomDefs.insert(custom->percentEncodedNameRef(), custom);
+ }
+
+ // Perform reclassification of replaced texture definitions.
for(int i = 0; i < defs.count(); ++i)
{
CompositeTexture *orig = defs[i];
- bool hasReplacement = false;
- for(int j = 0; j < customDefs.count(); ++j)
- {
- CompositeTexture *custom = customDefs[j];
+ // Does a potential replacement exist for this original definition?
+ CompositeTextureMap::const_iterator found = mappedCustomDefs.constFind(orig->percentEncodedNameRef());
+ if(found == mappedCustomDefs.constEnd())
+ continue;
+
+ // Definition 'custom' is destined to replace 'orig'.
+ CompositeTexture *custom = found.value();
+ bool haveReplacement = false;
- if(!orig->percentEncodedName().compareWithoutCase(custom->percentEncodedName()))
+ if(custom->isFlagged(CompositeTexture::Custom))
+ {
+ haveReplacement = true; // Uses a custom patch.
+ }
+ else
+ {
+ // Do the definitions differ?
+ if(custom->dimensions() != orig->dimensions() ||
+ custom->logicalDimensions() != orig->logicalDimensions() ||
+ custom->componentCount() != orig->componentCount())
{
- // Definition 'custom' is destined to replace 'orig'.
- if(custom->isFlagged(CompositeTexture::Custom))
- {
- hasReplacement = true; // Uses a custom patch.
- }
- // Do the definitions differ?
- else if(custom->dimensions() != orig->dimensions() ||
- custom->logicalDimensions() != orig->logicalDimensions() ||
- custom->componentCount() != orig->componentCount())
- {
- custom->flags() |= CompositeTexture::Custom;
- hasReplacement = true;
- }
- else
+ haveReplacement = true;
+ }
+ else
+ {
+ // Check the patches.
+ for(int k = 0; k < orig->componentCount(); ++k)
{
- // Check the patches.
- short k = 0;
- while(k < orig->componentCount() && !custom->isFlagged(CompositeTexture::Custom))
- {
- CompositeTexture::Component const &origP = orig->components()[k];
- CompositeTexture::Component const &customP = custom->components()[k];
+ CompositeTexture::Component const &origP = orig->components()[k];
+ CompositeTexture::Component const &customP = custom->components()[k];
- if(origP.lumpNum() != customP.lumpNum() &&
- origP.xOrigin() != customP.xOrigin() &&
- origP.yOrigin() != customP.yOrigin())
- {
- custom->flags() |= CompositeTexture::Custom;
- hasReplacement = true;
- }
- else
- {
- k++;
- }
+ if(origP.lumpNum() != customP.lumpNum() &&
+ origP.xOrigin() != customP.xOrigin() &&
+ origP.yOrigin() != customP.yOrigin())
+ {
+ haveReplacement = true;
+ break;
}
}
- break;
}
}
- if(hasReplacement)
+ if(haveReplacement)
{
+ custom->setFlags(CompositeTexture::Custom);
+
// Let the PWAD "copy" override the IWAD original.
defs.takeAt(i);
delete orig;
- --i; // Process the current item again.
+ --i; // Process the new next definition item.
}
}
/*
- * List now contains only those definitions which are not superceeded
- * by those in the custom list.
+ * List 'defs' now contains only those definitions which are not superceeded
+ * by those in the 'customDefs' list.
*/
// Add definitions from the custom list to the end of the main set.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/src/updater/updater.cpp new/doomsday-1.10.3/doomsday/client/src/updater/updater.cpp
--- old/doomsday-1.10.0/doomsday/client/src/updater/updater.cpp 2013-04-03 14:44:47.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/src/updater/updater.cpp 2013-05-20 07:18:43.000000000 +0200
@@ -598,6 +598,13 @@
void Updater_PrintLastUpdated(void)
{
- Con_Message("Latest update check was made %s.",
- UpdaterSettings().lastCheckAgo().toLatin1().constData());
+ de::String ago = UpdaterSettings().lastCheckAgo();
+ if(ago.isEmpty())
+ {
+ Con_Message("Never checked for updates.");
+ }
+ else
+ {
+ Con_Message("Latest update check was made %s.", ago.toLatin1().constData());
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/src/updater/updatersettings.cpp new/doomsday-1.10.3/doomsday/client/src/updater/updatersettings.cpp
--- old/doomsday-1.10.0/doomsday/client/src/updater/updatersettings.cpp 2013-04-03 14:44:47.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/src/updater/updatersettings.cpp 2013-05-20 07:18:43.000000000 +0200
@@ -191,6 +191,8 @@
de::String UpdaterSettings::lastCheckAgo() const
{
de::Time when = lastCheckTime();
+ if(!when.isValid()) return ""; // Never checked.
+
de::TimeDelta delta = when.since();
int t;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/client/src/updater/updatersettingsdialog.cpp new/doomsday-1.10.3/doomsday/client/src/updater/updatersettingsdialog.cpp
--- old/doomsday-1.10.0/doomsday/client/src/updater/updatersettingsdialog.cpp 2013-04-03 14:44:47.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/client/src/updater/updatersettingsdialog.cpp 2013-05-20 07:18:26.000000000 +0200
@@ -119,8 +119,16 @@
{
UpdaterSettings st;
- lastChecked->setText(tr("<small>Last checked %1.</small>")
- .arg(st.lastCheckAgo()));
+ String ago = st.lastCheckAgo();
+ if(!ago.isEmpty())
+ {
+ lastChecked->setText(tr("<small>Last checked %1.</small>")
+ .arg(st.lastCheckAgo()));
+ }
+ else
+ {
+ lastChecked->setText(tr("<small>Never checked.</small>"));
+ }
autoCheck->setChecked(!st.onlyCheckManually());
freqList->setEnabled(!st.onlyCheckManually());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/config_macx.pri new/doomsday-1.10.3/doomsday/config_macx.pri
--- old/doomsday-1.10.0/doomsday/config_macx.pri 2013-04-03 14:44:47.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/config_macx.pri 2013-05-20 07:18:43.000000000 +0200
@@ -40,6 +40,10 @@
QMAKE_CFLAGS += -mmacosx-version-min=10.7
QMAKE_CXXFLAGS += -mmacosx-version-min=10.7
DEFINES += MACOS_10_7
+
+ *-clang* {
+ QMAKE_CXXFLAGS += -Wno-c++11-long-long
+ }
}
else:deng_macx7_64bit {
echo(Using Mac OS 10.7 SDK.)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/doc/output/doomsday.6 new/doomsday-1.10.3/doomsday/doc/output/doomsday.6
--- old/doomsday-1.10.0/doomsday/doc/output/doomsday.6 2013-04-03 14:45:03.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/doc/output/doomsday.6 2013-05-20 07:18:44.000000000 +0200
@@ -1,5 +1,5 @@
.\" manual page generated by Amethyst (mdoc+tbl)
-.Dd April 3, 2013
+.Dd May 20, 2013
.Os
.Dt "DOOMSDAY" 6
.Sh NAME
@@ -425,8 +425,7 @@
You can see information about the network subsystem status with the command:
.Pp
.Bd -ragged -offset indent
-.Sy net
-.Sy info
+net info
.Ed
.Pp
.Ss "Server"
@@ -442,8 +441,7 @@
A server running on the same computer can be connected to with the following command:
.Pp
.Bd -ragged -offset indent
-.Sy connect
-.Sy localhost
+connect localhost
.Ed
.Pp
.Sh "RESOURCE FILES AND CONTAINERS"
@@ -536,9 +534,7 @@
option. It takes the source and destination directories as parameters. For example:
.Pp
.Bd -ragged -offset indent
-.Sy -vdmap
-.Sy /home/username/myauto
-.Sy /usr/share/doomsday/data/jdoom/auto
+-vdmap /home/username/myauto /usr/share/doomsday/data/jdoom/auto
.Ed
.Pp
You can define an unlimited number of virtual directory mappings using multiple
@@ -642,9 +638,7 @@
lump that has (with a high probability) a unique lump name for each file. You can invoke the utility like this:
.Pp
.Bd -ragged -offset indent
-.Sy wadtool
-.Sy myfiles.wad
-.Sy /data/jdoom/textures/
+wadtool myfiles.wad /data/jdoom/textures/
.Ed
.Pp
This would create a WAD file that contains all the files from the current directory. When writing the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/doc/readme/readme.ame new/doomsday-1.10.3/doomsday/doc/readme/readme.ame
--- old/doomsday-1.10.0/doomsday/doc/readme/readme.ame 2013-04-03 14:44:47.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/doc/readme/readme.ame 2013-05-20 07:18:43.000000000 +0200
@@ -5,7 +5,7 @@
@macro{TITLE}{ doomsday }
}
@macro{ONELINER}{ Enhanced source port of Doom, Heretic and Hexen }
-@macro{VERSION}{ Version 1.10 }
+@macro{VERSION}{ Version 1.10.3 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/doc/server/server.ame new/doomsday-1.10.3/doomsday/doc/server/server.ame
--- old/doomsday-1.10.0/doomsday/doc/server/server.ame 2013-04-03 14:44:47.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/doc/server/server.ame 2013-05-20 07:18:43.000000000 +0200
@@ -1,7 +1,7 @@
$ Man page for doomsday-server
@macro{TITLE}{ doomsday-server }
@macro{ONELINER}{ Doomsday Engine multiplayer daemon }
-@macro{VERSION}{ Version 1.10 }
+@macro{VERSION}{ Version 1.10.3 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/doc/shell-text/shell-text.ame new/doomsday-1.10.3/doomsday/doc/shell-text/shell-text.ame
--- old/doomsday-1.10.0/doomsday/doc/shell-text/shell-text.ame 2013-04-03 14:44:47.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/doc/shell-text/shell-text.ame 2013-05-20 07:18:43.000000000 +0200
@@ -1,7 +1,7 @@
$ Man page for doomsday-shell-text
@macro{TITLE}{ doomsday-shell-text }
@macro{ONELINER}{ Utility for controlling and monitoring Doomsday servers }
-@macro{VERSION}{ Version 1.10 }
+@macro{VERSION}{ Version 1.10.3 }
@macro{AUTHOR}{ Deng Team }
@macro{LINK}{ http://dengine.net/ }
@require{amestd}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/libshell/src/serverfinder.cpp new/doomsday-1.10.3/doomsday/libshell/src/serverfinder.cpp
--- old/doomsday-1.10.0/doomsday/libshell/src/serverfinder.cpp 2013-04-03 14:44:48.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/libshell/src/serverfinder.cpp 2013-05-20 07:18:31.000000000 +0200
@@ -79,12 +79,19 @@
ServerFinder::ServerFinder() : d(new Instance)
{
- qsrand(Time().asDateTime().toTime_t());
+ try
+ {
+ qsrand(Time().asDateTime().toTime_t());
- connect(&d->beacon, SIGNAL(found(de::Address, de::Block)), this, SLOT(found(de::Address, de::Block)));
- QTimer::singleShot(1000, this, SLOT(expire()));
+ connect(&d->beacon, SIGNAL(found(de::Address, de::Block)), this, SLOT(found(de::Address, de::Block)));
+ QTimer::singleShot(1000, this, SLOT(expire()));
- d->beacon.discover(0 /* no timeout */, 2);
+ d->beacon.discover(0 /* no timeout */, 2);
+ }
+ catch(Beacon::PortError const &er)
+ {
+ LOG_WARNING("Automatic server discovery is not available:\n") << er.asText();
+ }
}
ServerFinder::~ServerFinder()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/plugins/dehread/src/dehreader.cpp new/doomsday-1.10.3/doomsday/plugins/dehread/src/dehreader.cpp
--- old/doomsday-1.10.0/doomsday/plugins/dehread/src/dehreader.cpp 2013-04-03 14:44:48.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/plugins/dehread/src/dehreader.cpp 2013-05-20 07:18:31.000000000 +0200
@@ -565,7 +565,7 @@
{
int result = str.toInt(0, 0, String::AllowSuffix);
if(weaponNum) *weaponNum = result;
- return (weaponNum >= 0);
+ return (result >= 0);
}
bool parseMobjTypeState(const QString& token, const StateMapping** state)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/doomsday/tools/shell/shell-gui/res/macx/Info.plist new/doomsday-1.10.3/doomsday/tools/shell/shell-gui/res/macx/Info.plist
--- old/doomsday-1.10.0/doomsday/tools/shell/shell-gui/res/macx/Info.plist 2013-04-03 14:44:50.000000000 +0200
+++ new/doomsday-1.10.3/doomsday/tools/shell/shell-gui/res/macx/Info.plist 2013-05-20 07:18:43.000000000 +0200
@@ -17,6 +17,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.10</string>
+ <string>1.10.3</string>
</dict>
</plist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doomsday-1.10.0/snowberry/sb/profile.py new/doomsday-1.10.3/snowberry/sb/profile.py
--- old/doomsday-1.10.0/snowberry/sb/profile.py 2013-04-03 14:45:01.000000000 +0200
+++ new/doomsday-1.10.3/snowberry/sb/profile.py 2013-05-20 07:18:40.000000000 +0200
@@ -81,9 +81,9 @@
for v in self.values:
p.values.append(v)
for a in self.addons:
- p.values.append(a)
+ p.addons.append(a)
for o in self.loadOrder:
- p.values.append(o)
+ p.loadOrder.append(o)
p.story = self.story
p.hidden = self.hidden
p.banner = self.banner
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org