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

- use flags instead of bools.

Browse source
This commit is contained in:
Christoph Oelckers 2021-04-22 00:18:53 +02:00
parent af3eac8456
commit fb5e2fe0c0
7 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/core/screenjob.cpp
View file

@ -317,14 +317,14 @@ public:
ScreenJobRunner *runner; ScreenJobRunner *runner;
void RunScreenJob(JobDesc* jobs, int count, CompletionFunc completion, bool clearbefore, bool blockingui, bool skipall) void RunScreenJob(JobDesc* jobs, int count, CompletionFunc completion, int flags)
{ {
assert(completion != nullptr); assert(completion != nullptr);
videoclearFade(); videoclearFade();
if (count) if (count)
{ {
runner = new ScreenJobRunner(jobs, count, completion, clearbefore, skipall); runner = new ScreenJobRunner(jobs, count, completion, !(flags & SJ_DONTCLEAR), !!(flags & SJ_SKIPALL));
gameaction = blockingui? ga_intro : ga_intermission; gameaction = (flags & SJ_BLOCKUI)? ga_intro : ga_intermission;
} }
else else
{ {

9
source/core/screenjob.h
View file

@ -138,8 +138,15 @@ struct JobDesc
//bool ignoreifskipped; //bool ignoreifskipped;
}; };
enum
{
SJ_DONTCLEAR = 1,
SJ_BLOCKUI = 2,
SJ_SKIPALL = 4
};
void RunScreenJob(JobDesc *jobs, int count, CompletionFunc completion, bool clearbefore = true, bool blockingui = false, bool skipall = false);
void RunScreenJob(JobDesc *jobs, int count, CompletionFunc completion, int flags = 0);
void EndScreenJob(); void EndScreenJob();
void DeleteScreenJob(); void DeleteScreenJob();
bool ScreenJobResponder(event_t* ev); bool ScreenJobResponder(event_t* ev);

2
source/games/blood/src/credits.cpp
View file

@ -89,7 +89,7 @@ void playlogos()
RunScreenJob(jobs, job, [](bool) { RunScreenJob(jobs, job, [](bool) {
Mus_Stop(); Mus_Stop();
gameaction = ga_mainmenu; gameaction = ga_mainmenu;
}, true, true); }, SJ_BLOCKUI);
} }
void playSmk(const char *smk, const char *wav, int wavid, CompletionFunc func) void playSmk(const char *smk, const char *wav, int wavid, CompletionFunc func)

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

@ -307,7 +307,7 @@ void Logo_d(const CompletionFunc &completion)
} }
else S_PlaySpecialMusic(MUS_INTRO); else S_PlaySpecialMusic(MUS_INTRO);
jobs[job++] = { Create<DTitleScreen>(), []() { S_PlaySound(NITEVISION_ONOFF, CHAN_AUTO, CHANF_UI); } }; jobs[job++] = { Create<DTitleScreen>(), []() { S_PlaySound(NITEVISION_ONOFF, CHAN_AUTO, CHANF_UI); } };
RunScreenJob(jobs, job, completion, true, true); RunScreenJob(jobs, job, completion, SJ_BLOCKUI);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -1131,7 +1131,7 @@ void e4intro(const CompletionFunc& completion)
jobs[job++] = { PlayVideo("vol41a.anm", vol41a, framespeed_10), nullptr }; jobs[job++] = { PlayVideo("vol41a.anm", vol41a, framespeed_10), nullptr };
jobs[job++] = { PlayVideo("vol42a.anm", vol42a, framespeed_14), nullptr }; jobs[job++] = { PlayVideo("vol42a.anm", vol42a, framespeed_14), nullptr };
jobs[job++] = { PlayVideo("vol43a.anm", vol43a, framespeed_10), nullptr }; jobs[job++] = { PlayVideo("vol43a.anm", vol43a, framespeed_10), nullptr };
RunScreenJob(jobs, job, completion, true, false, true); RunScreenJob(jobs, job, completion, SJ_SKIPALL);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

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

@ -204,7 +204,7 @@ void Logo_r(const CompletionFunc& completion)
{ {
jobs[job++] = { PlayVideo("redint.mve"), nullptr }; jobs[job++] = { PlayVideo("redint.mve"), nullptr };
} }
RunScreenJob(jobs, job, completion, true, true); RunScreenJob(jobs, job, completion, SJ_BLOCKUI);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

2
source/games/exhumed/src/2d.cpp
View file

@ -528,7 +528,7 @@ void DoTitle(CompletionFunc completion)
jobs[job++] = { PlayMovie("book.mov") }; jobs[job++] = { PlayMovie("book.mov") };
jobs[job++] = { Create<DMainTitle>() }; jobs[job++] = { Create<DMainTitle>() };
RunScreenJob(jobs, job, completion, true, true); RunScreenJob(jobs, job, completion, SJ_BLOCKUI);
} }

6
source/games/sw/src/2d.cpp
View file

@ -92,7 +92,7 @@ void Logo(const CompletionFunc& completion)
int job = 0; int job = 0;
jobs[job++] = { Create<DSWDRealmsScreen>() }; jobs[job++] = { Create<DSWDRealmsScreen>() };
jobs[job++] = { PlayVideo("sw.anm", logosound, logoframetimes, true)}; jobs[job++] = { PlayVideo("sw.anm", logosound, logoframetimes, true)};
RunScreenJob(jobs, job, completion, true, true); RunScreenJob(jobs, job, completion, SJ_BLOCKUI);
} }
else completion(false); else completion(false);
} }
@ -623,7 +623,7 @@ void StatScreen(int FinishAnim, CompletionFunc completion)
{ {
jobs[job++] = { Create<DSWMultiSummaryScreen>() }; jobs[job++] = { Create<DSWMultiSummaryScreen>() };
} }
RunScreenJob(jobs, job, completion, true); RunScreenJob(jobs, job, completion);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -638,7 +638,7 @@ void SybexScreen(CompletionFunc completion)
else else
{ {
JobDesc job = { Create<DImageScreen>(tileGetTexture(5261), DScreenJob::fadein | DScreenJob::fadeout, 0x7fffffff) }; JobDesc job = { Create<DImageScreen>(tileGetTexture(5261), DScreenJob::fadein | DScreenJob::fadeout, 0x7fffffff) };
RunScreenJob(&job, 1, completion, true, true); RunScreenJob(&job, 1, completion, SJ_BLOCKUI);
} }
} }