diff --git a/src/common/cutscenes/screenjob.cpp b/src/common/cutscenes/screenjob.cpp index e82828482..305710eb5 100644 --- a/src/common/cutscenes/screenjob.cpp +++ b/src/common/cutscenes/screenjob.cpp @@ -51,10 +51,10 @@ #include "s_music.h" #include "m_argv.h" -static DObject* runner; -static PClass* runnerclass; -static PType* runnerclasstype; -static CompletionFunc completion; +DObject* runner; +PClass* runnerclass; +PType* runnerclasstype; +CompletionFunc completion; static int ticks; 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, "."); 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 func = LookupFunction("ScreenJobRunner.Init", false); diff --git a/src/common/cutscenes/screenjob.h b/src/common/cutscenes/screenjob.h index d843d5056..be39bd25f 100644 --- a/src/common/cutscenes/screenjob.h +++ b/src/common/cutscenes/screenjob.h @@ -36,8 +36,20 @@ void DeleteScreenJob(); bool ScreenJobResponder(event_t* ev); bool ScreenJobTick(); void ScreenJobDraw(); +bool ScreenJobValidate(); struct CutsceneDef; 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 DObject* runner; +extern PClass* runnerclass; +extern PType* runnerclasstype; +extern CompletionFunc completion;