From 03d9e9e0282fac8a3612f3fb6273c67e9e906c29 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 3 Oct 2010 20:58:54 +0000 Subject: [PATCH] - cast screen is working. SVN r2891 (finale) --- src/f_finale.cpp | 1135 ----------------------- src/intermission/intermission.cpp | 154 ++- src/intermission/intermission.h | 16 +- src/intermission/intermission_parse.cpp | 9 +- wadsrc/static/mapinfo/common.txt | 2 +- 5 files changed, 173 insertions(+), 1143 deletions(-) delete mode 100644 src/f_finale.cpp diff --git a/src/f_finale.cpp b/src/f_finale.cpp deleted file mode 100644 index c0f10ca2ba..0000000000 --- a/src/f_finale.cpp +++ /dev/null @@ -1,1135 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// $Id:$ -// -// Copyright (C) 1993-1996 by id Software, Inc. -// -// This source is available for distribution and/or modification -// only under the terms of the DOOM Source Code License as -// published by id Software. All rights reserved. -// -// The source is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License -// for more details. -// -// $Log:$ -// -// DESCRIPTION: -// Game completion, final screen animation. -// -//----------------------------------------------------------------------------- - - - -#include -#include -#include - -#include "i_system.h" -#include "m_swap.h" -#include "v_video.h" -#include "i_video.h" -#include "v_text.h" -#include "w_wad.h" -#include "s_sound.h" -#include "gstrings.h" -#include "doomstat.h" -#include "r_state.h" -#include "r_draw.h" -#include "hu_stuff.h" -#include "cmdlib.h" -#include "gi.h" -#include "p_conversation.h" -#include "a_strifeglobal.h" -#include "templates.h" -#include "c_bind.h" -#include "r_translate.h" -#include "g_level.h" -#include "d_event.h" -#include "v_palette.h" -#include "d_main.h" - -static void FadePic (); -static void GetFinaleText (const char *msgLumpName); - -// Stage of animation: -// 0 = text -// 1 = art screen -// 2 = underwater screen -// 3 = character cast -// 4 = Heretic title -// 5 = Strife slideshow -static unsigned int FinaleStage; - -static size_t FinaleCount, FinaleEndCount; -static int FinalePart; - -static int TEXTSPEED; -#define TEXTWAIT 250 - -static int FinaleSequence; -static SBYTE FadeDir; -static bool FinaleHasPic; - -static FString FinaleText; -static size_t FinaleTextLen; -static const char *FinaleFlat; -static bool FinaleEnding; - -void F_StartCast (void); -void F_CastTicker (void); -bool F_CastResponder (event_t *ev); -void F_CastDrawer (void); -void F_AdvanceSlideshow (); - -// -// F_StartFinale -// - - -bool F_Responder (event_t *event) -{ - if (FinaleStage == 3) - { - return F_CastResponder (event); - } - else if (FinaleStage == 2 && event->type == EV_KeyDown) - { // We're showing the water pic; make any key kick to demo mode - FinaleStage = 4; - V_ForceBlend (0, 0, 0, 0); - return true; - } - - return false; -} - - -// -// F_Ticker -// -void F_Ticker () -{ - int i; - bool interrupt = false; - - // check for skipping - for (i = 0; i < MAXPLAYERS; i++) - { - // Only for buttons going down - if (!interrupt) - { - for (size_t j = 0; j < sizeof(players[i].cmd.ucmd.buttons)*8; ++j) - { - if (((players[i].cmd.ucmd.buttons >> j) & 1) && - !((players[i].oldbuttons >> j) & 1)) - { - interrupt = true; - break; - } - } - } - players[i].oldbuttons = players[i].cmd.ucmd.buttons; - } - - // [RH] Non-commercial can be skipped now, too - if (FinaleStage == 0) - { - if (interrupt || - ((!(gameinfo.flags & GI_MAPxx) || gameinfo.flags & GI_SHAREWARE) - && FinaleCount > FinaleTextLen*TEXTSPEED+TEXTWAIT)) - { - if (FinaleCount < FinaleTextLen*TEXTSPEED+10) - { - FinaleCount = FinaleTextLen*TEXTSPEED+10; - } - else - { - if (FinaleEnding) - { - // [RH] Don't automatically advance end-of-game messages - if (interrupt) - { - if (EndSequences[FinaleSequence].EndType == END_Cast) - { - F_StartCast (); - } - else - { - FinaleCount = 0; - FinaleStage = 1; - wipegamestate = GS_FORCEWIPE; - if (EndSequences[FinaleSequence].EndType == END_Bunny) - { - if (!EndSequences[FinaleSequence].Advanced) - S_StartMusic ("$music_bunny"); - } - } - if (EndSequences[FinaleSequence].Advanced && - !EndSequences[FinaleSequence].Music.IsEmpty()) - { - S_ChangeMusic(EndSequences[FinaleSequence].Music, 0, EndSequences[FinaleSequence].MusicLooping); - } - } - } - else - { - gameaction = ga_worlddone; - } - } - } - } - else if (FinaleStage >= 10) - { - // Hexen chess ending with three pages of text. - // [RH] This can be interrupted to speed it up. - if (interrupt) - { - if (FinaleStage == 11 || FinaleStage == 12 || FinaleStage == 15) - { // Stages that display text - if (FinaleCount < FinaleEndCount-TEXTWAIT) - { - FinaleCount = FinaleEndCount-TEXTWAIT; - } - else - { - FinaleCount = FinaleEndCount; - } - } - else if (FinaleCount < 69) - { // Stages that fade pictures - FinaleCount = 69; - } - } - if (FinaleStage < 15 && FinaleCount >= FinaleEndCount) - { - FinaleCount = 0; - FinaleStage++; - switch (FinaleStage) - { - case 11: // Text 1 - FinaleEndCount = FinaleTextLen*TEXTSPEED+TEXTWAIT; - break; - - case 12: // Pic 2, Text 2 - GetFinaleText ("win2msg"); - FinaleEndCount = FinaleTextLen*TEXTSPEED+TEXTWAIT; - S_ChangeMusic ("orb", 0, !gameinfo.noloopfinalemusic); - break; - - case 13: // Pic 2 -- Fade out - FinaleEndCount = 70; - FadeDir = 1; - break; - - case 14: // Pic 3 -- Fade in - FinaleEndCount = 71; - FadeDir = -1; - S_ChangeMusic ("chess", 0, !gameinfo.noloopfinalemusic); - break; - - case 15: // Pic 3, Text 3 - GetFinaleText ("win3msg"); - FinaleEndCount = FinaleTextLen*TEXTSPEED+TEXTWAIT; - break; - } - return; - } - if (FinaleStage == 10 || FinaleStage == 13 || FinaleStage == 14) - { - FadePic (); - } - } - else if (FinaleStage >= 5) - { // Strife slideshow - if (interrupt) - { - FinaleCount = FinaleEndCount; - } - } - - // advance animation - FinaleCount++; - - if (FinaleStage == 3) - { - F_CastTicker (); - return; - } - else if (FinaleStage == 5 && FinaleCount > FinaleEndCount) - { - S_StopSound (CHAN_VOICE); - F_AdvanceSlideshow (); - FinaleCount = 0; - } -} - -//=========================================================================== -// -// FadePic -// -//=========================================================================== - -static void FadePic () -{ - int blend = int(256*FinaleCount/70); - - if (FadeDir < 0) - { - blend = 256 - blend; - } - V_SetBlend (0,0,0,blend); -} - -// -// F_TextWrite -// -void F_TextWrite (void) -{ - FTexture *pic; - int w; - size_t count; - const char *ch; - int c; - int cx; - int cy; - const FRemapTable *range; - int leftmargin; - int rowheight; - bool scale; - - if (FinaleCount < 11) - return; - - // draw some of the text onto the screen - leftmargin = (gameinfo.gametype & (GAME_DoomStrifeChex|GAME_Hexen) ? 10 : 20) - 160; - rowheight = SmallFont->GetHeight () + - (gameinfo.gametype & (GAME_DoomStrifeChex) ? 3 : -1); - scale = (CleanXfac != 1 || CleanYfac != 1); - - cx = leftmargin; - if (FinaleStage == 15) - { - cy = 135 - 100; - } - else - { - cy = (gameinfo.gametype & (GAME_DoomStrifeChex) ? 10 : 5) - 100; - } - ch = FinaleText.GetChars(); - - count = (FinaleCount - 10)/TEXTSPEED; - range = SmallFont->GetColorTranslation (CR_UNTRANSLATED); - - for ( ; count ; count-- ) - { - c = *ch++; - if (!c) - break; - if (c == '\n') - { - cx = leftmargin; - cy += rowheight; - continue; - } - - pic = SmallFont->GetChar (c, &w); - if (cx+w > SCREENWIDTH) - continue; - if (pic != NULL) - { - if (scale) - { - screen->DrawTexture (pic, - cx + 320 / 2, - cy + 200 / 2, - DTA_Translation, range, - DTA_Clean, true, - TAG_DONE); - } - else - { - screen->DrawTexture (pic, - cx + 320 / 2, - cy + 200 / 2, - DTA_Translation, range, - TAG_DONE); - } - } - cx += w; - } - -} - -// -// Final DOOM 2 animation -// Casting by id Software. -// in order of appearance -// -struct castinfo_t -{ - const char *name; - const char *type; - const AActor *info; - const PClass *Class; -}; - -castinfo_t castorder[] = -{ - {"CC_ZOMBIE", "ZombieMan"}, - {"CC_SHOTGUN", "ShotgunGuy"}, - {"CC_HEAVY", "ChaingunGuy"}, - {"CC_IMP", "DoomImp"}, - {"CC_DEMON", "Demon"}, - {"CC_LOST", "LostSoul"}, - {"CC_CACO", "Cacodemon"}, - {"CC_HELL", "HellKnight"}, - {"CC_BARON", "BaronOfHell"}, - {"CC_ARACH", "Arachnotron"}, - {"CC_PAIN", "PainElemental"}, - {"CC_REVEN", "Revenant"}, - {"CC_MANCU", "Fatso"}, - {"CC_ARCH", "Archvile"}, - {"CC_SPIDER", "SpiderMastermind"}, - {"CC_CYBER", "Cyberdemon"}, - {"CC_HERO", "DoomPlayer"}, - - {0, NULL} -}; - -static struct -{ - const char *type; - BYTE melee; - BYTE ofs; - const char *sound; - FState *match; -} atkstates[] = -{ - { "DoomPlayer", 0, 0, "weapons/sshotf" }, - { "ZombieMan", 0, 1, "grunt/attack" }, - { "ShotgunGuy", 0, 1, "shotguy/attack" }, - { "Archvile", 0, 1, "vile/start" }, - { "Revenant", 1, 1, "skeleton/swing" }, - { "Revenant", 1, 3, "skeleton/melee" }, - { "Revenant", 0, 1, "skeleton/attack" }, - { "Fatso", 0, 1, "fatso/attack" }, - { "Fatso", 0, 4, "fatso/attack" }, - { "Fatso", 0, 7, "fatso/attack" }, - { "ChaingunGuy", 0, 1, "chainguy/attack" }, - { "ChaingunGuy", 0, 2, "chainguy/attack" }, - { "ChaingunGuy", 0, 3, "chainguy/attack" }, - { "DoomImp", 0, 2, "imp/attack" }, - { "Demon", 1, 1, "demon/melee" }, - { "BaronOfHell", 0, 1, "baron/attack" }, - { "HellKnight", 0, 1, "baron/attack" }, - { "Cacodemon", 0, 1, "caco/attack" }, - { "LostSoul", 0, 1, "skull/melee" }, - { "SpiderMastermind", 0, 1, "spider/attack" }, - { "SpiderMastermind", 0, 2, "spider/attack" }, - { "Arachnotron", 0, 1, "baby/attack" }, - { "Cyberdemon", 0, 1, "weapons/rocklf" }, - { "Cyberdemon", 0, 3, "weapons/rocklf" }, - { "Cyberdemon", 0, 5, "weapons/rocklf" }, - { "PainElemental", 0, 2, "skull/melee" }, - { NULL } -}; - -int castnum; -int casttics; -int castsprite; // [RH] For overriding the player sprite with a skin -const FRemapTable *casttranslation; // [RH] Draw "our hero" with their chosen suit color -FState* caststate; -bool castdeath; -int castframes; -int castonmelee; -bool castattacking; - -static FState *advplayerstate; - -// -// F_StartCast -// -extern gamestate_t wipegamestate; - - -void F_StartCast (void) -{ - const PClass *type; - int i; - - // [RH] Set the names and defaults for the cast - for (i = 0; castorder[i].type; i++) - { - type = PClass::FindClass (castorder[i].type); - if (type == NULL) - { - castorder[i].info = GetDefault(); - castorder[i].Class= RUNTIME_CLASS(AActor); - } - else - { - castorder[i].info = GetDefaultByType (type); - castorder[i].Class= type; - } - } - - for (i = 0; atkstates[i].type; i++) - { - type = PClass::FindClass (atkstates[i].type); - if (type != NULL) - { - if (atkstates[i].melee) - atkstates[i].match = ((AActor *)(type->Defaults))->MeleeState + atkstates[i].ofs; - else - atkstates[i].match = ((AActor *)(type->Defaults))->MissileState + atkstates[i].ofs; - } - else - { - atkstates[i].match = NULL; - } - } - - type = PClass::FindClass (NAME_DoomPlayer); - if (type != NULL) - advplayerstate = ((AActor *)(type->Defaults))->MissileState; - - wipegamestate = GS_FORCEWIPE; - castnum = 0; - caststate = castorder[castnum].info->SeeState; - castsprite = caststate->sprite; - casttranslation = NULL; - casttics = caststate->GetTics (); - castdeath = false; - FinaleStage = 3; - castframes = 0; - castonmelee = 0; - castattacking = false; - if (!EndSequences[FinaleSequence].Advanced) - S_ChangeMusic ("$music_evil"); -} - - -// -// F_CastTicker -// -void F_CastTicker (void) -{ - if (--casttics > 0 && caststate != NULL) - return; // not time to change state yet - - if (caststate == NULL || caststate->GetTics() == -1 || caststate->GetNextState() == NULL) - { - // switch from deathstate to next monster - do - { - castnum++; - castdeath = false; - if (castorder[castnum].name == 0) - castnum = 0; - if (castorder[castnum].info->SeeSound) - { - S_Sound (CHAN_VOICE | CHAN_UI, castorder[castnum].info->SeeSound, 1, ATTN_NONE); - } - caststate = castorder[castnum].info->SeeState; - // [RH] Skip monsters that have been hacked to no longer have attack states - if (castorder[castnum].info->MissileState == NULL && - castorder[castnum].info->MeleeState == NULL) - { - caststate = NULL; - } - } - while (caststate == NULL); - if (castnum == 16) - { - castsprite = skins[players[consoleplayer].userinfo.skin].sprite; - casttranslation = translationtables[TRANSLATION_Players][consoleplayer]; - } - else - { - castsprite = caststate->sprite; - casttranslation = NULL; - } - castframes = 0; - } - else - { - // sound hacks.... - if (caststate != NULL) - { - int i; - - for (i = 0; atkstates[i].type; i++) - { - if (atkstates[i].match == caststate) - { - S_StopAllChannels (); - S_Sound (CHAN_WEAPON | CHAN_UI, atkstates[i].sound, 1, ATTN_NONE); - break; - } - } - } - - // just advance to next state in animation - if (caststate == advplayerstate) - goto stopattack; // Oh, gross hack! - - caststate = caststate->GetNextState(); - castframes++; - } - - if (castframes == 12) - { - // go into attack frame - castattacking = true; - if (castonmelee) - caststate = castorder[castnum].info->MeleeState; - else - caststate = castorder[castnum].info->MissileState; - castonmelee ^= 1; - if (caststate == NULL) - { - if (castonmelee) - caststate = castorder[castnum].info->MeleeState; - else - caststate = castorder[castnum].info->MissileState; - } - } - - if (castattacking) - { - if (castframes == 24 - || caststate == castorder[castnum].info->SeeState ) - { - stopattack: - castattacking = false; - castframes = 0; - caststate = castorder[castnum].info->SeeState; - } - } - - casttics = caststate->GetTics(); - if (casttics == -1) - casttics = 15; -} - - -// -// F_CastResponder -// - -bool F_CastResponder (event_t* ev) -{ - if (ev->type != EV_KeyDown) - return false; - - const char *cmd = Bindings.GetBind (ev->data1); - - if (cmd != NULL && !stricmp (cmd, "toggleconsole")) - return false; - - if (castdeath) - return true; // already in dying frames - - // go into death frame - castdeath = true; - caststate = castorder[castnum].Class->ActorInfo->FindState(NAME_Death); - if (caststate != NULL) - { - casttics = caststate->GetTics(); - castframes = 0; - castattacking = false; - if (castnum == 16) - { - int snd = S_FindSkinnedSound(players[consoleplayer].mo, "*death"); - if (snd != 0) S_Sound (CHAN_VOICE | CHAN_UI, snd, 1, ATTN_NONE); - } - else if (castorder[castnum].info->DeathSound) - { - S_Sound (CHAN_VOICE | CHAN_UI, castorder[castnum].info->DeathSound, 1, ATTN_NONE); - } - } - - return true; -} - -// -// F_CastDrawer -// -void F_CastDrawer (void) -{ - spriteframe_t* sprframe; - FTexture* pic; - - // erase the entire screen to a background - screen->DrawTexture (TexMan[GStrings("bgcastcall")], 0, 0, - DTA_DestWidth, screen->GetWidth(), - DTA_DestHeight, screen->GetHeight(), - TAG_DONE); - - screen->DrawText (SmallFont, CR_UNTRANSLATED, - (SCREENWIDTH - SmallFont->StringWidth (GStrings(castorder[castnum].name)) * CleanXfac)/2, - (SCREENHEIGHT * 180) / 200, - GStrings(castorder[castnum].name), - DTA_CleanNoMove, true, TAG_DONE); - - // draw the current frame in the middle of the screen - if (caststate != NULL) - { - sprframe = &SpriteFrames[sprites[castsprite].spriteframes + caststate->GetFrame()]; - pic = TexMan(sprframe->Texture[0]); - - screen->DrawTexture (pic, 160, 170, - DTA_320x200, true, - DTA_FlipX, sprframe->Flip & 1, - DTA_Translation, casttranslation, - TAG_DONE); - } -} - - -/* -================== -= -= F_DemonScroll -= -================== -*/ - -void F_DemonScroll () -{ - const char *tex1, *tex2; - if (EndSequences[FinaleSequence].Advanced) - { - tex1 = EndSequences[FinaleSequence].PicName; - tex2 = EndSequences[FinaleSequence].PicName2; - } - else - { - tex1 = "FINAL1"; - tex2 = "FINAL2"; - } - - int yval; - FTexture *final1 = TexMan(tex1); - FTexture *final2 = TexMan(tex2); - int fwidth = final1->GetScaledWidth(); - int fheight = final1->GetScaledHeight(); - - if (FinaleCount < 70) - { - screen->DrawTexture (final1, 0, 0, - DTA_VirtualWidth, fwidth, - DTA_VirtualHeight, fheight, - DTA_Masked, false, - TAG_DONE); - screen->FillBorder (NULL); - return; - } - yval = int(FinaleCount) - 70; - if (yval < 600) - { - yval = Scale (yval, fheight, 600); - screen->DrawTexture (final1, 0, yval, - DTA_VirtualWidth, fwidth, - DTA_VirtualHeight, fheight, - DTA_Masked, false, - TAG_DONE); - screen->DrawTexture (final2, 0, yval - fheight, - DTA_VirtualWidth, fwidth, - DTA_VirtualHeight, fheight, - DTA_Masked, false, - TAG_DONE); - } - else - { //else, we'll just sit here and wait, for now - screen->DrawTexture (final2, 0, 0, - DTA_VirtualWidth, fwidth, - DTA_VirtualHeight, fheight, - DTA_Masked, false, - TAG_DONE); - } - screen->FillBorder (NULL); -} - -/* -================== -= -= F_DrawUnderwater -= -================== -*/ -extern int NoWipe; - -void F_DrawUnderwater(void) -{ - extern EMenuState menuactive; - FTexture *pic; - - switch (FinaleStage) - { - case 1: - { - PalEntry *palette; - const BYTE *orgpal; - FMemLump lump; - int i; - - lump = Wads.ReadLump ("E2PAL"); - orgpal = (BYTE *)lump.GetMem(); - palette = screen->GetPalette (); - for (i = 256; i > 0; i--, orgpal += 3) - { - *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_Fullscreen, true, TAG_DONE); - screen->FillBorder (NULL); - paused = false; - menuactive = MENU_Off; - NoWipe = -1; - break; - - case 4: - { - PalEntry *palette; - int i; - - palette = screen->GetPalette (); - for (i = 0; i < 256; ++i) - { - palette[i] = GPalette.BaseColors[i]; - } - screen->UpdatePalette (); - - pic = TexMan("TITLE"); - screen->DrawTexture (pic, 0, 0, DTA_Fullscreen, true, TAG_DONE); - screen->FillBorder (NULL); - NoWipe = 0; - break; - } - } -} - -/* -================== -= -= F_BunnyScroll -= -================== -*/ -void F_BunnyScroll (void) -{ - static size_t laststage; - - bool bunny = false; - int scrolled; - char name[10]; - size_t stage; - FTexture *tex; - int fwidth; - int fheight; - const char *tex1; - const char *tex2; - - if (EndSequences[FinaleSequence].Advanced) - { - tex1 = EndSequences[FinaleSequence].PicName; - tex2 = EndSequences[FinaleSequence].PicName2; - bunny = EndSequences[FinaleSequence].PlayTheEnd; - } - else if (EndSequences[FinaleSequence].EndType == END_BuyStrife) - { - tex1 = "CREDIT"; - tex2 = "VELLOGO"; - } - else - { - tex1 = "PFUB1"; - tex2 = "PFUB2"; - bunny = true; - } - - V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT); - - tex = TexMan(tex1); - fwidth = tex->GetScaledWidth(); - fheight = tex->GetScaledHeight(); - - scrolled = clamp (((signed)FinaleCount-230)*fwidth/640, 0, fwidth); - - screen->DrawTexture (tex, scrolled, 0, - DTA_VirtualWidth, fwidth, - DTA_VirtualHeight, fheight, - DTA_Masked, false, - TAG_DONE); - - tex = TexMan(tex2); - screen->DrawTexture (tex, scrolled - fwidth, 0, - DTA_VirtualWidth, fwidth, - DTA_VirtualHeight, fheight, - DTA_Masked, false, - TAG_DONE); - - screen->FillBorder (NULL); - - if (bunny) - { - if (FinaleCount < 1130) - { - return; - } - if (FinaleCount < 1180) - { - screen->DrawTexture (TexMan("END0"), (320-13*8)/2, (200-8*8)/2, DTA_320x200, true, TAG_DONE); - laststage = 0; - return; - } - - stage = (FinaleCount-1180) / 5; - if (stage > 6) - stage = 6; - if (stage > laststage) - { - S_Sound (CHAN_WEAPON | CHAN_UI, "weapons/pistol", 1, ATTN_NONE); - laststage = stage; - } - - mysnprintf (name, countof(name), "END%d", (int)stage); - screen->DrawTexture (TexMan(name), (320-13*8)/2, (200-8*8)/2, DTA_320x200, true, TAG_DONE); - } -} - -//============================================================================ -// -// F_StartSlideshow -// -// Starts running the slideshow previously set up. -// -//============================================================================ - -void F_StartSlideshow () -{ - gameaction = ga_nothing; - gamestate = GS_FINALE; - wipegamestate = GS_FINALE; - viewactive = false; - automapactive = false; - - S_StopAllChannels (); - S_ChangeMusic ("D_DARK", 0, true); - V_SetBlend (0,0,0,0); - - // The slideshow is determined solely by the map you're on. - if (!multiplayer && level.flags2 & LEVEL2_DEATHSLIDESHOW) - { - FinalePart = 14; - } - else switch (level.levelnum) - { - case 3: - FinalePart = 1; - break; - - case 10: - FinalePart = 5; - break; - - default: - FinalePart = -99; - break; - } - - FinaleCount = 0; - FinaleStage = 5; - FinaleEndCount = 0; -} - -//============================================================================ -// -// F_AdvanceSlideshow -// -//============================================================================ - -void F_AdvanceSlideshow () -{ - switch (FinalePart) - { - case -99: - if (level.cdtrack == 0 || !S_ChangeCDMusic (level.cdtrack, level.cdid)) - S_ChangeMusic (level.Music, level.musicorder); - gamestate = GS_LEVEL; - wipegamestate = GS_LEVEL; - P_ResumeConversation (); - viewactive = true; - break; -} - -// -// F_Drawer -// -void F_Drawer (void) -{ - const char *picname = NULL; - - switch (FinaleStage) - { - case 0: // Intermission or end-of-episode text - // erase the entire screen to a tiled background (or picture) - if (!FinaleHasPic) - { - FTextureID picnum = TexMan.CheckForTexture (FinaleFlat, FTexture::TEX_Flat, FTextureManager::TEXMAN_Overridable); - if (picnum.isValid()) - { - screen->FlatFill (0,0, SCREENWIDTH, SCREENHEIGHT, TexMan[picnum]); - } - else - { - screen->Clear (0, 0, SCREENWIDTH, SCREENHEIGHT, 0, 0); - } - } - else - { - picname = FinaleFlat; - } - V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT); - break; - - case 1: - case 2: - case 4: - switch (EndSequences[FinaleSequence].EndType) - { - default: - case END_Pic1: - picname = gameinfo.GetFinalePage(1); - screen->DrawTexture (TexMan[picname], 0, 0, - DTA_DestWidth, screen->GetWidth(), - DTA_DestHeight, screen->GetHeight(), TAG_DONE); - break; - case END_Pic2: - picname = gameinfo.GetFinalePage(2); - screen->DrawTexture (TexMan[picname], 0, 0, - DTA_DestWidth, screen->GetWidth(), - DTA_DestHeight, screen->GetHeight(), TAG_DONE); - break; - case END_Pic3: - picname = gameinfo.GetFinalePage(3); - screen->DrawTexture (TexMan[picname], 0, 0, - DTA_DestWidth, screen->GetWidth(), - DTA_DestHeight, screen->GetHeight(), TAG_DONE); - break; - case END_Pic: - picname = EndSequences[FinaleSequence].PicName; - break; - case END_Bunny: - case END_BuyStrife: - F_BunnyScroll (); - break; - case END_Underwater: - F_DrawUnderwater (); - break; - case END_Demon: - F_DemonScroll (); - break; - case END_TitleScreen: - D_StartTitle (); - break; - } - break; - - case 3: - F_CastDrawer (); - break; - - case 5: - picname = FinaleFlat; - break; - - case 6: - picname = "CREDIT"; - break; - - case 10: - case 11: - picname = "FINALE1"; - break; - - case 12: - case 13: - picname = "FINALE2"; - break; - - case 14: - case 15: - picname = "FINALE3"; - break; - } - if (picname != NULL) - { - FTexture *pic = TexMan[picname]; - screen->DrawTexture (pic, 0, 0, DTA_Fullscreen, true, TAG_DONE); - screen->FillBorder (NULL); - if (FinaleStage >= 14) - { // Chess pic, draw the correct character graphic - double w = pic->GetScaledWidthDouble(); - double h = pic->GetScaledHeightDouble(); - if (multiplayer) - { - screen->DrawTexture (TexMan["CHESSALL"], 20, 0, - DTA_VirtualWidthF, w, - DTA_VirtualHeightF, h, TAG_DONE); - } - else if (players[consoleplayer].CurrentPlayerClass > 0) - { - picname = players[consoleplayer].CurrentPlayerClass == 1 ? "CHESSC" : "CHESSM"; - screen->DrawTexture (TexMan[picname], 60, 0, - DTA_VirtualWidthF, w, - DTA_VirtualHeightF, h, TAG_DONE); - } - } - } - switch (FinaleStage) - { - case 0: - case 11: - case 12: - case 15: - F_TextWrite (); - break; - } -} - -//========================================================================== -// -// GetFinaleText -// -//========================================================================== - -static void GetFinaleText (const char *msgLumpName) -{ - int msgLump; - - msgLump = Wads.CheckNumForFullName(msgLumpName, true); - if (msgLump != -1) - { - char *textbuf; - FinaleTextLen = Wads.LumpLength(msgLump); - textbuf = (char *)alloca (FinaleTextLen + 1); - Wads.ReadLump (msgLump, textbuf); - textbuf[FinaleTextLen] = '\0'; - FinaleText = textbuf; - } - else - { - FinaleText = "Unknown message "; - FinaleText += msgLumpName; - FinaleTextLen = FinaleText.Len(); - } -} diff --git a/src/intermission/intermission.cpp b/src/intermission/intermission.cpp index 9ff03f9f32..79b13ae751 100644 --- a/src/intermission/intermission.cpp +++ b/src/intermission/intermission.cpp @@ -42,6 +42,11 @@ #include "d_main.h" #include "gstrings.h" #include "intermission/intermission.h" +#include "actor.h" +#include "d_player.h" +#include "r_state.h" +#include "r_translate.h" +#include "c_bind.h" FIntermissionDescriptorList IntermissionDescriptors; @@ -322,6 +327,8 @@ void DIntermissionScreenCast::Init(FIntermissionAction *desc, bool first) Super::Init(desc, first); mName = static_cast(desc)->mName; mClass = PClass::FindClass(static_cast(desc)->mCastClass); + if (mClass != NULL) mDefaults = GetDefaultByType(mClass); + else mDefaults = NULL; mCastSounds.Resize(static_cast(desc)->mCastSounds.Size()); for (unsigned i=0; i < mCastSounds.Size(); i++) @@ -330,21 +337,163 @@ void DIntermissionScreenCast::Init(FIntermissionAction *desc, bool first) mCastSounds[i].mIndex = static_cast(desc)->mCastSounds[i].mIndex; mCastSounds[i].mSound = static_cast(desc)->mCastSounds[i].mSound; } + caststate = mDefaults->SeeState; + if (mClass->IsDescendantOf(RUNTIME_CLASS(APlayerPawn))) + { + advplayerstate = mDefaults->MissileState; + castsprite = skins[players[consoleplayer].userinfo.skin].sprite; + casttranslation = translationtables[TRANSLATION_Players][consoleplayer]; + } + else + { + advplayerstate = NULL; + if (caststate != NULL) castsprite = caststate->sprite; + else castsprite = -1; + casttranslation = NULL; + } + castdeath = false; + castframes = 0; + castonmelee = 0; + castattacking = false; + if (mDefaults->SeeSound) + { + S_Sound (CHAN_VOICE | CHAN_UI, mDefaults->SeeSound, 1, ATTN_NONE); + } } int DIntermissionScreenCast::Responder (event_t *ev) { - return Super::Responder(ev); + if (ev->type == EV_KeyDown) + { + const char *cmd = Bindings.GetBind (ev->data1); + + if (cmd != NULL && !stricmp (cmd, "toggleconsole")) + return 0; + } + if (castdeath) + return 1; // already in dying frames + + castdeath = true; + caststate = mClass->ActorInfo->FindState(NAME_Death); + if (caststate == NULL) return -1; + + casttics = caststate->GetTics(); + castframes = 0; + castattacking = false; + + if (mClass->IsDescendantOf(RUNTIME_CLASS(APlayerPawn))) + { + int snd = S_FindSkinnedSound(players[consoleplayer].mo, "*death"); + if (snd != 0) S_Sound (CHAN_VOICE | CHAN_UI, snd, 1, ATTN_NONE); + } + else if (mDefaults->DeathSound) + { + S_Sound (CHAN_VOICE | CHAN_UI, mDefaults->DeathSound, 1, ATTN_NONE); + } + return true; } int DIntermissionScreenCast::Ticker () { - return Super::Ticker(); + Super::Ticker(); + + if (--casttics > 0 && caststate != NULL) + return 0; // not time to change state yet + + if (caststate == NULL || caststate->GetTics() == -1 || caststate->GetNextState() == NULL) + { + return -1; + } + else + { + // sound hacks.... + if (caststate != NULL && castattacking) + { + for (unsigned i = 0; i < mCastSounds.Size(); i++) + { + if ((!!mCastSounds[i].mSequence) == (basestate != mDefaults->MissileState) && + (caststate == basestate + mCastSounds[i].mIndex - 1)) + { + S_StopAllChannels (); + S_Sound (CHAN_WEAPON | CHAN_UI, mCastSounds[i].mSound, 1, ATTN_NONE); + break; + } + } + } + + // just advance to next state in animation + if (caststate == advplayerstate) + goto stopattack; // Oh, gross hack! + + caststate = caststate->GetNextState(); + castframes++; + } + + if (castframes == 12) + { + // go into attack frame + castattacking = true; + if (castonmelee) + basestate = caststate = mDefaults->MeleeState; + else + basestate = caststate = mDefaults->MissileState; + castonmelee ^= 1; + if (caststate == NULL) + { + if (castonmelee) + basestate = caststate = mDefaults->MeleeState; + else + basestate = caststate = mDefaults->MissileState; + } + } + + if (castattacking) + { + if (castframes == 24 || caststate == mDefaults->SeeState ) + { + stopattack: + castattacking = false; + castframes = 0; + caststate = mDefaults->SeeState; + } + } + + casttics = caststate->GetTics(); + if (casttics == -1) + casttics = 15; + return 0; } void DIntermissionScreenCast::Drawer () { + spriteframe_t* sprframe; + FTexture* pic; + Super::Drawer(); + + const char *name = mName; + if (name != NULL) + { + if (*name == '$') name = GStrings(name+1); + screen->DrawText (SmallFont, CR_UNTRANSLATED, + (SCREENWIDTH - SmallFont->StringWidth (name) * CleanXfac)/2, + (SCREENHEIGHT * 180) / 200, + name, + DTA_CleanNoMove, true, TAG_DONE); + } + + // draw the current frame in the middle of the screen + if (caststate != NULL) + { + sprframe = &SpriteFrames[sprites[castsprite].spriteframes + caststate->GetFrame()]; + pic = TexMan(sprframe->Texture[0]); + + screen->DrawTexture (pic, 160, 170, + DTA_320x200, true, + DTA_FlipX, sprframe->Flip & 1, + DTA_Translation, casttranslation, + TAG_DONE); + } } //========================================================================== @@ -499,6 +648,7 @@ bool DIntermissionController::Responder (event_t *ev) { if (mScreen != NULL) { + if (mScreen->mTicker < 2) return false; // prevent some leftover events from auto-advancing int res = mScreen->Responder(ev); mAdvance = (res == -1); return !!res; diff --git a/src/intermission/intermission.h b/src/intermission/intermission.h index 23fa3d7f2f..f03fbb48a7 100644 --- a/src/intermission/intermission.h +++ b/src/intermission/intermission.h @@ -158,13 +158,13 @@ class DIntermissionScreen : public DObject protected: int mDuration; - int mTicker; FTextureID mBackground; bool mFlatfill; bool mPaletteChanged; TArray mOverlays; public: + int mTicker; DIntermissionScreen() {} virtual void Init(FIntermissionAction *desc, bool first); @@ -225,10 +225,22 @@ class DIntermissionScreenCast : public DIntermissionScreen { DECLARE_CLASS (DIntermissionScreenCast, DIntermissionScreen) - FString mName; + const char *mName; const PClass *mClass; + AActor *mDefaults; TArray mCastSounds; + int casttics; + int castsprite; // [RH] For overriding the player sprite with a skin + const FRemapTable *casttranslation; // [RH] Draw "our hero" with their chosen suit color + FState* caststate; + FState* basestate; + FState* advplayerstate; + bool castdeath; + bool castattacking; + int castframes; + int castonmelee; + public: DIntermissionScreenCast() {} diff --git a/src/intermission/intermission_parse.cpp b/src/intermission/intermission_parse.cpp index 84ba9ec6f1..a8ef070781 100644 --- a/src/intermission/intermission_parse.cpp +++ b/src/intermission/intermission_parse.cpp @@ -807,11 +807,14 @@ void F_StartFinale (const char *music, int musicorder, int cdtrack, unsigned int textscreen->mCdId = cdid; } FIntermissionDescriptor *desc = new FIntermissionDescriptor; - desc->mLink = ending? endsequence : NAME_None; desc->mActions.Push(textscreen); - FIntermissionActionWiper *wiper = new FIntermissionActionWiper; - desc->mActions.Push(wiper); + if (ending) + { + desc->mLink = endsequence; + FIntermissionActionWiper *wiper = new FIntermissionActionWiper; + desc->mActions.Push(wiper); + } F_StartIntermission(desc, true, ending); } diff --git a/wadsrc/static/mapinfo/common.txt b/wadsrc/static/mapinfo/common.txt index f1f51f6d46..15055dfc4f 100644 --- a/wadsrc/static/mapinfo/common.txt +++ b/wadsrc/static/mapinfo/common.txt @@ -220,7 +220,7 @@ Intermission Doom2Cast Cast { CastClass = "Fatso" - CastName = "$CC_FATSO" + CastName = "$CC_MANCU" AttackSound = "Missile", 1, "fatso/attack" AttackSound = "Missile", 4, "fatso/attack" AttackSound = "Missile", 7, "fatso/attack"