- Fixed: The ANIMATED parser must read the bytes for the speed as unsigned bytes.

- Fixed: The screen wipe must be disabled for Heretic's underwater ending. If
  not, the wipe will try to mix pictures with different palettes.


SVN r435 (trunk)

docs/rh-log.txt

@@ -1,3 +1,8 @@
+January 2, 2007 (Changes by Graf Zahl)
+- Fixed: The ANIMATED parser must read the bytes for the speed as unsigned bytes.
+- Fixed: The screen wipe must be disabled for Heretic's underwater ending. If
+  not, the wipe will try to mix pictures with different palettes.
+
 December 31, 2006 (Changes by Graf Zahl)
 - Fixed: Several actors for Doom were missing their spawn ID.
 

src/d_main.cpp

@@ -586,7 +586,7 @@ void D_Display (bool screenshot)
 
 	NetUpdate ();			// send out any new accumulation
 
-	if (!wipe || screenshot)
+	if (!wipe || screenshot || NoWipe < 0)
 	{
 		// normal update
 		C_DrawConsole ();	// draw console

src/f_finale.cpp

@@ -829,6 +829,7 @@ void F_DemonScroll ()
 =
 ==================
 */
+extern int NoWipe;
 
 void F_DrawUnderwater(void)
 {
@@ -852,20 +853,19 @@ void F_DrawUnderwater(void)
 			*palette++ = PalEntry (orgpal[0], orgpal[1], orgpal[2]);
 		}
 		screen->UpdatePalette ();
-
+		FinaleStage = 2;
+		}
+		// intentional fall-through
+	case 2:
 		pic = TexMan("E2END");
 		screen->DrawTexture (pic, 0, 0,
 			DTA_VirtualWidth, pic->GetWidth(),
 			DTA_VirtualHeight, pic->GetHeight(),
 			TAG_DONE);
 		screen->FillBorder (NULL);
-		FinaleStage = 2;
-		}
-
-		// intentional fall-through
-	case 2:
 		paused = false;
 		menuactive = MENU_Off;
+		NoWipe = -1;
 		break;
 
 	case 4:
@@ -886,6 +886,7 @@ void F_DrawUnderwater(void)
 			DTA_VirtualHeight, pic->GetHeight(),
 			TAG_DONE);
 		screen->FillBorder (NULL);
+		NoWipe = 0;
 		break;
 		}
 	}

src/r_anim.cpp

@@ -184,10 +184,10 @@ void R_InitPicAnims (void)
 
 			// Speed is stored as tics, but we want ms so scale accordingly.
 			animspeed = /* .speed */
-				Scale ((anim_p[19] << 0) |
-					   (anim_p[20] << 8) |
-					   (anim_p[21] << 16) |
-					   (anim_p[22] << 24), 1000, 35);
+				Scale ((BYTE(anim_p[19]) << 0) |
+					   (BYTE(anim_p[20]) << 8) |
+					   (BYTE(anim_p[21]) << 16) |
+					   (BYTE(anim_p[22]) << 24), 1000, 35);
 
 			R_AddSimpleAnim (pic1, pic2 - pic1 + 1, animtype, animspeed);
 		}