zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-03-10 11:11:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- a few things may not be static anymore.

Browse source
This commit is contained in:
Christoph Oelckers 2021-05-22 01:34:50 +02:00
parent 5aaabbeb01
commit df0412d634
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/cutscenes/screenjob.cpp
View file

@ -51,10 +51,10 @@
#include "s_music.h" #include "s_music.h"
#include "m_argv.h" #include "m_argv.h"
static DObject* runner; DObject* runner;
static PClass* runnerclass; PClass* runnerclass;
static PType* runnerclasstype; PType* runnerclasstype;
static CompletionFunc completion; CompletionFunc completion;
static int ticks; static int ticks;
int intermissiondelay; int intermissiondelay;
@ -83,7 +83,7 @@ void Job_Init()
// //
//============================================================================= //=============================================================================
static VMFunction* LookupFunction(const char* qname, bool validate = true) VMFunction* LookupFunction(const char* qname, bool validate)
{ {
size_t p = strcspn(qname, "."); size_t p = strcspn(qname, ".");
if (p == 0) I_Error("Call to undefined function %s", qname); if (p == 0) I_Error("Call to undefined function %s", qname);
@ -122,7 +122,7 @@ void CallCreateFunction(const char* qname, DObject* runner)
// //
//============================================================================= //=============================================================================
DObject* CreateRunner(bool clearbefore = true) DObject* CreateRunner(bool clearbefore)
{ {
auto obj = runnerclass->CreateNew(); auto obj = runnerclass->CreateNew();
auto func = LookupFunction("ScreenJobRunner.Init", false); auto func = LookupFunction("ScreenJobRunner.Init", false);

12
src/common/cutscenes/screenjob.h
View file

@ -36,8 +36,20 @@ void DeleteScreenJob();
bool ScreenJobResponder(event_t* ev); bool ScreenJobResponder(event_t* ev);
bool ScreenJobTick(); bool ScreenJobTick();
void ScreenJobDraw(); void ScreenJobDraw();
bool ScreenJobValidate();
struct CutsceneDef; struct CutsceneDef;
bool StartCutscene(const char* s, int flags, const CompletionFunc& completion); bool StartCutscene(const char* s, int flags, const CompletionFunc& completion);
bool StartCutscene(CutsceneDef& cs, int flags, const CompletionFunc& completion_);
VMFunction* LookupFunction(const char* qname, bool validate = true);
void CallCreateFunction(const char* qname, DObject* runner);
DObject* CreateRunner(bool clearbefore = true);
void AddGenericVideo(DObject* runner, const FString& fn, int soundid, int fps);
extern int intermissiondelay; extern int intermissiondelay;
extern DObject* runner;
extern PClass* runnerclass;
extern PType* runnerclasstype;
extern CompletionFunc completion;