From dbb9baf909f75c18c8a11e583c99adfaee250e16 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 7 Jan 2007 10:18:35 +0000 Subject: [PATCH] - Fixed: Sorting of files in Zips was broken. SVN r445 (trunk) --- docs/rh-log.txt | 1 + src/decorations.cpp | 2 +- src/w_wad.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 0e4a55b77..8024c0b89 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,5 @@ January 7, 2007 (Changes by Graf Zahl) +- Fixed: Sorting of files in Zips was broken. - Ported GZDoom's deep water splash code so that splashes are handled properly in Boom maps with non-swimmable water. - Changed ENDOOM CVAR so that there is an option to show only modified versions. diff --git a/src/decorations.cpp b/src/decorations.cpp index 0297871ee..3cdef2e14 100644 --- a/src/decorations.cpp +++ b/src/decorations.cpp @@ -262,7 +262,7 @@ void LoadDecorations (void (*process)(FState *, int)) lastlump = 0; while ((lump = Wads.FindLump ("DECORATE", &lastlump)) != -1) { - SC_OpenLumpNum (lump, "DECORATE"); + SC_OpenLumpNum (lump, Wads.GetLumpFullName(lump)); ParseDecorate (process); SC_Close (); } diff --git a/src/w_wad.cpp b/src/w_wad.cpp index 80138ca6a..b3d99a9da 100644 --- a/src/w_wad.cpp +++ b/src/w_wad.cpp @@ -363,7 +363,7 @@ int STACK_ARGS FWadCollection::lumpcmp(const void * a, const void * b) FWadCollection::LumpRecord * rec1 = (FWadCollection::LumpRecord *)a; FWadCollection::LumpRecord * rec2 = (FWadCollection::LumpRecord *)b; - return !stricmp(rec1->fullname, rec2->fullname); + return stricmp(rec1->fullname, rec2->fullname); }