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

- moved the entire screen job management to the script side.

Browse source 
This isn't hooked up yet and lots of code is commented out, the games won't start with this commit.
This commit is contained in:
Christoph Oelckers 2021-04-25 20:02:40 +02:00
parent d853b63a1a
commit 4ff2010bd1
18 changed files with 665 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

40
source/core/screenjob.cpp
View file

@ -54,6 +54,7 @@
#include "vm.h"
#if 0
IMPLEMENT_CLASS(DScreenJob, true, false)
IMPLEMENT_CLASS(DSkippableScreenJob, true, false)
IMPLEMENT_CLASS(DBlackScreen, true, false)
@ -318,17 +319,6 @@ bool ScreenJobRunner::OnEvent(event_t* ev)
{
if (paused || index >= jobs.Size()) return false;
if (ev->type == EV_KeyDown)
{
// We never reach the key binding checks in G_Responder, so for the console we have to check for ourselves here.
auto binding = Bindings.GetBinding(ev->data1);
if (binding.CompareNoCase("toggleconsole") == 0)
{
C_ToggleConsole();
return true;
}
}
if (jobs[index]->state != DScreenJob::running) return false;
return jobs[index]->OnEvent(ev);
@ -432,6 +422,10 @@ bool ScreenJobRunner::RunFrame()
ScreenJobRunner *runner;
#endif
#if 0
void RunScreenJob(TArray<DScreenJob*>& jobs, CompletionFunc completion, int flags)
{
assert(completion != nullptr);
@ -446,38 +440,52 @@ void RunScreenJob(TArray<DScreenJob*>& jobs, CompletionFunc completion, int flag
completion(false);
}
}
#endif
void DeleteScreenJob()
{
/*
if (runner)
{
delete runner;
runner = nullptr;
}
twod->SetScreenFade(1);
twod->SetScreenFade(1);*/
}
void EndScreenJob()
{
if (runner) runner->OnFinished();
//if (runner) runner->OnFinished();
DeleteScreenJob();
}
bool ScreenJobResponder(event_t* ev)
{
if (runner) return runner->OnEvent(ev);
if (ev->type == EV_KeyDown)
{
// We never reach the key binding checks in G_Responder, so for the console we have to check for ourselves here.
auto binding = Bindings.GetBinding(ev->data1);
if (binding.CompareNoCase("toggleconsole") == 0)
{
C_ToggleConsole();
return true;
}
}
//if (runner) return runner->OnEvent(ev);
return false;
}
void ScreenJobTick()
{
if (runner) runner->OnTick();
//if (runner) runner->OnTick();
}
bool ScreenJobDraw()
{
// we cannot recover from this because we have no completion callback to call.
/*
if (!runner)
{
// We can get here before a gameaction has been processed. In that case just draw a black screen and wait.
@ -486,6 +494,7 @@ bool ScreenJobDraw()
return false;
}
auto res = runner->RunFrame();
*/ int res = 0;
if (!res)
{
assert((gamestate != GS_INTERMISSION && gamestate != GS_INTRO) || gameaction != ga_nothing);
@ -493,4 +502,3 @@ bool ScreenJobDraw()
}
return res;
}