mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-29 04:50:42 +00:00
- transitioning helper for screen jobs.
This commit is contained in:
parent
53cf248269
commit
3f9cc1412c
3 changed files with 30 additions and 3 deletions
|
@ -3688,7 +3688,6 @@ void PolymostProcessVoxels(void)
|
||||||
g_haveVoxels = 2;
|
g_haveVoxels = 2;
|
||||||
|
|
||||||
Printf("Generating voxel models for Polymost. This may take a while...\n");
|
Printf("Generating voxel models for Polymost. This may take a while...\n");
|
||||||
//videoNextPage();
|
|
||||||
|
|
||||||
for (bssize_t i = 0; i < MAXVOXELS; i++)
|
for (bssize_t i = 0; i < MAXVOXELS; i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -56,11 +56,13 @@ int spawn_d(int j, int pn)
|
||||||
{
|
{
|
||||||
switch (sp->picnum)
|
switch (sp->picnum)
|
||||||
{
|
{
|
||||||
|
case BOSS2STAYPUT:
|
||||||
|
case BOSS3STAYPUT:
|
||||||
case BOSS5STAYPUT:
|
case BOSS5STAYPUT:
|
||||||
hittype[i].actorstayput = sp->sectnum;
|
hittype[i].actorstayput = sp->sectnum;
|
||||||
case FIREFLY:
|
case FIREFLY:
|
||||||
case BOSS5:
|
case BOSS5:
|
||||||
if (sp->picnum == BOSS5 || sp->picnum == BOSS5STAYPUT)
|
if (sp->picnum != FIREFLY)
|
||||||
{
|
{
|
||||||
if (j >= 0 && sprite[j].picnum == RESPAWN)
|
if (j >= 0 && sprite[j].picnum == RESPAWN)
|
||||||
sp->pal = sprite[j].pal;
|
sp->pal = sprite[j].pal;
|
||||||
|
|
|
@ -97,6 +97,9 @@ Things required to make savegames work:
|
||||||
#include "secrets.h"
|
#include "secrets.h"
|
||||||
|
|
||||||
#include "osdcmds.h"
|
#include "osdcmds.h"
|
||||||
|
#include "screenjob.h"
|
||||||
|
#include "inputstate.h"
|
||||||
|
#include "gamestate.h"
|
||||||
|
|
||||||
//#include "crc32.h"
|
//#include "crc32.h"
|
||||||
|
|
||||||
|
@ -277,6 +280,29 @@ void RunLevel(void);
|
||||||
|
|
||||||
static FILE *debug_fout = NULL;
|
static FILE *debug_fout = NULL;
|
||||||
|
|
||||||
|
|
||||||
|
// Transitioning helper.
|
||||||
|
int SyncScreenJob(JobDesc *jobs, int count)
|
||||||
|
{
|
||||||
|
bool abort = false;
|
||||||
|
RunScreenJob(jobs, count, [&](bool) { abort = true; });
|
||||||
|
while (!abort)
|
||||||
|
{
|
||||||
|
handleevents();
|
||||||
|
updatePauseStatus();
|
||||||
|
D_ProcessEvents();
|
||||||
|
ControlInfo info;
|
||||||
|
CONTROL_GetInput(&info);
|
||||||
|
C_RunDelayedCommands();
|
||||||
|
|
||||||
|
RunScreenJobFrame(); // This handles continuation through its completion callback.
|
||||||
|
videoNextPage();
|
||||||
|
}
|
||||||
|
gamestate = GS_LEVEL;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void DebugWriteString(char *string)
|
void DebugWriteString(char *string)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue