Merge branch 'bird-pain' into 'next'

Fix playing back demos never working (closes #203)

Closes #203

See merge request STJr/SRB2!1149
This commit is contained in:
James R 2020-09-23 18:37:56 -04:00
commit aa4c1eeea8

View file

@ -1933,9 +1933,8 @@ void G_DoPlayDemo(char *defdemoname)
if (use_old_demo_vars) if (use_old_demo_vars)
CV_LoadOldDemoVars(&demo_p); CV_LoadOldDemoVars(&demo_p);
else else
#else
CV_LoadDemoVars(&demo_p);
#endif #endif
CV_LoadDemoVars(&demo_p);
// Sigh ... it's an empty demo. // Sigh ... it's an empty demo.
if (*demo_p == DEMOMARKER) if (*demo_p == DEMOMARKER)