- 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)
This commit is contained in:
parent
e15988505a
commit
6a89d3594a
8 changed files with 216 additions and 210 deletions
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue