mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-30 21:31:03 +00:00
- removed most of the demo code.
This commit is contained in:
Christoph Oelckers
parent
51ac1019d2
commit
a491b88074
6 changed files with 6 additions and 823 deletions
|
|
@ -44,22 +44,6 @@ extern int32_t g_demo_rewind;
|
|||
extern int32_t g_demo_showStats;
|
||||
extern int32_t g_demo_totalCnt;
|
||||
|
||||
int32_t G_PlaybackDemo(void);
|
||||
void Demo_PrepareWarp(void);
|
||||
void G_CloseDemoWrite(void);
|
||||
void G_DemoRecord(void);
|
||||
void G_OpenDemoWrite(void);
|
||||
|
||||
void Demo_PlayFirst(int32_t prof, int32_t exitafter);
|
||||
void Demo_SetFirst(const char *demostr);
|
||||
|
||||
int32_t Demo_IsProfiling(void);
|
||||
|
||||
#if KRANDDEBUG
|
||||
int32_t krd_print(const char *filename);
|
||||
void krd_enable(int32_t which);
|
||||
#endif
|
||||
|
||||
END_DUKE_NS
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -642,8 +642,6 @@ void GameInterface::DrawPlayerSprite(const DVector2& origin, bool onteam)
|
|||
void GameInterface::QuitToTitle()
|
||||
{
|
||||
g_player[myconnectindex].ps->gm = MODE_DEMO;
|
||||
if (ud.recstat == 1)
|
||||
G_CloseDemoWrite();
|
||||
artClearMapArt();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,403 +42,20 @@ int32_t g_demo_totalCnt;
|
|||
int32_t g_demo_paused=0;
|
||||
int32_t g_demo_rewind=0;
|
||||
int32_t g_demo_showStats=1;
|
||||
static int32_t g_demo_soundToggle;
|
||||
|
||||
static int32_t demo_hasdiffs, demorec_diffs=1, demorec_difftics = 2*REALGAMETICSPERSEC;
|
||||
int32_t demoplay_diffs=1;
|
||||
int32_t demorec_seeds_cvar=1;
|
||||
int32_t demoplay_showsync=1;
|
||||
|
||||
static int32_t demorec_seeds=1, demo_hasseeds;
|
||||
|
||||
static void Demo_RestoreModes(int32_t menu)
|
||||
{
|
||||
if (menu)
|
||||
M_StartControlPanel(false);
|
||||
else
|
||||
M_ClearMenus();
|
||||
|
||||
g_player[myconnectindex].ps->gm &= ~MODE_GAME;
|
||||
g_player[myconnectindex].ps->gm |= MODE_DEMO;
|
||||
}
|
||||
|
||||
void Demo_PrepareWarp(void)
|
||||
{
|
||||
if (!g_demo_paused)
|
||||
{
|
||||
g_demo_soundToggle = nosound;
|
||||
nosound = true;
|
||||
}
|
||||
|
||||
FX_StopAllSounds();
|
||||
S_ClearSoundLocks();
|
||||
}
|
||||
|
||||
|
||||
static int32_t G_OpenDemoRead(int32_t g_whichDemo) // 0 = mine
|
||||
{
|
||||
int32_t i;
|
||||
savehead_t saveh;
|
||||
|
||||
char demofn[14];
|
||||
const char *demofnptr;
|
||||
|
||||
if (g_whichDemo == 1 && g_firstDemoFile[0])
|
||||
{
|
||||
demofnptr = g_firstDemoFile;
|
||||
}
|
||||
else
|
||||
{
|
||||
Bsprintf(demofn, DEMOFN_FMT, g_whichDemo);
|
||||
demofnptr = demofn;
|
||||
}
|
||||
|
||||
if (!g_demo_recFilePtr.OpenFile(demofnptr))
|
||||
return 0;
|
||||
|
||||
Bassert(g_whichDemo >= 1);
|
||||
i = sv_loadsnapshot(g_demo_recFilePtr, -g_whichDemo, &saveh);
|
||||
if (i)
|
||||
{
|
||||
Printf(TEXTCOLOR_RED "There were errors opening demo %d (code: %d).\n", g_whichDemo, i);
|
||||
g_demo_recFilePtr.Close();
|
||||
return 0;
|
||||
}
|
||||
|
||||
demo_hasdiffs = saveh.recdiffsp;
|
||||
g_demo_totalCnt = saveh.reccnt;
|
||||
demo_hasseeds = 0;
|
||||
|
||||
i = g_demo_totalCnt/REALGAMETICSPERSEC;
|
||||
Printf("demo %d duration: %d min %d sec\n", g_whichDemo, i/60, i%60);
|
||||
|
||||
g_demo_cnt = 1;
|
||||
ud.reccnt = 0;
|
||||
|
||||
gFullMap = false;
|
||||
ud.god = ud.cashman = ud.eog = 0;
|
||||
ud.clipping = ud.scrollmode = ud.overhead_on = 0; //= ud.pause_on = 0;
|
||||
|
||||
totalclock = ototalclock = lockclock = 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
#if KRANDDEBUG
|
||||
extern void krd_enable(int32_t which);
|
||||
extern int32_t krd_print(const char *filename);
|
||||
#endif
|
||||
|
||||
void G_OpenDemoWrite(void)
|
||||
{
|
||||
char demofn[BMAX_PATH];
|
||||
int32_t i, demonum=1;
|
||||
|
||||
if (ud.recstat == 2)
|
||||
{
|
||||
g_demo_recFilePtr.Close();
|
||||
}
|
||||
|
||||
if ((g_player[myconnectindex].ps->gm&MODE_GAME) && g_player[myconnectindex].ps->dead_flag)
|
||||
{
|
||||
quoteMgr.InitializeQuote(QUOTE_RESERVED4, "CANNOT START DEMO RECORDING WHEN DEAD!");
|
||||
P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps);
|
||||
ud.recstat = m_recstat = 0;
|
||||
return;
|
||||
}
|
||||
do
|
||||
{
|
||||
if (demonum == MAXDEMOS)
|
||||
return;
|
||||
|
||||
if (snprintf(demofn, sizeof(demofn), "%s" DEMOFN_FMT, G_GetDemoPath().GetChars(), demonum))
|
||||
{
|
||||
Printf("Couldn't start demo writing: INTERNAL ERROR: file name too long\n");
|
||||
goto error_wopen_demo;
|
||||
}
|
||||
|
||||
demonum++;
|
||||
|
||||
g_demo_filePtr = FileWriter::Open(demofn);
|
||||
if (g_demo_filePtr == NULL)
|
||||
break;
|
||||
|
||||
delete g_demo_filePtr;
|
||||
}
|
||||
while (1);
|
||||
|
||||
g_demo_filePtr = FileWriter::Open(demofn);
|
||||
if (g_demo_filePtr == NULL)
|
||||
return;
|
||||
|
||||
i=sv_saveandmakesnapshot(*g_demo_filePtr, -1, (demorec_seeds_cvar<<1));
|
||||
if (i)
|
||||
{
|
||||
delete g_demo_filePtr;
|
||||
g_demo_filePtr = nullptr;
|
||||
error_wopen_demo:
|
||||
quoteMgr.InitializeQuote(QUOTE_RESERVED4, "FAILED STARTING DEMO RECORDING. SEE CONSOLE FOR DETAILS.");
|
||||
P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps);
|
||||
ud.recstat = m_recstat = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
demorec_seeds = demorec_seeds_cvar;
|
||||
demorec_diffs = demorec_diffs_cvar;
|
||||
demorec_difftics = demorec_difftics_cvar;
|
||||
|
||||
quoteMgr.FormatQuote(QUOTE_RESERVED4, "DEMO %d RECORDING STARTED", demonum-1);
|
||||
P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps);
|
||||
|
||||
ud.reccnt = 0;
|
||||
ud.recstat = m_recstat = 1; //
|
||||
|
||||
# if KRANDDEBUG
|
||||
krd_enable(1);
|
||||
# endif
|
||||
g_demo_cnt = 1;
|
||||
}
|
||||
|
||||
// demo_profile: < 0: prepare
|
||||
static int32_t g_demo_playFirstFlag, g_demo_profile, g_demo_stopProfile;
|
||||
static int32_t g_demo_exitAfter;
|
||||
void Demo_PlayFirst(int32_t prof, int32_t exitafter)
|
||||
{
|
||||
g_demo_playFirstFlag = 1;
|
||||
g_demo_exitAfter = exitafter;
|
||||
Bassert(prof >= 0);
|
||||
g_demo_profile = -prof; // prepare
|
||||
}
|
||||
|
||||
void Demo_SetFirst(const char *demostr)
|
||||
{
|
||||
char *tailptr;
|
||||
int32_t i = Bstrtol(demostr, &tailptr, 10);
|
||||
|
||||
if (tailptr==demostr+Bstrlen(demostr) && (unsigned)i < MAXDEMOS) // demo number passed
|
||||
Bsprintf(g_firstDemoFile, DEMOFN_FMT, i);
|
||||
else // demo file name passed
|
||||
maybe_append_ext(g_firstDemoFile, sizeof(g_firstDemoFile), demostr, ".edm");
|
||||
}
|
||||
|
||||
|
||||
static uint8_t g_demo_seedbuf[RECSYNCBUFSIZ];
|
||||
|
||||
static void Demo_WriteSync()
|
||||
{
|
||||
int16_t tmpreccnt;
|
||||
|
||||
g_demo_filePtr->Write("sYnC", 4);
|
||||
tmpreccnt = (int16_t)ud.reccnt;
|
||||
g_demo_filePtr->Write(&tmpreccnt, sizeof(int16_t));
|
||||
if (demorec_seeds)
|
||||
g_demo_filePtr->Write(g_demo_seedbuf, ud.reccnt);
|
||||
|
||||
g_demo_filePtr->Write(recsync, sizeof(input_t)* ud.reccnt);
|
||||
|
||||
ud.reccnt = 0;
|
||||
}
|
||||
|
||||
void G_DemoRecord(void)
|
||||
{
|
||||
int16_t i;
|
||||
|
||||
g_demo_cnt++;
|
||||
|
||||
if (demorec_diffs && (g_demo_cnt%demorec_difftics == 1))
|
||||
{
|
||||
sv_writediff(g_demo_filePtr);
|
||||
demorec_difftics = demorec_difftics_cvar;
|
||||
}
|
||||
|
||||
if (demorec_seeds)
|
||||
g_demo_seedbuf[ud.reccnt] = (uint8_t)(randomseed>>24);
|
||||
|
||||
for (TRAVERSE_CONNECT(i))
|
||||
{
|
||||
Bmemcpy(&recsync[ud.reccnt], g_player[i].input, sizeof(input_t));
|
||||
ud.reccnt++;
|
||||
}
|
||||
|
||||
if (ud.reccnt > RECSYNCBUFSIZ-MAXPLAYERS || (demorec_diffs && (g_demo_cnt%demorec_difftics == 0)))
|
||||
Demo_WriteSync();
|
||||
}
|
||||
|
||||
void G_CloseDemoWrite(void)
|
||||
{
|
||||
if (ud.recstat == 1)
|
||||
{
|
||||
if (ud.reccnt > 0)
|
||||
Demo_WriteSync();
|
||||
|
||||
g_demo_filePtr->Write("EnD!", 4);
|
||||
|
||||
// lastly, we need to write the number of written recsyncs to the demo file
|
||||
g_demo_filePtr->Write(&g_demo_cnt, sizeof(g_demo_cnt));
|
||||
|
||||
ud.recstat = m_recstat = 0;
|
||||
delete g_demo_filePtr;
|
||||
g_demo_filePtr = nullptr;
|
||||
|
||||
sv_freemem();
|
||||
|
||||
quoteMgr.InitializeQuote(QUOTE_RESERVED4, "DEMO RECORDING STOPPED");
|
||||
P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps);
|
||||
}
|
||||
#if KRANDDEBUG
|
||||
krd_print("krandrec.log");
|
||||
#endif
|
||||
}
|
||||
|
||||
static int32_t g_whichDemo = 1;
|
||||
|
||||
static int32_t Demo_UpdateState(int32_t frominit)
|
||||
{
|
||||
int32_t j = g_player[myconnectindex].ps->gm&MODE_MENU;
|
||||
int32_t k = sv_updatestate(frominit);
|
||||
// tmpdifftime = g_demo_cnt+12;
|
||||
Demo_RestoreModes(j);
|
||||
|
||||
if (k)
|
||||
Printf("sv_updatestate() returned %d.\n", k);
|
||||
return k;
|
||||
}
|
||||
|
||||
#define CORRUPT(code) do { corruptcode=code; goto corrupt; } while(0)
|
||||
|
||||
static int32_t Demo_ReadSync(int32_t errcode)
|
||||
{
|
||||
uint16_t si;
|
||||
int32_t i;
|
||||
|
||||
if (g_demo_recFilePtr.Read(&si, sizeof(uint16_t)) != sizeof(uint16_t))
|
||||
return errcode;
|
||||
|
||||
i = si;
|
||||
if (demo_hasseeds)
|
||||
{
|
||||
if (g_demo_recFilePtr.Read(g_demo_seedbuf, i) != i)
|
||||
return errcode;
|
||||
}
|
||||
|
||||
|
||||
int32_t bytes = sizeof(input_t)*i;
|
||||
|
||||
if (g_demo_recFilePtr.Read(recsync, bytes) != bytes)
|
||||
return errcode+2;
|
||||
|
||||
ud.reccnt = i;
|
||||
return 0;
|
||||
}
|
||||
|
||||
////////// DEMO PROFILING (TIMEDEMO MODE) //////////
|
||||
static struct {
|
||||
int32_t numtics, numframes;
|
||||
double totalgamems;
|
||||
double totalroomsdrawms, totalrestdrawms;
|
||||
double starthiticks;
|
||||
} g_prof;
|
||||
|
||||
int32_t Demo_IsProfiling(void)
|
||||
{
|
||||
return (g_demo_profile > 0);
|
||||
}
|
||||
|
||||
static void Demo_StopProfiling(void)
|
||||
{
|
||||
g_demo_stopProfile = 1;
|
||||
}
|
||||
|
||||
static void Demo_GToc(double t)
|
||||
{
|
||||
g_prof.numtics++;
|
||||
g_prof.totalgamems += timerGetHiTicks()-t;
|
||||
}
|
||||
|
||||
static void Demo_RToc(double t1, double t2)
|
||||
{
|
||||
g_prof.numframes++;
|
||||
g_prof.totalroomsdrawms += t2-t1;
|
||||
g_prof.totalrestdrawms += timerGetHiTicks()-t2;
|
||||
}
|
||||
|
||||
static void Demo_DisplayProfStatus(void)
|
||||
{
|
||||
char buf[64];
|
||||
|
||||
static int32_t lastpercent=-1;
|
||||
int32_t percent = (100*g_demo_cnt)/g_demo_totalCnt;
|
||||
|
||||
if (lastpercent == percent)
|
||||
return;
|
||||
lastpercent = percent;
|
||||
|
||||
videoClearScreen(0);
|
||||
snprintf(buf, sizeof(buf), "timing... %d/%d game tics (%d %%)",
|
||||
g_demo_cnt, g_demo_totalCnt, percent);
|
||||
gametext_center(60, buf);
|
||||
videoNextPage();
|
||||
}
|
||||
|
||||
static void Demo_SetupProfile(void)
|
||||
{
|
||||
g_demo_profile *= -1; // now >0: profile for real
|
||||
|
||||
g_demo_soundToggle = nosound;
|
||||
nosound = true; // restored by Demo_FinishProfile()
|
||||
|
||||
Bmemset(&g_prof, 0, sizeof(g_prof));
|
||||
|
||||
g_prof.starthiticks = timerGetHiTicks();
|
||||
}
|
||||
|
||||
static void Demo_FinishProfile(void)
|
||||
{
|
||||
if (Demo_IsProfiling())
|
||||
{
|
||||
int32_t dn=g_whichDemo-1;
|
||||
int32_t nt=g_prof.numtics, nf=g_prof.numframes;
|
||||
double gms=g_prof.totalgamems;
|
||||
double dms1=g_prof.totalroomsdrawms, dms2=g_prof.totalrestdrawms;
|
||||
|
||||
nosound = g_demo_soundToggle;
|
||||
|
||||
if (nt > 0)
|
||||
{
|
||||
Printf("== demo %d: %d gametics\n", dn, nt);
|
||||
Printf("== demo %d game times: %.03f ms (%.03f us/gametic)\n",
|
||||
dn, gms, (gms*1000.0)/nt);
|
||||
}
|
||||
|
||||
if (nf > 0)
|
||||
{
|
||||
Printf("== demo %d: %d frames (%d frames/gametic)\n", dn, nf, g_demo_profile-1);
|
||||
Printf("== demo %d drawrooms times: %.03f s (%.03f ms/frame)\n",
|
||||
dn, dms1/1000.0, dms1/nf);
|
||||
Printf("== demo %d drawrest times: %.03f s (%.03f ms/frame)\n",
|
||||
dn, dms2/1000.0, dms2/nf);
|
||||
}
|
||||
|
||||
{
|
||||
double totalprofms = gms+dms1+dms2;
|
||||
double totalms = timerGetHiTicks()-g_prof.starthiticks;
|
||||
if (totalprofms != 0)
|
||||
Printf("== demo %d: non-profiled time overhead: %.02f %%\n",
|
||||
dn, 100.0*totalms/totalprofms - 100.0);
|
||||
}
|
||||
}
|
||||
|
||||
g_demo_profile = 0;
|
||||
g_demo_stopProfile = 0;
|
||||
}
|
||||
////////////////////
|
||||
|
||||
int32_t G_PlaybackDemo(void)
|
||||
{
|
||||
int32_t bigi, j, initsyncofs = 0, lastsyncofs = 0, lastsynctic = 0, lastsyncclock = 0;
|
||||
int32_t foundemo = 0, corruptcode, outofsync=0;
|
||||
int32_t bigi, initsyncofs = 0, lastsyncofs = 0, lastsynctic = 0, lastsyncclock = 0;
|
||||
int32_t foundemo = 0, outofsync=0;
|
||||
static int32_t in_menu = 0;
|
||||
// static int32_t tmpdifftime=0;
|
||||
|
||||
totalclock = 0;
|
||||
ototalclock = 0;
|
||||
|
|
@ -447,20 +64,7 @@ int32_t G_PlaybackDemo(void)
|
|||
if (ready2send)
|
||||
return 0;
|
||||
|
||||
if (!g_demo_playFirstFlag)
|
||||
g_demo_profile = 0;
|
||||
|
||||
RECHECK:
|
||||
if (g_demo_playFirstFlag)
|
||||
g_demo_playFirstFlag = 0;
|
||||
else if (g_demo_exitAfter)
|
||||
G_GameExit(" ");
|
||||
|
||||
#if KRANDDEBUG
|
||||
if (foundemo)
|
||||
krd_print("krandplay.log");
|
||||
#endif
|
||||
|
||||
in_menu = g_player[myconnectindex].ps->gm&MODE_MENU;
|
||||
|
||||
pub = NUMPAGES;
|
||||
|
|
@ -468,21 +72,10 @@ RECHECK:
|
|||
|
||||
renderFlushPerms();
|
||||
|
||||
#ifdef PLAYDEMOLOOP // Todo: Make a CVar.
|
||||
if (!g_netServer && ud.multimode < 2)
|
||||
foundemo = G_OpenDemoRead(g_whichDemo);
|
||||
#endif
|
||||
|
||||
if (foundemo == 0)
|
||||
{
|
||||
ud.recstat = 0;
|
||||
|
||||
if (g_whichDemo > 1)
|
||||
{
|
||||
g_whichDemo = 1;
|
||||
goto RECHECK;
|
||||
}
|
||||
|
||||
fadepal(0,0,0, 0,252,28);
|
||||
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); // JBF 20040308
|
||||
G_DrawBackground();
|
||||
|
|
@ -491,35 +84,10 @@ RECHECK:
|
|||
fadepal(0,0,0, 252,0,-28);
|
||||
ud.reccnt = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
ud.recstat = 2;
|
||||
|
||||
g_whichDemo++;
|
||||
if (g_whichDemo == MAXDEMOS)
|
||||
g_whichDemo = 1;
|
||||
|
||||
g_player[myconnectindex].ps->gm &= ~MODE_GAME;
|
||||
g_player[myconnectindex].ps->gm |= MODE_DEMO;
|
||||
|
||||
lastsyncofs = g_demo_recFilePtr.Tell();
|
||||
initsyncofs = lastsyncofs;
|
||||
lastsynctic = g_demo_cnt;
|
||||
lastsyncclock = (int32_t) totalclock;
|
||||
outofsync = 0;
|
||||
#if KRANDDEBUG
|
||||
krd_enable(2);
|
||||
#endif
|
||||
if (g_demo_profile < 0)
|
||||
{
|
||||
Demo_SetupProfile();
|
||||
}
|
||||
}
|
||||
|
||||
if (foundemo == 0 || in_menu || inputState.CheckAllInput() || numplayers > 1)
|
||||
{
|
||||
FX_StopAllSounds();
|
||||
S_ClearSoundLocks();
|
||||
M_StartControlPanel(false);
|
||||
}
|
||||
|
||||
|
|
@ -528,339 +96,25 @@ RECHECK:
|
|||
|
||||
inputState.ClearAllInput();
|
||||
|
||||
// Printf("ticcnt=%d, total=%d\n", g_demo_cnt, g_demo_totalCnt);
|
||||
while (g_demo_cnt < g_demo_totalCnt || foundemo==0)
|
||||
{
|
||||
// Main loop here. It also runs when there's no demo to show,
|
||||
// so maybe a better name for this function would be
|
||||
// G_MainLoopWhenNotInGame()?
|
||||
|
||||
// Demo requested from the OSD, its name is in g_firstDemoFile[]
|
||||
if (g_demo_playFirstFlag)
|
||||
{
|
||||
g_demo_playFirstFlag = 0;
|
||||
g_whichDemo = 1; // force g_firstDemoFile[]
|
||||
g_demo_paused = 0;
|
||||
goto nextdemo_nomenu;
|
||||
}
|
||||
|
||||
if (foundemo && (!g_demo_paused || g_demo_goalCnt))
|
||||
{
|
||||
if (g_demo_goalCnt>0 && g_demo_goalCnt < g_demo_cnt)
|
||||
{
|
||||
// initialize rewind
|
||||
|
||||
int32_t menu = g_player[myconnectindex].ps->gm&MODE_MENU;
|
||||
|
||||
if (g_demo_goalCnt > lastsynctic)
|
||||
{
|
||||
// we can use a previous diff
|
||||
if (Demo_UpdateState(0)==0)
|
||||
{
|
||||
g_demo_cnt = lastsynctic;
|
||||
g_demo_recFilePtr.Seek(lastsyncofs, FileReader::SeekSet);
|
||||
ud.reccnt = 0;
|
||||
|
||||
totalclock = ototalclock = lockclock = lastsyncclock;
|
||||
}
|
||||
else CORRUPT(-1);
|
||||
}
|
||||
else
|
||||
{
|
||||
// update to initial state
|
||||
if (Demo_UpdateState(1) == 0)
|
||||
{
|
||||
g_demo_recFilePtr.Seek(initsyncofs, FileReader::SeekSet);
|
||||
g_levelTextTime = 0;
|
||||
|
||||
g_demo_cnt = 1;
|
||||
ud.reccnt = 0;
|
||||
|
||||
totalclock = ototalclock = lockclock = 0;
|
||||
}
|
||||
else CORRUPT(0);
|
||||
}
|
||||
|
||||
Demo_RestoreModes(menu);
|
||||
}
|
||||
|
||||
if (g_demo_stopProfile)
|
||||
Demo_FinishProfile();
|
||||
|
||||
while (totalclock >= (lockclock+TICSPERFRAME)
|
||||
// || (ud.reccnt > REALGAMETICSPERSEC*2 && ud.pause_on)
|
||||
|| (g_demo_goalCnt>0 && g_demo_cnt<g_demo_goalCnt))
|
||||
{
|
||||
if (ud.reccnt<=0)
|
||||
{
|
||||
// Record count reached zero (or <0, corrupted), need
|
||||
// reading another chunk.
|
||||
|
||||
char tmpbuf[4];
|
||||
|
||||
if (ud.reccnt<0)
|
||||
{
|
||||
Printf("G_PlaybackDemo: ud.reccnt<0!\n");
|
||||
CORRUPT(1);
|
||||
}
|
||||
|
||||
bigi = 0;
|
||||
//reread:
|
||||
if (g_demo_recFilePtr.Read(tmpbuf, 4) != 4)
|
||||
CORRUPT(2);
|
||||
|
||||
if (Bmemcmp(tmpbuf, "sYnC", 4)==0)
|
||||
{
|
||||
int32_t err = Demo_ReadSync(3);
|
||||
if (err)
|
||||
CORRUPT(err);
|
||||
}
|
||||
|
||||
else if (demo_hasdiffs && Bmemcmp(tmpbuf, "dIfF", 4)==0)
|
||||
{
|
||||
int32_t k = sv_readdiff(g_demo_recFilePtr);
|
||||
|
||||
if (k)
|
||||
{
|
||||
Printf("sv_readdiff() returned %d.\n", k);
|
||||
CORRUPT(6);
|
||||
}
|
||||
else
|
||||
{
|
||||
lastsyncofs = g_demo_recFilePtr.Tell();
|
||||
lastsynctic = g_demo_cnt;
|
||||
lastsyncclock = (int32_t) totalclock;
|
||||
|
||||
if (g_demo_recFilePtr.Read(tmpbuf, 4) != 4)
|
||||
CORRUPT(7);
|
||||
if (Bmemcmp(tmpbuf, "sYnC", 4))
|
||||
CORRUPT(8);
|
||||
|
||||
{
|
||||
int32_t err = Demo_ReadSync(9);
|
||||
if (err)
|
||||
CORRUPT(err);
|
||||
}
|
||||
|
||||
if ((g_demo_goalCnt==0 && demoplay_diffs) ||
|
||||
(g_demo_goalCnt>0 && ud.reccnt/ud.multimode >= g_demo_goalCnt-g_demo_cnt))
|
||||
{
|
||||
Demo_UpdateState(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (Bmemcmp(tmpbuf, "EnD!", 4)==0)
|
||||
goto nextdemo;
|
||||
else CORRUPT(12);
|
||||
|
||||
if (0)
|
||||
{
|
||||
corrupt:
|
||||
Printf(TEXTCOLOR_RED "Demo %d is corrupt (code %d).\n", g_whichDemo-1, corruptcode);
|
||||
nextdemo:
|
||||
M_StartControlPanel(false);
|
||||
nextdemo_nomenu:
|
||||
foundemo = 0;
|
||||
ud.reccnt = 0;
|
||||
g_demo_recFilePtr.Close();
|
||||
|
||||
if (g_demo_goalCnt>0)
|
||||
{
|
||||
g_demo_goalCnt=0;
|
||||
nosound = g_demo_soundToggle;
|
||||
}
|
||||
|
||||
if (Demo_IsProfiling()) // don't reset g_demo_profile if it's < 0
|
||||
Demo_FinishProfile();
|
||||
goto RECHECK;
|
||||
}
|
||||
}
|
||||
|
||||
if (demo_hasseeds)
|
||||
outofsync = ((uint8_t)(randomseed>>24) != g_demo_seedbuf[bigi]);
|
||||
|
||||
for (TRAVERSE_CONNECT(j))
|
||||
{
|
||||
Bmemcpy(&inputfifo[movefifoplc&(MOVEFIFOSIZ-1)][j], &recsync[bigi], sizeof(input_t));
|
||||
bigi++;
|
||||
ud.reccnt--;
|
||||
}
|
||||
|
||||
g_demo_cnt++;
|
||||
|
||||
S_Update();
|
||||
|
||||
if (Demo_IsProfiling())
|
||||
{
|
||||
double t = timerGetHiTicks();
|
||||
G_DoMoveThings();
|
||||
Demo_GToc(t);
|
||||
}
|
||||
else if (!g_demo_paused)
|
||||
{
|
||||
// assumption that ud.multimode doesn't change in a demo may not be true
|
||||
// sometime in the future v v v v v v v v v
|
||||
if (g_demo_goalCnt==0 || !demo_hasdiffs || ud.reccnt/ud.multimode>=g_demo_goalCnt-g_demo_cnt)
|
||||
{
|
||||
G_DoMoveThings(); // increases lockclock by TICSPERFRAME
|
||||
}
|
||||
else
|
||||
{
|
||||
lockclock += TICSPERFRAME;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
int32_t k = nosound;
|
||||
nosound = true;
|
||||
G_DoMoveThings();
|
||||
nosound = k;
|
||||
}
|
||||
|
||||
ototalclock += TICSPERFRAME;
|
||||
|
||||
if (g_demo_goalCnt > 0)
|
||||
{
|
||||
// if fast-forwarding, we must update totalclock
|
||||
totalclock += TICSPERFRAME;
|
||||
|
||||
// Printf("t:%d, l+T:%d; cnt:%d, goal:%d%s", totalclock, (lockclock+TICSPERFRAME),
|
||||
// g_demo_cnt, g_demo_goalCnt, g_demo_cnt>=g_demo_goalCnt?" ":"\n");
|
||||
if (g_demo_cnt>=g_demo_goalCnt)
|
||||
{
|
||||
g_demo_goalCnt = 0;
|
||||
nosound = g_demo_soundToggle;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (foundemo && g_demo_paused)
|
||||
{
|
||||
totalclock = lockclock;
|
||||
}
|
||||
|
||||
if (Demo_IsProfiling())
|
||||
totalclock += TICSPERFRAME;
|
||||
|
||||
if (G_FPSLimit())
|
||||
{
|
||||
if (foundemo == 0)
|
||||
{
|
||||
G_DrawBackground();
|
||||
}
|
||||
else
|
||||
{
|
||||
// NOTE: currently, no key/mouse events will be seen while
|
||||
// demo-profiling because we need 'totalclock' for ourselves.
|
||||
// And handleevents() -> sampletimer() would mess that up.
|
||||
G_HandleLocalKeys();
|
||||
|
||||
// Render one frame (potentially many if profiling)
|
||||
if (Demo_IsProfiling())
|
||||
{
|
||||
int32_t i, num = g_demo_profile-1;
|
||||
|
||||
Bassert(totalclock-ototalclock==4);
|
||||
|
||||
for (i=0; i<num; i++)
|
||||
{
|
||||
double t1 = timerGetHiTicks(), t2;
|
||||
|
||||
// Printf("t=%d, o=%d, t-o = %d\n", totalclock,
|
||||
// ototalclock, totalclock-ototalclock);
|
||||
|
||||
// NOTE: G_DrawRooms() calculates smoothratio inside and
|
||||
// ignores the function argument, so we set totalclock
|
||||
// accordingly.
|
||||
j = (i<<16)/num;
|
||||
totalclock = ototalclock + (j>>16);
|
||||
|
||||
G_DrawRooms(screenpeek, j);
|
||||
|
||||
t2 = timerGetHiTicks();
|
||||
|
||||
G_DisplayRest(j);
|
||||
|
||||
Demo_RToc(t1, t2);
|
||||
}
|
||||
|
||||
totalclock = ototalclock+4;
|
||||
|
||||
// draw status
|
||||
Demo_DisplayProfStatus();
|
||||
|
||||
if (inputState.CheckAllInput())
|
||||
Demo_StopProfiling();
|
||||
}
|
||||
else
|
||||
{
|
||||
j = calc_smoothratio(totalclock, ototalclock);
|
||||
if (g_demo_paused && g_demo_rewind)
|
||||
j = 65536-j;
|
||||
|
||||
G_DrawRooms(screenpeek, j);
|
||||
G_DisplayRest(j);
|
||||
|
||||
}
|
||||
// totalclocklock = totalclock;
|
||||
|
||||
if (!Demo_IsProfiling() && (g_player[myconnectindex].ps->gm&MODE_MENU) == 0)
|
||||
{
|
||||
if (demoplay_showsync && outofsync)
|
||||
gametext_center(100, "OUT OF SYNC");
|
||||
|
||||
if (g_demo_showStats)
|
||||
{
|
||||
#if 0
|
||||
if (g_demo_cnt<tmpdifftime)
|
||||
gametext_center(100, "DIFF");
|
||||
|
||||
{
|
||||
char buf[32];
|
||||
Bsprintf(buf, "RC:%4d TC:%5d", ud.reccnt, g_demo_cnt);
|
||||
gametext_center_number(100, buf);
|
||||
}
|
||||
#endif
|
||||
j=g_demo_cnt/REALGAMETICSPERSEC;
|
||||
Bsprintf(buf, "%02d:%02d", j/60, j%60);
|
||||
gametext_widenumber(18, 16, buf);
|
||||
|
||||
rotatesprite(60<<16, 16<<16, 32768, 0, TILE_SLIDEBAR, 0, 0, 2+8+16+1024, 0, 0, (xdim*95)/320, ydim-1);
|
||||
rotatesprite(90<<16, 16<<16, 32768, 0, TILE_SLIDEBAR, 0, 0, 2+8+16+1024, (xdim*95)/320, 0, (xdim*125)/320, ydim-1);
|
||||
rotatesprite(120<<16, 16<<16, 32768, 0, TILE_SLIDEBAR, 0, 0, 2+8+16+1024, (xdim*125)/320, 0, (xdim*155)/320, ydim-1);
|
||||
rotatesprite(150<<16, 16<<16, 32768, 0, TILE_SLIDEBAR, 0, 0, 2+8+16+1024, (xdim*155)/320, 0, xdim-1, ydim-1);
|
||||
|
||||
j = (182<<16) - (tabledivide32_noinline((120*(g_demo_totalCnt-g_demo_cnt))<<4, g_demo_totalCnt)<<12);
|
||||
if (RR)
|
||||
rotatesprite_fs(j, (15<<16)+(1<<15), 16384, 0, TILE_BIGALPHANUM-9, 0, 0, 2+8+16+1024);
|
||||
else
|
||||
rotatesprite_fs(j, (16<<16)+(1<<15), 32768, 0, TILE_SLIDEBAR+1, 0, 0, 2+8+16+1024);
|
||||
|
||||
j=(g_demo_totalCnt-g_demo_cnt)/REALGAMETICSPERSEC;
|
||||
Bsprintf(buf, "-%02d:%02d%s", j/60, j%60, g_demo_paused ? " ^15PAUSED" : "");
|
||||
gametext_widenumber(194, 16, buf);
|
||||
}
|
||||
}
|
||||
|
||||
if ((g_netServer || ud.multimode > 1) && g_player[myconnectindex].ps->gm)
|
||||
Net_GetPackets();
|
||||
|
||||
if (g_player[myconnectindex].gotvote == 0 && voting != -1 && voting != myconnectindex)
|
||||
gametext_center(60, GStrings("TXT_PRESSF1_F2"));
|
||||
}
|
||||
|
||||
if ((g_player[myconnectindex].ps->gm&MODE_MENU) && (g_player[myconnectindex].ps->gm&MODE_EOL))
|
||||
{
|
||||
Demo_FinishProfile();
|
||||
videoNextPage();
|
||||
goto RECHECK;
|
||||
}
|
||||
|
||||
if (Demo_IsProfiling())
|
||||
{
|
||||
// Do nothing: sampletimer() is reached from M_DisplayMenus() ->
|
||||
// Net_GetPackets() else.
|
||||
}
|
||||
else if (g_player[myconnectindex].ps->gm&MODE_TYPE)
|
||||
{
|
||||
Net_SendMessage();
|
||||
|
|
@ -883,7 +137,6 @@ nextdemo_nomenu:
|
|||
}
|
||||
}
|
||||
|
||||
if (!Demo_IsProfiling())
|
||||
G_PrintGameQuotes(screenpeek);
|
||||
|
||||
if (ud.last_camsprite != ud.camerasprite)
|
||||
|
|
@ -898,40 +151,21 @@ nextdemo_nomenu:
|
|||
videoNextPage();
|
||||
}
|
||||
|
||||
// NOTE: We must prevent handleevents() and Net_GetPackets() from
|
||||
// updating totalclock when profiling (both via sampletimer()):
|
||||
if (!Demo_IsProfiling())
|
||||
G_HandleAsync();
|
||||
|
||||
if (g_player[myconnectindex].ps->gm == MODE_GAME)
|
||||
{
|
||||
// user wants to play a game, quit showing demo!
|
||||
|
||||
if (foundemo)
|
||||
{
|
||||
#if KRANDDEBUG
|
||||
krd_print("krandplay.log");
|
||||
#endif
|
||||
g_demo_recFilePtr.Close();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
ud.multimode = numplayers; // fixes 2 infinite loops after watching demo
|
||||
g_demo_recFilePtr.Close();
|
||||
|
||||
Demo_FinishProfile();
|
||||
|
||||
// if we're in the menu, try next demo immediately
|
||||
if (g_player[myconnectindex].ps->gm&MODE_MENU)
|
||||
goto RECHECK;
|
||||
|
||||
#if KRANDDEBUG
|
||||
if (foundemo)
|
||||
krd_print("krandplay.log");
|
||||
#endif
|
||||
|
||||
// finished playing a demo and not in menu:
|
||||
// return so that e.g. the title can be shown
|
||||
|
|
|
|||
|
|
@ -177,13 +177,6 @@ void G_GameExit(const char *msg)
|
|||
{
|
||||
if (*msg != 0) g_player[myconnectindex].ps->palette = BASEPAL;
|
||||
|
||||
if (ud.recstat == 1)
|
||||
G_CloseDemoWrite();
|
||||
else if (ud.recstat == 2)
|
||||
{
|
||||
delete g_demo_filePtr;
|
||||
g_demo_filePtr = nullptr;
|
||||
}
|
||||
// JBF: fixes crash on demo playback
|
||||
// PK: modified from original
|
||||
|
||||
|
|
@ -1414,22 +1407,6 @@ void G_HandleLocalKeys(void)
|
|||
P_DoQuote(QUOTE_MAP_FOLLOW_OFF+ud.scrollmode,g_player[myconnectindex].ps);
|
||||
}
|
||||
|
||||
if (inputState.UnboundKeyPressed(sc_ScrollLock))
|
||||
{
|
||||
inputState.ClearKeyStatus(sc_ScrollLock);
|
||||
|
||||
switch (ud.recstat)
|
||||
{
|
||||
case 0:
|
||||
if (SHIFTS_IS_PRESSED)
|
||||
G_OpenDemoWrite();
|
||||
break;
|
||||
case 1:
|
||||
G_CloseDemoWrite();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (ud.recstat == 2)
|
||||
{
|
||||
if (inputState.GetKeyStatus(sc_Space))
|
||||
|
|
@ -1459,8 +1436,6 @@ void G_HandleLocalKeys(void)
|
|||
|
||||
if (g_demo_goalCnt > g_demo_totalCnt)
|
||||
g_demo_goalCnt = 0;
|
||||
else
|
||||
Demo_PrepareWarp();
|
||||
}
|
||||
else if (inputState.GetKeyStatus(sc_kpad_4))
|
||||
{
|
||||
|
|
@ -1473,7 +1448,6 @@ void G_HandleLocalKeys(void)
|
|||
if (g_demo_goalCnt <= 0)
|
||||
g_demo_goalCnt = 1;
|
||||
|
||||
Demo_PrepareWarp();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1760,7 +1734,6 @@ void G_UpdatePlayerFromMenu(void)
|
|||
void G_BackToMenu(void)
|
||||
{
|
||||
boardfilename[0] = 0;
|
||||
if (ud.recstat == 1) G_CloseDemoWrite();
|
||||
ud.warp_on = 0;
|
||||
g_player[myconnectindex].ps->gm = 0;
|
||||
M_StartControlPanel(false);
|
||||
|
|
@ -1776,8 +1749,6 @@ static int G_EndOfLevel(void)
|
|||
|
||||
if (g_player[myconnectindex].ps->gm&MODE_EOL)
|
||||
{
|
||||
G_CloseDemoWrite();
|
||||
|
||||
ready2send = 0;
|
||||
|
||||
if (g_player[myconnectindex].ps->player_par > 0 && (g_player[myconnectindex].ps->player_par < ud.playerbest || ud.playerbest < 0) &&
|
||||
|
|
@ -2090,6 +2061,8 @@ int GameInterface::app_main()
|
|||
return 0;
|
||||
}
|
||||
|
||||
int32_t G_PlaybackDemo(void);
|
||||
|
||||
void app_loop()
|
||||
{
|
||||
auto &myplayer = g_player[myconnectindex].ps;
|
||||
|
|
@ -2369,8 +2342,6 @@ int G_DoMoveThings(void)
|
|||
|
||||
g_moveThingsCount++;
|
||||
|
||||
if (ud.recstat == 1) G_DemoRecord();
|
||||
|
||||
everyothertime++;
|
||||
if (g_earthquakeTime > 0) g_earthquakeTime--;
|
||||
|
||||
|
|
|
|||
|
|
@ -561,9 +561,6 @@ int G_EnterLevel(int gameMode)
|
|||
else g_player[myconnectindex].ps->gm = MODE_GAME;
|
||||
}
|
||||
|
||||
if ((ud.recstat == 1) && (gameMode&MODE_RESTART) != MODE_RESTART)
|
||||
G_OpenDemoWrite();
|
||||
|
||||
#ifndef EDUKE32_TOUCH_DEVICES
|
||||
if (VOLUMEONE && ud.level_number == 0 && ud.recstat != 2)
|
||||
P_DoQuote(QUOTE_F1HELP,g_player[myconnectindex].ps);
|
||||
|
|
|
|||
|
|
@ -918,7 +918,6 @@ void G_DisplayRest(int32_t smoothratio)
|
|||
rotatesprite_fs((320-50)<<16, 9<<16, 65536L, 0, TILE_BETAVERSION, 0, 0, 2+8+16+128);
|
||||
}
|
||||
|
||||
if (!Demo_IsProfiling())
|
||||
{
|
||||
if (g_player[myconnectindex].ps->gm&MODE_TYPE)
|
||||
Net_SendMessage();
|
||||
|
|
|
|||
Loading…
Reference in a new issue