AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 03:12:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

return early from G_DoPlayDemo() with a macro

Browse Source
This commit is contained in:
Fabian Greffrath 2022-02-19 17:07:28 +01:00
parent a74cbcadb0
commit e3f2b66ae9
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/g_game.c
View File

@ -1235,6 +1235,8 @@ static void G_DoWorldDone(void)
static char *defdemoname; static char *defdemoname;
#define INVALID_DEMO(a,b) do{fprintf(stderr,a,b);gameaction=ga_nothing;demoplayback=true;G_CheckDemoStatus();return;}while(0)
static void G_DoPlayDemo(void) static void G_DoPlayDemo(void)
{ {
skill_t skill; skill_t skill;
@ -1253,10 +1255,7 @@ static void G_DoPlayDemo(void)
// [FG] ignore too short demo lumps // [FG] ignore too short demo lumps
if (W_LumpLength(W_GetNumForName(basename)) < 0xd) if (W_LumpLength(W_GetNumForName(basename)) < 0xd)
{ {
gameaction = ga_nothing; INVALID_DEMO("G_DoPlayDemo: Short demo lump %s.\n", basename);
demoplayback = true;
G_CheckDemoStatus();
return;
} }
demover = *demo_p++; demover = *demo_p++;
@ -1268,11 +1267,7 @@ static void G_DoPlayDemo(void)
// Eternity Engine also uses 255 demover, with other signatures. // Eternity Engine also uses 255 demover, with other signatures.
if (strncmp((const char *)demo_p, "PR+UM", 5) != 0) if (strncmp((const char *)demo_p, "PR+UM", 5) != 0)
{ {
fprintf(stderr, "G_DoPlayDemo: Extended demo format 255 found, but \"PR+UM\" string not found.\n"); INVALID_DEMO("G_DoPlayDemo: Extended demo format %d found, but \"PR+UM\" string not found.\n", demover);
gameaction = ga_nothing;
demoplayback = true;
G_CheckDemoStatus();
return;
} }
demo_p += 6; demo_p += 6;
@ -1316,11 +1311,7 @@ static void G_DoPlayDemo(void)
// [FG] PrBoom's own demo format starts with demo version 210 // [FG] PrBoom's own demo format starts with demo version 210
if (demover >= 210 && !mbf21) if (demover >= 210 && !mbf21)
{ {
fprintf(stderr,"G_DoPlayDemo: Unknown demo format %d.\n", demover); INVALID_DEMO("G_DoPlayDemo: Unknown demo format %d.\n", demover);
gameaction = ga_nothing;
demoplayback = true;
G_CheckDemoStatus();
return;
} }
longtics = false; longtics = false;