Don't modify offsets if ANY sprites were merged

Because of this: http://www.doomworld.com/vb/post/1330168.
bradharding · Dec 29, 2014 · 5ed8dd0 · 5ed8dd0
1 parent 0a0b0d1
commit 5ed8dd0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/src/doomstat.c b/src/doomstat.c
@@ -47,6 +47,8 @@ char            *gamedescription;
 boolean         nerve = false;
 boolean         bfgedition = false;
 
+boolean         mergedsprites = false;
+
 boolean         chex = false;
 boolean         chexdeh = false;
 boolean         hacx = false;

diff --git a/src/doomstat.h b/src/doomstat.h
@@ -90,6 +90,8 @@ extern int              gamemap;
 extern boolean          nerve;
 extern boolean          bfgedition;
 
+extern boolean          mergedsprites;
+
 extern boolean          chex;
 extern boolean          chexdeh;
 extern boolean          hacx;

diff --git a/src/r_data.c b/src/r_data.c
@@ -807,18 +807,18 @@ void R_InitSpriteLumps(void)
         {
             int j = 0;
 
-            while (sproffsets[j].name[0])
+            if (!mergedsprites || BTSX)
             {
-                if (sproffsets[j].canmodify || BTSX)
+                while (sproffsets[j].name[0])
                 {
                     if (i == W_CheckNumForName(sproffsets[j].name) - firstspritelump)
                     {
                         spriteoffset[i] = SHORT(sproffsets[j].x) << FRACBITS;
                         spritetopoffset[i] = SHORT(sproffsets[j].y) << FRACBITS;
                         break;
                     }
+                    j++;
                 }
-                j++;
             }
         }
     }

diff --git a/src/w_merge.c b/src/w_merge.c
@@ -314,17 +314,8 @@ static void GenerateSpriteList(void)
         }
 
         AddSpriteLump(lump);
-        if (i < iwad_sprites.numlumps && lump->size != iwad_sprites.lumps[i].size)
-        {
-            int j = 0;
-
-            while (sproffsets[j].name[0])
-            {
-                if (!strcasecmp(sproffsets[j].name, lump->name))
-                    sproffsets[j].canmodify = false;
-                j++;
-            }
-        }
+
+        mergedsprites = true;
     }
 }