zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-31 01:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke end of episode animations ported

Browse source
This commit is contained in:
Christoph Oelckers 2020-06-28 21:38:25 +02:00
parent 6767b383e7
commit 69d9a98ead
8 changed files with 257 additions and 617 deletions
Download patch file Download diff file Expand all files Collapse all files

25
source/common/textures/formats/anmtexture.cpp
View file

@ -64,7 +64,6 @@ public:
FImageSource *AnmImage_TryCreate(FileReader & file, int lumpnum) FImageSource *AnmImage_TryCreate(FileReader & file, int lumpnum)
{ {
int x, y, comp;
file.Seek(0, FileReader::SeekSet); file.Seek(0, FileReader::SeekSet);
char check[4]; char check[4];
file.Read(check, 4); file.Read(check, 4);
@ -77,8 +76,8 @@ FImageSource *AnmImage_TryCreate(FileReader & file, int lumpnum)
{ {
return nullptr; return nullptr;
} }
numframes = ANIM_NumFrames(&anim); int numframes = ANIM_NumFrames(&anim);
if (result >= 1) if (numframes >= 1)
{ {
return new FAnmTexture(lumpnum, 320, 200); return new FAnmTexture(lumpnum, 320, 200);
} }
@ -104,16 +103,16 @@ FAnmTexture::FAnmTexture (int lumpnum, int w, int h)
void FAnmTexture::ReadFrame(uint8_t *pixels, uint8_t *palette) void FAnmTexture::ReadFrame(uint8_t *pixels, uint8_t *palette)
{ {
FileData lump = fileSystem.ReadFile (SourceLump); FileData lump = fileSystem.ReadFile (SourceLump);
const uint8_t *source = (const uint8_t *)lump.GetMem(); uint8_t *source = (uint8_t *)lump.GetMem();
anim_t anim; anim_t anim;
if (ANIM_LoadAnim(&anim, source, lump.GetSize()) >= 0) if (ANIM_LoadAnim(&anim, source, lump.GetSize()) >= 0)
{ {
numframes = ANIM_NumFrames(&anim); int numframes = ANIM_NumFrames(&anim);
if (result >= 1) if (numframes >= 1)
{ {
memcpy(palette, ANIM_GetPalette(anim), 768); memcpy(palette, ANIM_GetPalette(&anim), 768);
memcpy(pixels, ANIM_DrawFrame(1), Width*Height); memcpy(pixels, ANIM_DrawFrame(&anim, 1), Width*Height);
return; return;
} }
} }
@ -140,7 +139,7 @@ TArray<uint8_t> FAnmTexture::CreatePalettedPixels(int conversion)
remap[i] = ColorMatcher.Pick(palette[i*3], palette[i*3+1], palette[i*3+2]); remap[i] = ColorMatcher.Pick(palette[i*3], palette[i*3+1], palette[i*3+2]);
} }
ImageHelpers::FlipNonSquareBlockRemap (pixels.Data(), buffer, Width, Height, Width, remap); ImageHelpers::FlipNonSquareBlockRemap (pixels.Data(), buffer, Width, Height, Width, remap);
return Pixels; return pixels;
} }
//========================================================================== //==========================================================================
@ -155,14 +154,14 @@ int FAnmTexture::CopyPixels(FBitmap *bmp, int conversion)
uint8_t palette[768]; uint8_t palette[768];
ReadFrame(buffer, palette); ReadFrame(buffer, palette);
auto dpix = bmp.GetPixels(); auto dpix = bmp->GetPixels();
for (int i = 0; i < Width * Height; i++) for (int i = 0; i < Width * Height; i++)
{ {
int p = i * 4; int p = i * 4;
int index = buffer[i]; int index = buffer[i];
dpix[p + 0] = Palette[index * 3 + 2]; dpix[p + 0] = palette[index * 3 + 2];
dpix[p + 1] = Palette[index * 3 + 1]; dpix[p + 1] = palette[index * 3 + 1];
dpix[p + 2] = Palette[index * 3]; dpix[p + 2] = palette[index * 3];
dpix[p + 3] = 255; dpix[p + 3] = 255;
} }

13
source/core/palette.cpp
View file

@ -63,7 +63,7 @@ void paletteSetColorTable(int32_t id, uint8_t const* table, bool notransparency,
BuildTransTable(GPalette.BaseColors); BuildTransTable(GPalette.BaseColors);
} }
FRemapTable remap; FRemapTable remap;
remap.AddColors(0, 256, table, 255); remap.AddColors(0, 256, table, -1);
if (!notransparency) if (!notransparency)
{ {
remap.Palette[255] = 0; remap.Palette[255] = 0;
@ -281,17 +281,12 @@ void LookupTableInfo::postLoadLookups()
} }
} }
} }
// Assuming that color 255 is always transparent, do the following:
// Copy color 0 to color 255
// Set color 0 to transparent black
// Swap all remap entries from 0 to 255 and vice versa
// Always map 0 to 0.
// Swap colors 0 and 255. Note that color 255 may not be translucent!
auto colorswap = [](FRemapTable* remap) auto colorswap = [](FRemapTable* remap)
{ {
remap->Palette[255] = remap->Palette[0]; std::swap(remap->Palette[255], remap->Palette[0]);
remap->Palette[0] = 0; std::swap(remap->Remap[255], remap->Remap[0]);
remap->Remap[255] = remap->Remap[0];
for (auto& c : remap->Remap) for (auto& c : remap->Remap)
{ {
if (c == 0) c = 255; if (c == 0) c = 255;

79
source/core/screenjob.cpp
View file

@ -52,37 +52,50 @@ IMPLEMENT_CLASS(DScreenJob, true, false)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void RunScreenJob(DScreenJob *job, CompletionFunc completion, bool clearbefore) void RunScreenJob(JobDesc *jobs, int count, CompletionFunc completion, bool clearbefore)
{ {
if (job == nullptr) // Release all jobs from the garbage collector - the code as it is cannot deal with them getting collected.
for (int i = 0; i < count; i++)
{ {
completion(false); jobs[i].job->Release();
return;
} }
if (clearbefore) bool skipped = false;
for (int i = 0; i < count; i++)
{ {
twod->ClearScreen(); auto job = jobs[i];
videoNextPage(); if (job.job != nullptr && (!skipped || !job.ignoreifskipped))
}
auto startTime = I_nsTime();
// Input later needs to be event based so that these screens can do more than be skipped.
inputState.ClearAllInput();
while(true)
{
auto now = I_nsTime();
handleevents();
bool skiprequest = inputState.CheckAllInput();
int state = job->Frame(now - startTime, skiprequest);
videoNextPage();
if (state < 1)
{ {
job->Destroy(); skipped = false;
completion(state < 0); if (clearbefore)
return; {
twod->ClearScreen();
videoNextPage();
}
auto startTime = I_nsTime();
// Input later needs to be event based so that these screens can do more than be skipped.
inputState.ClearAllInput();
while (true)
{
auto now = I_nsTime();
handleevents();
bool skiprequest = inputState.CheckAllInput();
int state = job.job->Frame(now - startTime, skiprequest);
videoNextPage();
if (state < 1)
{
skipped = state < 0;
job.job->Destroy();
job.job->ObjectFlags |= OF_YesReallyDelete;
delete job.job;
break;
}
}
} }
if (job.postAction) job.postAction();
} }
if (completion) completion(false);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -172,6 +185,7 @@ public:
} }
} }
curframe++; curframe++;
if (skiprequest) soundEngine->StopAllChannels();
return skiprequest ? -1 : curframe < numframes? 1 : 0; return skiprequest ? -1 : curframe < numframes? 1 : 0;
} }
@ -188,19 +202,17 @@ public:
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void PlayVideo(const char* filename, const AnimSound* ans, const int* frameticks, CompletionFunc completion) DScreenJob *PlayVideo(const char* filename, const AnimSound* ans, const int* frameticks)
{ {
if (!filename) // this is for chaining optional videos without special case coding by the caller. if (!filename)
{ {
completion(false); return nullptr;
return;
} }
auto fr = fileSystem.OpenFileReader(filename); auto fr = fileSystem.OpenFileReader(filename);
if (!fr.isOpen()) if (!fr.isOpen())
{ {
Printf("%s: Unable to open video\n", filename); Printf("%s: Unable to open video\n", filename);
completion(true); return nullptr;
return;
} }
char id[20] = {}; char id[20] = {};
@ -214,9 +226,9 @@ void PlayVideo(const char* filename, const AnimSound* ans, const int* frameticks
{ {
Printf("%s: invalid ANM file.\n", filename); Printf("%s: invalid ANM file.\n", filename);
anm->Destroy(); anm->Destroy();
return; return nullptr;
} }
RunScreenJob(anm, completion); return anm;
} }
else if (!memcmp(id, "SMK2", 4)) else if (!memcmp(id, "SMK2", 4))
{ {
@ -230,8 +242,7 @@ void PlayVideo(const char* filename, const AnimSound* ans, const int* frameticks
else else
{ {
Printf("%s: Unknown video format\n", filename); Printf("%s: Unknown video format\n", filename);
completion(true);
return;
} }
return nullptr;
} }

19
source/core/screenjob.h
View file

@ -7,15 +7,20 @@ using CompletionFunc = std::function<void(bool)>;
class DScreenJob : public DObject class DScreenJob : public DObject
{ {
DECLARE_CLASS(DScreenJob, DObject) DECLARE_CLASS(DScreenJob, DObject)
//std::function<void(bool skipped)> completion;
public: public:
virtual int Frame(uint64_t clock, bool skiprequest) = 0; virtual int Frame(uint64_t clock, bool skiprequest) = 0;
}; };
struct JobDesc
{
DScreenJob* job;
void (*postAction)();
bool ignoreifskipped;
};
void RunScreenJob(DScreenJob *job, std::function<void(bool skipped)> completion, bool clearbefore = true);
void RunScreenJob(std::function<int(uint64_t, bool)> action, CompletionFunc completion, bool clearbefore = true); void RunScreenJob(JobDesc *jobs, int count, CompletionFunc completion, bool clearbefore = true);
struct AnimSound struct AnimSound
{ {
@ -23,10 +28,4 @@ struct AnimSound
int soundnum; int soundnum;
}; };
void PlayVideo(const char *filename, const AnimSound *ans, const int *frameticks, CompletionFunc completion); DScreenJob *PlayVideo(const char *filename, const AnimSound *ans = nullptr, const int *frameticks = nullptr);
// This one is not suitable for ANM and SMK unless a descriptor file format is implemented.
inline void PlayVideo(const char *filename,CompletionFunc completion)
{
PlayVideo(filename, nullptr, nullptr , completion);
}

10
source/core/textures/buildtiles.h
View file

@ -481,9 +481,17 @@ inline void tileInvalidate(int tilenume, int32_t, int32_t)
TileFiles.InvalidateTile(tilenume); TileFiles.InvalidateTile(tilenume);
} }
inline FGameTexture* tileGetTexture(int tile) int32_t animateoffs(int const tilenum, int fakevar);
inline FGameTexture* tileGetTexture(int tile, bool animate = false)
{ {
assert(tile < MAXTILES); assert(tile < MAXTILES);
if (animate)
{
if (picanm[tile].sf & PICANM_ANIMTYPE_MASK)
tile += animateoffs(tile, 0);
}
return TileFiles.tiledata[tile].texture; return TileFiles.tiledata[tile].texture;
} }

534
source/games/duke/src/2d_d.cpp
View file

@ -37,6 +37,7 @@ Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
#include "mapinfo.h" #include "mapinfo.h"
#include "screenjob.h" #include "screenjob.h"
#include "texturemanager.h" #include "texturemanager.h"
#include "buildtiles.h"
//#include "zz_text.h" //#include "zz_text.h"
#undef gametext #undef gametext
@ -280,72 +281,6 @@ static void gamenumber(int x,int y,int n,char s)
} }
#endif #endif
// ANM player - catastrophically shitty implementation. Todo: Move the sound and fps data to a control file per movie.
void endanimsounds(int fr)
{
switch(ud.volume_number)
{
case 0:break;
case 1:
switch(fr)
{
case 1:
sound(WIND_AMBIENCE);
break;
case 26:
sound(ENDSEQVOL2SND1);
break;
case 36:
sound(ENDSEQVOL2SND2);
break;
case 54:
sound(THUD);
break;
case 62:
sound(ENDSEQVOL2SND3);
break;
case 75:
sound(ENDSEQVOL2SND4);
break;
case 81:
sound(ENDSEQVOL2SND5);
break;
case 115:
sound(ENDSEQVOL2SND6);
break;
case 124:
sound(ENDSEQVOL2SND7);
break;
}
break;
case 2:
switch(fr)
{
case 1:
sound(WIND_REPEAT);
break;
case 98:
sound(DUKE_GRUNT);
break;
case 82+20:
sound(THUD);
sound(SQUISHED);
break;
case 104+20:
sound(ENDSEQVOL3SND3);
break;
case 114+20:
sound(ENDSEQVOL3SND2);
break;
case 158:
sound(PIPEBOMB_EXPLODE);
break;
}
break;
}
}
void intro4animsounds(int fr) void intro4animsounds(int fr)
{ {
switch(fr) switch(fr)
@ -392,132 +327,6 @@ void intro42animsounds(int fr)
} }
} }
void endanimvol41(int fr)
{
switch(fr)
{
case 3:
sound(DUKE_UNDERWATER);
break;
case 35:
sound(VOL4ENDSND1);
break;
}
}
void endanimvol42(int fr)
{
switch(fr)
{
case 11:
sound(DUKE_UNDERWATER);
break;
case 20:
sound(VOL4ENDSND1);
break;
case 39:
sound(VOL4ENDSND2);
break;
case 50:
FX_StopAllSounds();
break;
}
}
void endanimvol43(int fr)
{
switch(fr)
{
case 1:
sound(BOSS4_DEADSPEECH);
break;
case 40:
sound(VOL4ENDSND1);
sound(DUKE_UNDERWATER);
break;
case 50:
sound(BIGBANG);
break;
}
}
void playanm(const char *fn,char t)
{
int i, length=0, numframes=0;
// return;
AnimTextures animtex;
inputState.ClearAllInput();
auto fr = fileSystem.OpenFileReader(fn);
if (fr.isOpen())
{
anim_t anm;
auto buffer = fr.ReadPadded(1);
fr.Close();
if (memcmp(buffer.Data(), "LPF ", 4) ||
ANIM_LoadAnim(&anm, buffer.Data(), buffer.Size() - 1) < 0 ||
(numframes = ANIM_NumFrames(&anm)) <= 0)
{
Printf("%s: Invalid ANM file\n", fn);
goto ENDOFANIMLOOP;
}
animtex.SetSize(AnimTexture::Paletted, 320, 200);
auto palptr = ANIM_GetPalette(&anm);
ototalclock = totalclock + 10;
for (i = 1; i < numframes; i++)
{
while (totalclock < ototalclock)
{
handleevents();
//getpackets();
if (inputState.CheckAllInput())
goto ENDOFANIMLOOP;
}
animtex.SetFrame(ANIM_GetPalette(&anm), ANIM_DrawFrame(&anm, i));
// ouch!
if (t == 10) ototalclock += 14;
else if (t == 9) ototalclock += 10;
else if (t == 7) ototalclock += 18;
else if (t == 6) ototalclock += 14;
else if (t == 5) ototalclock += 9;
else if (ud.volume_number == 3) ototalclock += 10;
else if (ud.volume_number == 2) ototalclock += 10;
else if (ud.volume_number == 1) ototalclock += 18;
else ototalclock += 10;
twod->ClearScreen();
DrawTexture(twod, animtex.GetFrame(), 0, 0, DTA_FullscreenEx, 3, DTA_Masked, false, TAG_DONE);
videoNextPage();
inputState.ClearAllInput();
if (t == 8) endanimvol41(i);
else if (t == 10) endanimvol42(i);
else if (t == 11) endanimvol43(i);
else if (t == 9) intro42animsounds(i);
else if (t == 7) intro4animsounds(i);
else if (t == 6) first4animsounds(i);
else if (t < 4) endanimsounds(i);
}
}
ENDOFANIMLOOP:
inputState.ClearAllInput();
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// //
@ -529,7 +338,7 @@ class DDRealmsScreen : public DScreenJob
int Frame(uint64_t clock, bool skiprequest) override int Frame(uint64_t clock, bool skiprequest) override
{ {
const int duration = 7500; const int duration = 7500;
const auto tex = tileGetTexture(DREALMS); const auto tex = tileGetTexture(DREALMS, true);
const int translation = TRANSLATION(Translation_BasePalettes, DREALMSPAL); const int translation = TRANSLATION(Translation_BasePalettes, DREALMSPAL);
int span = int(clock / 1'000'000); int span = int(clock / 1'000'000);
@ -539,7 +348,7 @@ class DDRealmsScreen : public DScreenJob
light = clamp(light, 0, 255); light = clamp(light, 0, 255);
PalEntry pe(255, light, light, light); PalEntry pe(255, light, light, light);
twod->ClearScreen(); twod->ClearScreen();
DrawTexture(twod, tex, 0, 0, DTA_FullscreenEx, 3, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_LegacyRenderStyle, STYLEF_Alpha1, TAG_DONE); DrawTexture(twod, tex, 0, 0, DTA_FullscreenEx, 3, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
return skiprequest ? -1 : span < duration ? 1 : 0; return skiprequest ? -1 : span < duration ? 1 : 0;
} }
}; };
@ -573,7 +382,7 @@ class DTitleScreen : public DScreenJob
PalEntry pe(255, light, light, light); PalEntry pe(255, light, light, light);
twod->ClearScreen(); twod->ClearScreen();
DrawTexture(twod, tileGetTexture(BETASCREEN), 0, 0, DTA_FullscreenEx, 3, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_LegacyRenderStyle, STYLEF_Alpha1, TAG_DONE); DrawTexture(twod, tileGetTexture(BETASCREEN, true), 0, 0, DTA_FullscreenEx, 3, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
if (soundanm == 0 && clock >= 120 && clock < 120 + 60) if (soundanm == 0 && clock >= 120 && clock < 120 + 60)
{ {
@ -598,19 +407,19 @@ class DTitleScreen : public DScreenJob
double scale = clamp(clock - 120, 0, 60) / 64.; double scale = clamp(clock - 120, 0, 60) / 64.;
if (scale > 0.) if (scale > 0.)
DrawTexture(twod, tileGetTexture(DUKENUKEM), 160, 104, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DrawTexture(twod, tileGetTexture(DUKENUKEM, true), 160, 104, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_ScaleX, scale, DTA_ScaleY, scale, TAG_DONE); DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_ScaleX, scale, DTA_ScaleY, scale, TAG_DONE);
scale = clamp(clock - 220, 0, 30) / 32.; scale = clamp(clock - 220, 0, 30) / 32.;
if (scale > 0.) if (scale > 0.)
DrawTexture(twod, tileGetTexture(THREEDEE), 160, 129, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DrawTexture(twod, tileGetTexture(THREEDEE, true), 160, 129, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_ScaleX, scale, DTA_ScaleY, scale, TAG_DONE); DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_ScaleX, scale, DTA_ScaleY, scale, TAG_DONE);
if (PLUTOPAK) if (PLUTOPAK)
{ {
scale = (410 - clamp(clock, 280, 395)) / 16.; scale = (410 - clamp(clock, 280, 395)) / 16.;
if (scale > 0.) if (scale > 0. && clock > 280)
DrawTexture(twod, tileGetTexture(PLUTOPAKSPRITE+1), 160, 151, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DrawTexture(twod, tileGetTexture(PLUTOPAKSPRITE+1, true), 160, 151, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_ScaleX, scale, DTA_ScaleY, scale, TAG_DONE); DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_ScaleX, scale, DTA_ScaleY, scale, TAG_DONE);
} }
return skiprequest ? -1 : 1; return skiprequest ? -1 : 1;
@ -636,18 +445,12 @@ void Logo_d(CompletionFunc completion)
}; };
static const int logoframetimes[] = { 9, 9, 9 }; static const int logoframetimes[] = { 9, 9, 9 };
PlayVideo(VOLUMEALL && !inputState.CheckAllInput() ? "logo.anm" : nullptr, logosound, logoframetimes, [=](bool skipped) JobDesc jobs[3];
{ int job = 0;
S_PlaySpecialMusic(MUS_INTRO); if (VOLUMEALL && !inputState.CheckAllInput()) jobs[job++] = { PlayVideo("logo.anm", logosound, logoframetimes), []() { S_PlaySpecialMusic(MUS_INTRO); } };
RunScreenJob(!isNam() ? Create<DDRealmsScreen>() : nullptr, [=](bool skipped) if (!isNam()) jobs[job++] = { Create<DDRealmsScreen>(), nullptr };
{ jobs[job++] = { Create<DTitleScreen>(), []() { S_PlaySound(NITEVISION_ONOFF, CHAN_AUTO, CHANF_UI); } };
RunScreenJob(Create<DTitleScreen>(), [=](bool skipped) RunScreenJob(jobs, job, completion);
{
S_PlaySound(NITEVISION_ONOFF, CHAN_AUTO, CHANF_UI);
completion(skipped);
});
});
});
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -687,7 +490,6 @@ public:
int totalclock = nsclock * 120 / 1'000'000'000; int totalclock = nsclock * 120 / 1'000'000'000;
if (skiprequest) fadeoutstart = totalclock; if (skiprequest) fadeoutstart = totalclock;
auto translation = TRANSLATION(Translation_BasePalettes, TITLEPAL);
uint64_t span = nsclock / 1'000'000; uint64_t span = nsclock / 1'000'000;
int light = 255; int light = 255;
if (span < 255) light = span; if (span < 255) light = span;
@ -696,7 +498,8 @@ public:
PalEntry pe(255, light, light, light); PalEntry pe(255, light, light, light);
twod->ClearScreen(); twod->ClearScreen();
DrawTexture(twod, tileGetTexture(VICTORY1), 0, 0, DTA_FullscreenEx, 3, DTA_TranslationIndex, translation, DTA_Color, pe, DTA_LegacyRenderStyle, STYLEF_Alpha1, TAG_DONE); DrawTexture(twod, tileGetTexture(VICTORY1, true), 0, 50, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_TranslationIndex, translation, DTA_Color, pe, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
// boss // boss
@ -709,8 +512,8 @@ public:
S_PlaySound(SQUISHED, CHAN_AUTO, CHANF_UI); S_PlaySound(SQUISHED, CHAN_AUTO, CHANF_UI);
bonuscnt++; bonuscnt++;
} }
DrawTexture(twod, tileGetTexture(bossmove[t + 2]), bossmove[t + 3], bossmove[t + 4], DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DrawTexture(twod, tileGetTexture(bossmove[t + 2], true), bossmove[t + 3], bossmove[t + 4], DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_Color, pe, TAG_DONE); DTA_TranslationIndex, translation, DTA_Color, pe, TAG_DONE);
} }
// Breathe // Breathe
@ -718,8 +521,8 @@ public:
{ {
if (totalclock >= 750) if (totalclock >= 750)
{ {
DrawTexture(twod, tileGetTexture(VICTORY1 + 8), 86, 59, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DrawTexture(twod, tileGetTexture(VICTORY1 + 8, true), 86, 59, DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_Color, pe, TAG_DONE); DTA_TranslationIndex, translation, DTA_Color, pe, TAG_DONE);
if (totalclock >= 750 && bonuscnt == 2) if (totalclock >= 750 && bonuscnt == 2)
{ {
S_PlaySound(DUKETALKTOBOSS, CHAN_AUTO, CHANF_UI); S_PlaySound(DUKETALKTOBOSS, CHAN_AUTO, CHANF_UI);
@ -734,8 +537,8 @@ public:
S_PlaySound(BOSSTALKTODUKE, CHAN_AUTO, CHANF_UI); S_PlaySound(BOSSTALKTODUKE, CHAN_AUTO, CHANF_UI);
bonuscnt++; bonuscnt++;
} }
DrawTexture(twod, tileGetTexture(breathe[t + 2]), breathe[t + 3], breathe[t + 4], DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DrawTexture(twod, tileGetTexture(breathe[t + 2], true), breathe[t + 3], breathe[t + 4], DTA_FullscreenScale, 3, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_CenterOffset, true, DTA_TranslationIndex, translation, DTA_Color, pe, TAG_DONE); DTA_TranslationIndex, translation, DTA_Color, pe, TAG_DONE);
} }
} }
// Only end after having faded out. // Only end after having faded out.
@ -749,19 +552,29 @@ public:
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
class DEpisodeEnd2 : public DScreenJob class DImageScreen : public DScreenJob
{ {
int fadeoutstart = -1; int fadeoutstart = -1;
FGameTexture* tex; int tilenum = -1;
FGameTexture* tex = nullptr;
public: public:
DEpisodeEnd2(FGameTexture * tile) DImageScreen(FGameTexture * tile)
{ {
tex = tile; tex = tile;
} }
DImageScreen(int tile)
{
tilenum = tile;
}
int Frame(uint64_t clock, bool skiprequest) override int Frame(uint64_t clock, bool skiprequest) override
{ {
if (tilenum > 0)
{
tex = tileGetTexture(tilenum, true);
}
if (!tex) return 0; if (!tex) return 0;
int span = int(clock / 1'000'000); int span = int(clock / 1'000'000);
int light = 255; int light = 255;
@ -770,8 +583,9 @@ public:
light = clamp(light, 0, 255); light = clamp(light, 0, 255);
PalEntry pe(255, light, light, light); PalEntry pe(255, light, light, light);
twod->ClearScreen(); twod->ClearScreen();
DrawTexture(twod, tex, 0, 0, DTA_FullscreenEx, 3, DTA_Color, pe, DTA_LegacyRenderStyle, STYLEF_Alpha1, TAG_DONE); DrawTexture(twod, tex, 0, 0, DTA_FullscreenEx, 3, DTA_Color, pe, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
// Only end after having faded out. // Only end after having faded out.
if (skiprequest && fadeoutstart < 0) fadeoutstart = span;
return fadeoutstart > 0 && light == 0 ? -1 : 1; return fadeoutstart > 0 && light == 0 ? -1 : 1;
} }
}; };
@ -786,6 +600,7 @@ class DBlackScreen : public DScreenJob
{ {
int wait; int wait;
public:
DBlackScreen(int w) : wait(w) {} DBlackScreen(int w) : wait(w) {}
int Frame(uint64_t clock, bool skiprequest) int Frame(uint64_t clock, bool skiprequest)
{ {
@ -801,7 +616,7 @@ class DBlackScreen : public DScreenJob
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
class DEpisode3End : public DEpisodeEnd2 class DEpisode3End : public DImageScreen
{ {
int sound = 0; int sound = 0;
int64_t waittime = 0; int64_t waittime = 0;
@ -815,7 +630,7 @@ class DEpisode3End : public DEpisodeEnd2
} }
public: public:
DEpisode3End() : DEpisodeEnd2(getTexture()) DEpisode3End() : DImageScreen(getTexture())
{ {
} }
@ -829,7 +644,7 @@ public:
break; break;
case 1: case 1:
if (!S_CheckSoundPlaying(ENDSEQVOL3SND5, 0)) if (!S_CheckSoundPlaying(ENDSEQVOL3SND5))
{ {
S_PlaySound(ENDSEQVOL3SND6, CHAN_AUTO, CHANF_UI); S_PlaySound(ENDSEQVOL3SND6, CHAN_AUTO, CHANF_UI);
sound++; sound++;
@ -837,7 +652,7 @@ public:
break; break;
case 2: case 2:
if (!S_CheckSoundPlaying(ENDSEQVOL3SND6, 0)) if (!S_CheckSoundPlaying(ENDSEQVOL3SND6))
{ {
S_PlaySound(ENDSEQVOL3SND7, CHAN_AUTO, CHANF_UI); S_PlaySound(ENDSEQVOL3SND7, CHAN_AUTO, CHANF_UI);
sound++; sound++;
@ -845,7 +660,7 @@ public:
break; break;
case 3: case 3:
if (!S_CheckSoundPlaying(ENDSEQVOL3SND7, 0)) if (!S_CheckSoundPlaying(ENDSEQVOL3SND7))
{ {
S_PlaySound(ENDSEQVOL3SND8, CHAN_AUTO, CHANF_UI); S_PlaySound(ENDSEQVOL3SND8, CHAN_AUTO, CHANF_UI);
sound++; sound++;
@ -853,7 +668,7 @@ public:
break; break;
case 4: case 4:
if (!S_CheckSoundPlaying(ENDSEQVOL3SND8, 0)) if (!S_CheckSoundPlaying(ENDSEQVOL3SND8))
{ {
S_PlaySound(ENDSEQVOL3SND9, CHAN_AUTO, CHANF_UI); S_PlaySound(ENDSEQVOL3SND9, CHAN_AUTO, CHANF_UI);
sound++; sound++;
@ -861,7 +676,7 @@ public:
break; break;
case 5: case 5:
if (!S_CheckSoundPlaying(ENDSEQVOL3SND8, 0)) if (!S_CheckSoundPlaying(ENDSEQVOL3SND8))
{ {
sound++; sound++;
waittime = clock + 1'000'000'000; waittime = clock + 1'000'000'000;
@ -878,12 +693,31 @@ public:
default: default:
break; break;
} }
int ret = DEpisodeEnd2::Frame(clock, skiprequest); int ret = DImageScreen::Frame(clock, skiprequest);
if (ret != 1) FX_StopAllSounds(); if (ret != 1) FX_StopAllSounds();
return ret; return ret;
} }
}; };
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
class DEpisode4Text : public DScreenJob
{
int Frame(uint64_t clock, bool skiprequest)
{
twod->ClearScreen();
menutext_center(60, GStrings("Thanks to all our"));
menutext_center(60 + 16, GStrings("fans for giving"));
menutext_center(60 + 16 + 16, GStrings("us big heads."));
menutext_center(70 + 16 + 16 + 16, GStrings("Look for a Duke Nukem 3D"));
menutext_center(70 + 16 + 16 + 16 + 16, GStrings("sequel soon."));
return skiprequest ? -1 : 1;
}
};
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
@ -891,7 +725,45 @@ public:
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void bonussequence(int num, CompletionFunc completion) class DEpisode5End : public DImageScreen
{
int sound = 0;
int64_t waittime = 0;
public:
DEpisode5End() : DImageScreen(FIREFLYGROWEFFECT)
{
}
int Frame(uint64_t clock, bool skiprequest)
{
switch (sound)
{
case 0:
sound++;
break;
case 1:
S_PlaySound(E5L7_DUKE_QUIT_YOU, CHAN_AUTO, CHANF_UI);
sound++;
break;
default:
break;
}
int ret = DImageScreen::Frame(clock, skiprequest);
if (ret != 1) FX_StopAllSounds();
return ret;
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void bonussequence_d(int num, CompletionFunc completion)
{ {
static const AnimSound cineov2sound[] = static const AnimSound cineov2sound[] =
{ {
@ -906,9 +778,8 @@ void bonussequence(int num, CompletionFunc completion)
{ 124, ENDSEQVOL2SND7 + 1 }, { 124, ENDSEQVOL2SND7 + 1 },
{ -1, -1 } { -1, -1 }
}; };
static const int cineov2frames[] = { 18, 18, 18 };
static const AnimSound cineov3sound[] = static const AnimSound cineov3sound[] =
{ {
{ 1, WIND_REPEAT + 1 }, { 1, WIND_REPEAT + 1 },
{ 98, DUKE_GRUNT + 1 }, { 98, DUKE_GRUNT + 1 },
@ -919,57 +790,90 @@ void bonussequence(int num, CompletionFunc completion)
{ 158, PIPEBOMB_EXPLODE + 1 }, { 158, PIPEBOMB_EXPLODE + 1 },
{ -1,-1 } { -1,-1 }
}; };
static const int cineov3frames[] = { 10, 10, 10 };
static const AnimSound vol4e1[] =
{
{ 3, DUKE_UNDERWATER+1 },
{ 35, VOL4ENDSND1+1 },
{ -1,-1 }
};
static const AnimSound vol4e2[] =
{
{ 11, DUKE_UNDERWATER+1 },
{ 20, VOL4ENDSND1+1 },
{ 39, VOL4ENDSND2+1 },
{ 50, -1 },
{ -1,-1 }
};
static const AnimSound vol4e3[] =
{
{ 1, BOSS4_DEADSPEECH },
{ 40, VOL4ENDSND1 },
{ 40, DUKE_UNDERWATER },
{ 50, BIGBANG },
{ -1,-1 }
};
static const int framespeed_10[] = { 10, 10, 10 };
static const int framespeed_14[] = { 14, 14, 14 };
static const int framespeed_18[] = { 18, 18, 18 };
Mus_Stop(); Mus_Stop();
FX_StopAllSounds(); FX_StopAllSounds();
JobDesc jobs[10];
int job = 0;
switch (num) switch (num)
{ {
case 0: case 0:
RunScreenJob(Create<DEpisode1End1>(), [=](bool skiprequest) jobs[job++] = { Create<DEpisode1End1>(), nullptr };
{ jobs[job++] = { Create<DImageScreen>(E1ENDSCREEN), nullptr };
RunScreenJob(Create<DEpisodeEnd2>(tileGetTexture(E1ENDSCREEN)), completion);
});
break; break;
case 1: case 1:
PlayVideo("cineov2.anm", cineov2sound, cineov2frames, [=](bool skiprequest) jobs[job++] = { PlayVideo("cineov2.anm", cineov2sound, framespeed_18), []() { S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI); } };
{ jobs[job++] = { Create<DImageScreen>(E2ENDSCREEN), nullptr };
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
RunScreenJob(Create<DEpisodeEnd2>(tileGetTexture(E2ENDSCREEN)), completion);
});
break; break;
case 2: case 2:
PlayVideo("cineov3.anm", cineov3sound, cineov3frames, [=](bool skiprequest) jobs[job++] = { PlayVideo("cineov3.anm", cineov3sound, framespeed_10), nullptr };
{ jobs[job++] = { Create<DBlackScreen>(200), []() { FX_StopAllSounds(); } };
RunScreenJob(Create<DBlackScreen>(skiprequest? 1 : 200), [=](bool skiprequest) jobs[job++] = { Create<DEpisode3End>(), []() { if (!PLUTOPAK) S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI); } };
{ if (!PLUTOPAK) jobs[job++] = { Create<DImageScreen>(TexMan.GetGameTextureByName("DUKETEAM.ANM", false, FTextureManager::TEXMAN_ForceLookup)) };
FX_StopAllSounds(); break;
if (PLUTOPAK)
{ case 3:
RunScreenJob(Create<DEpisode3End>(), completion); jobs[job++] = { PlayVideo("vol4e1.anm", vol4e1, framespeed_10), nullptr };
} jobs[job++] = { PlayVideo("vol4e2.anm", vol4e2, framespeed_10), nullptr };
else jobs[job++] = { PlayVideo("vol4e3.anm", vol4e3, framespeed_10), []() { S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI); } };
{ jobs[job++] = { Create<DEpisode4Text>(), nullptr };
RunScreenJob(Create<DEpisode3End>(), [=](bool skiprequest) jobs[job++] = { Create<DImageScreen>(TexMan.GetGameTextureByName("DUKETEAM.ANM", false, FTextureManager::TEXMAN_ForceLookup)), []() { FX_StopAllSounds(); } };
{ break;
S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI);
RunScreenJob(Create<DEpisodeEnd2>(TexMan.GetGameTextureByName("DUKETEAM.ANM", false, FTextureManager::TEXMAN_ForceLookup)), completion); case 4:
}); jobs[job++] = { Create<DEpisode5End>(), []() { FX_StopAllSounds(); } };
}
});
});
break; break;
} }
RunScreenJob(jobs, job, completion);
} }
#if 0
CCMD(testbonus)
{
if (argv.argc() > 1)
{
bonussequence_d(strtol(argv[1], nullptr, 0), nullptr);
}
}
#endif
void dobonus(char bonusonly) void dobonus(char bonusonly)
{ {
short t, /*r,*/ tinc,gfx_offset; short tinc,gfx_offset;
//int i, y, xfragtotal, yfragtotal; //int i, y, xfragtotal, yfragtotal;
short bonuscnt; short bonuscnt;
@ -980,108 +884,6 @@ void dobonus(char bonusonly)
if(bonusonly) goto FRAGBONUS; if(bonusonly) goto FRAGBONUS;
if(numplayers < 2 && ud.eog && ud.from_bonus == 0)
switch(ud.volume_number)
{
case 0:
case 1:
case 3:
Mus_Stop();
twod->ClearScreen();
videoNextPage();
if(ud.lockout == 0)
{
inputState.ClearAllInput();
playanm("vol4e1.anm",8);
twod->ClearScreen();
videoNextPage();
playanm("vol4e2.anm",10);
twod->ClearScreen();
videoNextPage();
playanm("vol4e3.anm",11);
twod->ClearScreen();
videoNextPage();
}
FX_StopAllSounds();
sound(ENDSEQVOL3SND4);
inputState.ClearAllInput();
//palto(0,0,0,63);
twod->ClearScreen();
menutext_center(60, GStrings("Thanks to all our"));
menutext_center(60 + 16, GStrings("fans for giving"));
menutext_center(60 + 16 + 16, GStrings("us big heads."));
menutext_center(70 + 16 + 16 + 16, GStrings("Look for a Duke Nukem 3D"));
menutext_center(70 + 16 + 16 + 16 + 16, GStrings("sequel soon."));
videoNextPage();
//for(t=63;t>0;t-=3) palto(0,0,0,t);
inputState.ClearAllInput();
while(!inputState.CheckAllInput()) //getpackets();
//for(t=0;t<64;t+=3) palto(0,0,0,t);
twod->ClearScreen();
videoNextPage();
playanm("DUKETEAM.ANM",4);
inputState.ClearAllInput();
while(!inputState.CheckAllInput()) //getpackets();
twod->ClearScreen();
videoNextPage();
//palto(0,0,0,63);
FX_StopAllSounds();
inputState.ClearAllInput();
break;
case 4:
if (!isWorldTour())
return;
if (adult_lockout == 0)
{
Mus_Stop();
totalclocklock = totalclock = 0;
twod->ClearScreen();
rotatesprite_fs(160<<16, 100<<16, 65536L, 0, FIREFLYGROWEFFECT, 0, 0, 2+8+64+BGSTRETCH);
videoNextPage();
fadepal(0, 0, 0, 252, 0, -4);
inputState.ClearAllInput();
S_PlaySound(E5L7_DUKE_QUIT_YOU);
do
{
totalclocklock = totalclock;
twod->ClearScreen();
rotatesprite_fs(160<<16, 100<<16, 65536L, 0, FIREFLYGROWEFFECT, 0, 0, 2+8+64+BGSTRETCH);
videoNextPage();
handleevents();
if (inputState.CheckAllInput()) break;
} while (1);
fadepal(0, 0, 0, 0, 252, 4);
}
Mus_Stop();
FX_StopAllSounds();
S_ClearSoundLocks();
break;
}
FRAGBONUS: FRAGBONUS:
; ;
#if 0 #if 0

22
source/games/duke/src/2d_r.cpp
View file

@ -787,26 +787,20 @@ void Logo_r(CompletionFunc completion)
static const int frametimes[] = { 9, 9, 9 }; // same for all 3 anims static const int frametimes[] = { 9, 9, 9 }; // same for all 3 anims
JobDesc jobs[3];
int job = 0;
if (!isRRRA()) if (!isRRRA())
{ {
PlayVideo(!inputState.CheckAllInput() ? "rr_intro.anm" : nullptr, introsound, frametimes, [=](bool skipped) jobs[job++] = { PlayVideo("rr_intro.anm", introsound, frametimes), nullptr };
{ jobs[job++] = { PlayVideo("redneck.anm", rednecksound, frametimes), nullptr };
FX_StopAllSounds(); jobs[job++] = { PlayVideo("xatlogo.anm", xatrixsound, frametimes), nullptr };
PlayVideo("redneck.anm", rednecksound, frametimes, [=](bool skipped)
{
FX_StopAllSounds();
PlayVideo("xatlogo.anm", xatrixsound, frametimes, [=](bool skipped)
{
FX_StopAllSounds();
completion(skipped);
});
});
});
} }
else else
{ {
PlayVideo("redint.mve", completion); jobs[job++] = { PlayVideo("redint.mve"), nullptr };
} }
RunScreenJob(jobs, job, completion);
} }

172
source/games/duke/src/zz_screens.cpp
View file

@ -1089,6 +1089,7 @@ void G_DoOrderScreen(void)
} }
} }
void bonussequence_d(int num, CompletionFunc completion);
static void G_BonusCutscenes(void) static void G_BonusCutscenes(void)
{ {
@ -1157,176 +1158,7 @@ static void G_BonusCutscenes(void)
return; return;
} }
switch (ud.volume_number) bonussequence_d(ud.volume_number, [](bool){});
{
case 0:
case 1:
videoSetViewableArea(0, 0, xdim-1, ydim-1);
Mus_Stop();
videoClearScreen(0L);
videoNextPage();
if (adult_lockout == 0)
{
fadepal(0, 0, 0, 252, 0, -4);
Anim_Play("cineov2.anm");
inputState.ClearAllInput();
videoClearScreen(0L);
videoNextPage();
S_PlaySound(PIPEBOMB_EXPLODE, CHAN_AUTO, CHANF_UI);
fadepal(0, 0, 0, 0, 252, 4);
}
inputState.ClearAllInput();
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); // JBF 20040308
rotatesprite_fs(160<<16, 100<<16, 65536L, 0, 3293, 0, 0, 2+8+64+BGSTRETCH);
fadepal(0, 0, 0, 252, 0, -4);
G_HandleEventsWhileNoInput();
fadepal(0, 0, 0, 0, 252, 4);
break;
case 3:
videoSetViewableArea(0, 0, xdim-1, ydim-1);
Mus_Stop();
videoClearScreen(0L);
videoNextPage();
if (adult_lockout == 0)
{
fadepal(0, 0, 0, 252, 0, -4);
inputState.ClearAllInput();
int t = Anim_Play("vol4e1.anm");
videoClearScreen(0L);
videoNextPage();
if (t)
goto end_vol4e;
t = Anim_Play("vol4e2.anm");
videoClearScreen(0L);
videoNextPage();
if (t)
goto end_vol4e;
Anim_Play("vol4e3.anm");
videoClearScreen(0L);
videoNextPage();
}
end_vol4e:
FX_StopAllSounds();
S_ClearSoundLocks();
S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI);
inputState.ClearAllInput();
G_FadePalette(0, 0, 0, 0);
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); // JBF 20040308
// G_FadePalette(0,0,0,252);
videoClearScreen(0L);
menutext_center(60, GStrings("Thanks to all our"));
menutext_center(60+16, GStrings("fans for giving"));
menutext_center(60+16+16, GStrings("us big heads."));
menutext_center(70+16+16+16, GStrings("Look for a Duke Nukem 3D"));
menutext_center(70+16+16+16+16, GStrings("sequel soon."));
videoNextPage();
fadepal(0, 0, 0, 252, 0, -12);
videoNextPage();
inputState.ClearAllInput();
G_HandleEventsWhileNoInput();
fadepal(0, 0, 0, 0, 252, 12);
videoClearScreen(0L);
videoNextPage();
Anim_Play("DUKETEAM.ANM");
inputState.ClearAllInput();
G_HandleEventsWhileNoInput();
videoClearScreen(0L);
videoNextPage();
G_FadePalette(0, 0, 0, 252);
FX_StopAllSounds();
S_ClearSoundLocks();
inputState.ClearAllInput();
break;
case 2:
Mus_Stop();
videoClearScreen(0L);
videoNextPage();
if (adult_lockout == 0)
{
fadepal(0, 0, 0, 252, 0, -4);
Anim_Play("cineov3.anm");
inputState.ClearAllInput();
ototalclock = totalclock+200;
while (totalclock < ototalclock)
G_HandleAsync();
videoClearScreen(0L);
videoNextPage();
FX_StopAllSounds();
S_ClearSoundLocks();
}
Anim_Play("RADLOGO.ANM");
if (!inputState.CheckAllInput() && adult_lockout == 0)
{
if (G_PlaySoundWhileNoInput(ENDSEQVOL3SND5)) goto ENDANM;
if (G_PlaySoundWhileNoInput(ENDSEQVOL3SND6)) goto ENDANM;
if (G_PlaySoundWhileNoInput(ENDSEQVOL3SND7)) goto ENDANM;
if (G_PlaySoundWhileNoInput(ENDSEQVOL3SND8)) goto ENDANM;
if (G_PlaySoundWhileNoInput(ENDSEQVOL3SND9)) goto ENDANM;
}
totalclock = 0;
if (PLUTOPAK)
{
while (!inputState.CheckAllInput() && totalclock < 120)
G_HandleAsync();
}
else
{
G_HandleEventsWhileNoInput();
}
ENDANM:
if (!PLUTOPAK)
{
FX_StopAllSounds();
S_ClearSoundLocks();
S_PlaySound(ENDSEQVOL3SND4, CHAN_AUTO, CHANF_UI);
videoClearScreen(0L);
videoNextPage();
Anim_Play("DUKETEAM.ANM");
inputState.ClearAllInput();
G_HandleEventsWhileNoInput();
videoClearScreen(0L);
videoNextPage();
G_FadePalette(0, 0, 0, 252);
}
inputState.ClearAllInput();
FX_StopAllSounds();
S_ClearSoundLocks();
videoClearScreen(0L);
break;
}
} }
static void G_DisplayMPResultsScreen(void) static void G_DisplayMPResultsScreen(void)