From da7429f7686448f0575fee92ff33b8ba4ddcc8e1 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 24 Oct 2025 03:37:03 +0200 Subject: [PATCH] do some cleanup g_demo :shook: use the CLEANUP macro everywhere init some things that may not be initialized and make this more readable lets hope didnt break anything Zzz... TODO: if there are still issues with demo records and stuff crashing might consider porting some of the fixes from RR --- src/g_demo.c | 680 +++++++++++++++++++++++++++++---------------------- 1 file changed, 381 insertions(+), 299 deletions(-) diff --git a/src/g_demo.c b/src/g_demo.c index f779c26d8..96ff33e65 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -74,7 +74,7 @@ static tic_t demostarttime; // for comparative timing purposes //@TODO put these all in a struct for namespacing purposes? static char demoname[128]; -savebuffer_t demobuf; +savebuffer_t demobuf = {0}; static UINT8 *demotime_p, *demoinfo_p; static UINT8 *demoend; static UINT8 demoflags; @@ -85,7 +85,8 @@ struct demovars_s demo; consvar_t cv_resyncdemo = {"resyncdemo", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // extra data stuff (events registered this frame while recording) -static struct { +static struct +{ UINT8 flags; // EZT flags // EZT_COLOR @@ -156,8 +157,8 @@ consvar_t cv_demodateformat = {"netdemo_dateformat", "Automatic", CV_SAVE, demod #define ZT_LATENCY 0x40 #define DEMOMARKER 0x80 // demoend -UINT8 demo_extradata[MAXPLAYERS]; -UINT8 demo_writerng; // 0=no, 1=yes, 2=yes but on a timeout +UINT8 demo_extradata[MAXPLAYERS] = {0}; +UINT8 demo_writerng = 0; // 0=no, 1=yes, 2=yes but on a timeout static ticcmd_t oldcmd[MAXPLAYERS]; #define DW_END 0xFF // End of extradata block @@ -192,7 +193,7 @@ static ticcmd_t oldcmd[MAXPLAYERS]; static mobj_t oldghost[MAXPLAYERS]; -static void G_ResetDemoPlayback(char *pdemoname); +static void G_ResetDemoPlayback(void); // Finds a skin with the closest stats if the expected skin doesn't exist. static INT32 GetSkinNumClosestToStats(UINT8 kartspeed, UINT8 kartweight) @@ -203,6 +204,7 @@ static INT32 GetSkinNumClosestToStats(UINT8 kartspeed, UINT8 kartweight) for (i = 0; i < numskins; i++) { stat_diff = abs(skins[i].kartspeed - kartspeed) + abs(skins[i].kartweight - kartweight); + if (stat_diff < closest_stats) { closest_stats = stat_diff; @@ -249,6 +251,7 @@ void G_ReadDemoExtraData(void) if (players[p].mo) P_DamageMobj(players[p].mo, NULL, NULL, DMG_INSTAKILL); // Is this how this should work..? } + if (extradata & DXD_SKIN) { UINT8 kartspeed, kartweight; @@ -267,6 +270,7 @@ void G_ReadDemoExtraData(void) players[p].kartspeed = kartspeed; players[p].kartweight = kartweight; } + if (extradata & DXD_COLOR) { // Color @@ -281,47 +285,49 @@ void G_ReadDemoExtraData(void) break; } } + if (extradata & DXD_NAME) { // Name M_Memcpy(player_names[p],demobuf.p,16); demobuf.p += 16; } + if (extradata & DXD_PLAYSTATE) { extradata = READUINT8(demobuf.p); - switch (extradata) { - case DXD_PST_PLAYING: - players[p].pflags |= PF_WANTSTOJOIN; // fuck you - break; + switch (extradata) + { + case DXD_PST_PLAYING: + players[p].pflags |= PF_WANTSTOJOIN; // fuck you + break; + case DXD_PST_SPECTATING: + players[p].pflags &= ~PF_WANTSTOJOIN; // double-fuck you - case DXD_PST_SPECTATING: - players[p].pflags &= ~PF_WANTSTOJOIN; // double-fuck you - if (!playeringame[p]) - { - CL_ClearPlayer(p); - playeringame[p] = true; - G_AddPlayer(p); - players[p].spectator = true; + if (!playeringame[p]) + { + CL_ClearPlayer(p); + playeringame[p] = true; + G_AddPlayer(p); + players[p].spectator = true; - // There's likely an off-by-one error in timing recording or playback of joins. This hacks around it so I don't have to find out where that is. \o/ - if (oldcmd[p].forwardmove) - P_RandomByte(); - } - else - { - players[p].spectator = true; - if (players[p].mo) - P_DamageMobj(players[p].mo, NULL, NULL, DMG_INSTAKILL); + // There's likely an off-by-one error in timing recording or playback of joins. This hacks around it so I don't have to find out where that is. \o/ + if (oldcmd[p].forwardmove) + P_RandomByte(); + } else - players[p].playerstate = PST_REBORN; - } - break; - - case DXD_PST_LEFT: - CL_RemovePlayer(p, 0); - break; + { + players[p].spectator = true; + if (players[p].mo) + P_DamageMobj(players[p].mo, NULL, NULL, DMG_INSTAKILL); + else + players[p].playerstate = PST_REBORN; + } + break; + case DXD_PST_LEFT: + CL_RemovePlayer(p, 0); + break; } G_ResetViews(); @@ -333,7 +339,6 @@ void G_ReadDemoExtraData(void) P_CheckRacers(); // also SRB2Kart } - p = READUINT8(demobuf.p); } @@ -342,11 +347,11 @@ void G_ReadDemoExtraData(void) UINT32 rng; UINT32 checkrng; - switch (p) + if (p == DW_RNG) { - case DW_RNG: rng = READUINT32(demobuf.p); checkrng = P_GetRandSeed(); + if (checkrng != rng) { if (demosynced) @@ -354,6 +359,7 @@ void G_ReadDemoExtraData(void) CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced (RNG)!\n")); CONS_Printf("expected rng %d got %d\n", rng, checkrng); } + demosynced = false; P_SetRandSeed(rng); @@ -395,6 +401,7 @@ void G_WriteDemoExtraData(void) WRITEUINT8(demobuf.p, skins[players[i].skin].kartspeed); WRITEUINT8(demobuf.p, skins[players[i].skin].kartweight); } + if (demo_extradata[i] & DXD_COLOR) { // Color @@ -403,6 +410,7 @@ void G_WriteDemoExtraData(void) M_Memcpy(demobuf.p,name,16); demobuf.p += 16; } + if (demo_extradata[i] & DXD_NAME) { // Name @@ -411,6 +419,7 @@ void G_WriteDemoExtraData(void) M_Memcpy(demobuf.p,name,16); demobuf.p += 16; } + if (demo_extradata[i] & DXD_PLAYSTATE) { demo_writerng = 1; @@ -866,8 +875,8 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum) } Z_Free(ghostext[playernum].hitlist); - ghostext[playernum].hits = 0; ghostext[playernum].hitlist = NULL; + ghostext[playernum].hits = 0; } if (ghostext[playernum].flags & EZT_SPRITE) @@ -973,6 +982,7 @@ void G_ConsGhostTic(INT32 playernum) if (ziptic & GZT_EXTRA) { // But wait, there's more! ziptic = READUINT8(demobuf.p); + if (ziptic & EZT_COLOR) demobuf.p++; @@ -981,7 +991,8 @@ void G_ConsGhostTic(INT32 playernum) if (ziptic & EZT_HIT) { // Resync mob damage. - UINT16 i, count = READUINT16(demobuf.p); + UINT16 i; + UINT16 count = READUINT16(demobuf.p); thinker_t *th; mobj_t *mobj; @@ -1006,9 +1017,12 @@ void G_ConsGhostTic(INT32 playernum) { if (th->function != (actionf_p1)P_MobjThinker) continue; + mobj = (mobj_t *)th; + if (mobj->type == (mobjtype_t)type && mobj->x == x && mobj->y == y && mobj->z == z) break; + mobj = NULL; // wasn't this one, keep searching. } @@ -1055,6 +1069,7 @@ void G_ConsGhostTic(INT32 playernum) { if (demosynced) CONS_Alert(CONS_WARNING, "Demo playback has desynced (player %s)!\n", player_names[playernum]); + demosynced = false; if (cv_resyncdemo.value) @@ -1092,6 +1107,7 @@ void G_ConsGhostTic(INT32 playernum) CONS_Printf("expected item type %d got %d\n", ghostext[playernum].kartitem, players[playernum].kartstuff[k_itemtype]); CONS_Printf("expected item amount %d got %d\n", ghostext[playernum].kartamount, players[playernum].kartstuff[k_itemamount]); } + demosynced = false; players[playernum].kartstuff[k_itemtype] = ghostext[playernum].kartitem; @@ -1110,7 +1126,7 @@ void G_ConsGhostTic(INT32 playernum) void G_GhostTicker(void) { - demoghost *g,*p; + demoghost *g, *p; for (g = ghosts, p = NULL; g; g = g->next) { @@ -1126,12 +1142,16 @@ void G_GhostTicker(void) if (ziptic == 0) // Only support player 0 info for now { ziptic = READUINT8(g->p); + if (ziptic & DXD_SKIN) g->p += 18; // We _could_ read this info, but it shouldn't change anything in record attack... + if (ziptic & DXD_COLOR) g->p += 16; // Same tbh + if (ziptic & DXD_NAME) g->p += 16; // yea + if (ziptic & DXD_PLAYSTATE && READUINT8(g->p) != DXD_PST_PLAYING) I_Error("Ghost is not a record attack ghost"); //@TODO lmao don't blow up like this } @@ -1191,14 +1211,18 @@ void G_GhostTicker(void) g->oldmo.momx = READINT16(g->p)<<8; g->oldmo.momy = READINT16(g->p)<<8; } + if (ziptic & GZT_MOMZ) g->oldmo.momz = READINT16(g->p)<<8; + g->oldmo.x += g->oldmo.momx; g->oldmo.y += g->oldmo.momy; g->oldmo.z += g->oldmo.momz; } + if (ziptic & GZT_ANGLE) g->oldmo.angle = READUINT8(g->p)<<24; + if (ziptic & GZT_SPRITE) g->oldmo.frame = READUINT8(g->p); @@ -1214,36 +1238,42 @@ void G_GhostTicker(void) if (ziptic & GZT_EXTRA) { // But wait, there's more! ziptic = READUINT8(g->p); + if (ziptic & EZT_COLOR) { g->color = READUINT8(g->p); - switch(g->color) + + switch (g->color) { - default: - case GHC_NORMAL: // Go back to skin color - g->mo->color = g->oldmo.color; - break; - // Handled below - case GHC_SUPER: - case GHC_INVINCIBLE: - break; - case GHC_FIREFLOWER: // Fireflower - g->mo->color = SKINCOLOR_WHITE; - break; + default: + case GHC_NORMAL: // Go back to skin color + g->mo->color = g->oldmo.color; + break; + // Handled below + case GHC_SUPER: + case GHC_INVINCIBLE: + break; + case GHC_FIREFLOWER: // Fireflower + g->mo->color = SKINCOLOR_WHITE; + break; } } + if (ziptic & EZT_FLIP) g->mo->eflags ^= MFE_VERTICALFLIP; + if (ziptic & EZT_SCALE) { g->mo->destscale = READFIXED(g->p); if (g->mo->destscale != g->mo->scale) P_SetScale(g->mo, g->mo->destscale); } + if (ziptic & EZT_THOKMASK) { // Let's only spawn ONE of these per frame, thanks. mobj_t *mobj; INT32 type = -1; + if (g->mo->skin) { switch (ziptic & EZT_THOKMASK) @@ -1273,14 +1303,17 @@ void G_GhostTicker(void) mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<tics = -1; // nope. mobj->color = g->mo->color; + if (g->mo->eflags & MFE_VERTICALFLIP) { mobj->flags2 |= MF2_OBJECTFLIP; mobj->eflags |= MFE_VERTICALFLIP; } + P_SetScale(mobj, g->mo->scale); mobj->destscale = g->mo->scale; } + mobj->floorz = mobj->z; mobj->ceilingz = mobj->z+mobj->height; P_UnsetThingPosition(mobj); @@ -1290,13 +1323,16 @@ void G_GhostTicker(void) P_SetTarget(&mobj->target, g->mo); } } + if (ziptic & EZT_HIT) { // Spawn hit poofs for killing things! - UINT16 i, count = READUINT16(g->p), health; + UINT16 i, health; + UINT16 count = READUINT16(g->p); //UINT32 type; fixed_t x,y,z; angle_t angle; mobj_t *poof; + for (i = 0; i < count; i++) { g->p += 4; // reserved @@ -1306,8 +1342,10 @@ void G_GhostTicker(void) y = READFIXED(g->p); z = READFIXED(g->p); angle = READANGLE(g->p); + if (health != 0 || i >= 4) // only spawn for the first 4 hits per frame, to prevent ghosts from splode-spamming too bad. continue; + poof = P_SpawnMobj(x, y, z, MT_GHOST); poof->angle = angle; poof->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up... @@ -1333,30 +1371,33 @@ void G_GhostTicker(void) skippedghosttic: // Tick ghost colors (Super and Mario Invincibility flashing) - switch(g->color) + switch (g->color) { - case GHC_SUPER: // Super Sonic (P_DoSuperStuff) - g->mo->color = SKINCOLOR_SUPER1; - g->mo->color += abs( ( (signed)( (unsigned)leveltime >> 1 ) % 9) - 4); - break; - case GHC_INVINCIBLE: // Mario invincibility (P_CheckInvincibilityTimer) - g->mo->color = (UINT8)(leveltime % MAXSKINCOLORS); - break; - default: - break; + case GHC_SUPER: // Super Sonic (P_DoSuperStuff) + g->mo->color = SKINCOLOR_SUPER1; + g->mo->color += abs( ( (signed)( (unsigned)leveltime >> 1 ) % 9) - 4); + break; + case GHC_INVINCIBLE: // Mario invincibility (P_CheckInvincibilityTimer) + g->mo->color = (UINT8)(leveltime % MAXSKINCOLORS); + break; + default: + break; } // Demo ends after ghost data. if (*g->p == DEMOMARKER) { g->mo->momx = g->mo->momy = g->mo->momz = 0; + if (p) p->next = g->next; else ghosts = g->next; + Z_Free(g); continue; } + p = g; } } @@ -1399,6 +1440,7 @@ void G_StoreRewindInfo(void) if (timetolog-- > 0) return; + timetolog = 8; info = Z_Calloc(sizeof(rewindinfo_t), PU_STATIC, NULL); @@ -1413,6 +1455,7 @@ void G_StoreRewindInfo(void) info->playerinfo[i].ingame = true; memcpy(&info->playerinfo[i].player, &players[i], sizeof(player_t)); + if (players[i].mo) memcpy(&info->playerinfo[i].mobj, players[i].mo, sizeof(mobj_t)); } @@ -1437,10 +1480,10 @@ void G_PreviewRewind(tic_t previewtime) next_info = info; info = info->prev; } + if (info != next_info) tweenvalue = FixedDiv(previewtime - info->leveltime, next_info->leveltime - info->leveltime); - for (i = 0; i < MAXPLAYERS; i++) { if (!playeringame[i] || players[i].spectator) @@ -1481,6 +1524,7 @@ void G_PreviewRewind(tic_t previewtime) players[i].mo->frame = info->playerinfo[i].mobj.frame; players[i].realtime = info->playerinfo[i].player.realtime; + for (j = 0; j < NUMKARTSTUFF; j++) players[i].kartstuff[j] = info->playerinfo[i].player.kartstuff[j]; } @@ -1669,10 +1713,13 @@ void G_BeginRecording(void) demobuf.p += 1; totalfiles = 0; - for (i = mainwads; ++i < numwadfiles; ) - if (wadfiles[i]->important) + + for (i = mainwads; ++i < numwadfiles;) { - nameonly(( filename = va("%s", wadfiles[i]->filename) )); + if (!wadfiles[i]->important) + continue; + + nameonly((filename = va("%s", wadfiles[i]->filename))); WRITESTRINGL(demobuf.p, filename, MAX_WADPATH); WRITEMEM(demobuf.p, wadfiles[i]->md5sum, 16); @@ -1681,17 +1728,17 @@ void G_BeginRecording(void) WRITEUINT8(m, totalfiles); - switch ((demoflags & DF_ATTACKMASK)>>DF_ATTACKSHIFT) + switch ((demoflags & DF_ATTACKMASK) >> DF_ATTACKSHIFT) { - case ATTACKING_NONE: // 0 - break; - case ATTACKING_RECORD: // 1 - demotime_p = demobuf.p; - WRITEUINT32(demobuf.p,UINT32_MAX); // time - WRITEUINT32(demobuf.p,UINT32_MAX); // lap - break; - default: // 3 - break; + case ATTACKING_NONE: // 0 + break; + case ATTACKING_RECORD: // 1 + demotime_p = demobuf.p; + WRITEUINT32(demobuf.p,UINT32_MAX); // time + WRITEUINT32(demobuf.p,UINT32_MAX); // lap + break; + default: // 3 + break; } WRITEUINT32(demobuf.p, P_GetInitSeed()); @@ -1810,6 +1857,7 @@ void G_SetDemoTime(UINT32 ptime, UINT32 plap) { if (!demo.recording || !demotime_p) return; + if (demoflags & DF_RECORDATTACK) { WRITEUINT32(demotime_p, ptime); @@ -1828,7 +1876,8 @@ static void G_LoadDemoExtraFiles(UINT8 **pp) boolean alreadyloaded; UINT8 i, j; - totalfiles = READUINT8((*pp)); + totalfiles = READUINT8((*pp)); // i like pp uwu + for (i = 0; i < totalfiles; ++i) { if (toomany) @@ -1838,6 +1887,7 @@ static void G_LoadDemoExtraFiles(UINT8 **pp) strlcpy(filename, (char *)(*pp), sizeof filename); SKIPSTRING((*pp)); } + READMEM((*pp), md5sum, 16); if (!toomany) @@ -1917,6 +1967,7 @@ static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick) totalfiles = READUINT8((*pp)); filesloaded = 0; + for (i = 0; i < totalfiles; ++i) { if (toomany) @@ -1926,7 +1977,8 @@ static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick) strlcpy(filename, (char *)(*pp), sizeof filename); SKIPSTRING((*pp)); } - READMEM((*pp), md5sum, 16); + + READMEM((*pp), md5sum, 16); // hue hue peepee if (!toomany) { @@ -1971,8 +2023,10 @@ static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick) nmusfilecount = 0; for (j = 0; j < numwadfiles; ++j) + { if (wadfiles[j]->important && j > mainwads) nmusfilecount++; + } if (!error && filesloaded < nmusfilecount) error = DFILE_ERROR_EXTRAFILES; @@ -1986,7 +2040,8 @@ static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick) // 4 == new demo has higher rings UINT8 G_CmpDemoTime(char *oldname, char *newname) { - UINT8 *buffer,*p; + CLEANUP(Z_Pfree) UINT8 *buffer = NULL; + UINT8 *p; UINT8 flags; UINT32 oldtime, newtime, oldlap, newlap; UINT16 oldversion; @@ -2018,10 +2073,12 @@ UINT8 G_CmpDemoTime(char *oldname, char *newname) p += 16; // map md5 flags = READUINT8(p); // demoflags p++; // gametype + G_SkipDemoExtraFiles(&p); aflags = flags & (DF_RECORDATTACK|DF_NIGHTSATTACK); I_Assert(aflags); + if (flags & DF_RECORDATTACK) { newtime = READUINT32(p); @@ -2031,62 +2088,69 @@ UINT8 G_CmpDemoTime(char *oldname, char *newname) return 0; Z_Free(buffer); + buffer = NULL; // load old file FIL_DefaultExtension(oldname, ".lmp"); + if (!FIL_ReadFile(oldname, &buffer)) { CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), oldname); return UINT8_MAX; } + p = buffer; // read demo header if (memcmp(p, DEMOHEADER, 12)) { CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname); - Z_Free(buffer); return UINT8_MAX; - } p += 12; // DEMOHEADER + } + + p += 12; // DEMOHEADER p++; // VERSION p++; // SUBVERSION oldversion = READUINT16(p); - switch(oldversion) // demoversion + + switch (oldversion) // demoversion { - case DEMOVERSION: // latest always supported - p += 64; // full demo title - break; -#ifdef DEMO_COMPAT_100 - case 0x0001: - // Old replays gotta go :] - CONS_Alert(CONS_NOTICE, M_GetText("File '%s' outdated version. It will be overwritten. Nyeheheh.\n"), oldname); - Z_Free(buffer); - return UINT8_MAX; + case DEMOVERSION: // latest always supported + p += 64; // full demo title + break; + #ifdef DEMO_COMPAT_100 + case 0x0001: + // Old replays gotta go :] + CONS_Alert(CONS_NOTICE, M_GetText("File '%s' outdated version. It will be overwritten. Nyeheheh.\n"), oldname); + return UINT8_MAX; #endif - // too old, cannot support. - default: - CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname); - Z_Free(buffer); - return UINT8_MAX; + // too old, cannot support. + default: + CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname); + return UINT8_MAX; } + p += 16; // demo checksum + if (memcmp(p, "PLAY", 4)) { CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname); - Z_Free(buffer); return UINT8_MAX; - } p += 4; // "PLAY" + } + + p += 4; // "PLAY" p += 2; // gamemap p += 16; // mapmd5 flags = READUINT8(p); p++; // gametype G_SkipDemoExtraFiles(&p); + if (!(flags & aflags)) { CONS_Alert(CONS_NOTICE, M_GetText("File '%s' not from same game mode. It will be overwritten.\n"), oldname); - Z_Free(buffer); return UINT8_MAX; } + if (flags & DF_RECORDATTACK) { oldtime = READUINT32(p); @@ -2095,21 +2159,23 @@ UINT8 G_CmpDemoTime(char *oldname, char *newname) else // appease compiler return UINT8_MAX; - Z_Free(buffer); - c = 0; + if (newtime < oldtime || (newtime == oldtime && (newlap < oldlap))) c |= 1; // Better time + if (newlap < oldlap || (newlap == oldlap && newtime < oldtime)) c |= 1<<1; // Better lap time + return c; } void G_LoadDemoInfo(menudemo_t *pdemo) { - UINT8 *infobuffer, *info_p, *extrainfo_p; + UINT8 *info_p, *extrainfo_p; + CLEANUP(Z_Pfree) UINT8 *infobuffer = NULL; UINT8 version, subversion, pdemoflags; UINT16 pdemoversion, count; @@ -2118,7 +2184,6 @@ void G_LoadDemoInfo(menudemo_t *pdemo) CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), pdemo->filepath); pdemo->type = MD_INVALID; sprintf(pdemo->title, "INVALID REPLAY"); - return; } @@ -2129,7 +2194,6 @@ void G_LoadDemoInfo(menudemo_t *pdemo) CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath); pdemo->type = MD_INVALID; sprintf(pdemo->title, "INVALID REPLAY"); - Z_Free(infobuffer); return; } @@ -2144,41 +2208,40 @@ void G_LoadDemoInfo(menudemo_t *pdemo) memset(pdemo->version, 0, sizeof(pdemo->version)); snprintf(pdemo->version, sizeof(pdemo->version), "v%d.%d", version, subversion); - switch(pdemoversion) + switch (pdemoversion) { - case DEMOVERSION: // latest always supported - // demo title - M_Memcpy(pdemo->title, info_p, 64); - info_p += 64; - - break; + case DEMOVERSION: // latest always supported + // demo title + M_Memcpy(pdemo->title, info_p, 64); + info_p += 64; + break; #ifdef DEMO_COMPAT_100 - case 0x0001: - pdemo->type = MD_OUTDATED; - sprintf(pdemo->title, "Legacy Replay"); - break; + case 0x0001: + pdemo->type = MD_OUTDATED; + sprintf(pdemo->title, "Legacy Replay"); + break; #endif - // too old, cannot support. - default: - CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath); - pdemo->type = MD_INVALID; - sprintf(pdemo->title, "INVALID REPLAY"); - Z_Free(infobuffer); - return; + // too old, cannot support. + default: + CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath); + pdemo->type = MD_INVALID; + sprintf(pdemo->title, "INVALID REPLAY"); + return; } if (version != VERSION || subversion != SUBVERSION) pdemo->type = MD_OUTDATED; info_p += 16; // demo checksum + if (memcmp(info_p, "PLAY", 4)) { CONS_Alert(CONS_ERROR, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemo->filepath); pdemo->type = MD_INVALID; sprintf(pdemo->title, "INVALID REPLAY"); - Z_Free(infobuffer); return; } + info_p += 4; // "PLAY" pdemo->map = READINT16(info_p); info_p += 16; // mapmd5 @@ -2189,7 +2252,6 @@ void G_LoadDemoInfo(menudemo_t *pdemo) if (!(pdemoflags & DF_MULTIPLAYER)) { CONS_Alert(CONS_ERROR, M_GetText("%s is not a multiplayer replay and can't be listed on this menu fully yet.\n"), pdemo->filepath); - Z_Free(infobuffer); return; } #ifdef DEMO_COMPAT_100 @@ -2198,7 +2260,6 @@ void G_LoadDemoInfo(menudemo_t *pdemo) CONS_Alert(CONS_ERROR, M_GetText("%s is a legacy multiplayer replay and cannot be played.\n"), pdemo->filepath); pdemo->type = MD_INVALID; sprintf(pdemo->title, "INVALID REPLAY"); - Z_Free(infobuffer); return; } #endif @@ -2213,6 +2274,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo) // Pared down version of CV_LoadNetVars to find the kart speed pdemo->kartspeed = 1; // Default to normal speed count = READUINT16(info_p); + while (count--) { UINT16 netid; @@ -2225,10 +2287,11 @@ void G_LoadDemoInfo(menudemo_t *pdemo) if (netid == cv_kartspeed.netid) { - UINT8 j; - for (j = 0; kartspeed_cons_t[j].strvalue; j++) + for (UINT8 j = 0; kartspeed_cons_t[j].strvalue; j++) + { if (!stricmp(kartspeed_cons_t[j].strvalue, svalue)) pdemo->kartspeed = kartspeed_cons_t[j].value; + } } else if (netid == cv_basenumlaps.netid && pdemo->gametype == GT_RACE) pdemo->numlaps = atoi(svalue); @@ -2255,22 +2318,28 @@ void G_LoadDemoInfo(menudemo_t *pdemo) M_Memcpy(temp,extrainfo_p,16); extrainfo_p += 16; pdemo->standings[count].skin = UINT8_MAX; + for (i = 0; i < numskins; i++) + { if (stricmp(skins[i].name, temp) == 0) { pdemo->standings[count].skin = i; break; } + } // Color M_Memcpy(temp,extrainfo_p,16); extrainfo_p += 16; + for (i = 0; i < MAXSKINCOLORS; i++) + { if (!stricmp(KartColor_Names[i],temp)) // SRB2kart { pdemo->standings[count].color = i; break; } + } // Score/time/whatever pdemo->standings[count].timeorscore = READUINT32(extrainfo_p); @@ -2282,7 +2351,6 @@ void G_LoadDemoInfo(menudemo_t *pdemo) } // I think that's everything we need? - Z_Free(infobuffer); } #if defined (_WIN32) @@ -2422,28 +2490,30 @@ void G_LoadDemoTitle(menudemo_t *pdemo) memset(pdemo->date, 0, sizeof(pdemo->date)); - switch(pdemoversion) + switch (pdemoversion) { - case DEMOVERSION: // latest always supported - // demo title - M_Memcpy(pdemo->title, info_p, 64); + case DEMOVERSION: // latest always supported + // demo title + M_Memcpy(pdemo->title, info_p, 64); - // demo date - char *demodate; - demodate = G_GetDemoDate(pdemo); - if (demodate) - strncpy(pdemo->date, demodate, sizeof(pdemo->date)); - free(demodate); - break; + // demo date + char *demodate; + demodate = G_GetDemoDate(pdemo); + + if (demodate) + strncpy(pdemo->date, demodate, sizeof(pdemo->date)); + + free(demodate); + break; #ifdef DEMO_COMPAT_100 - case 0x0001: - sprintf(pdemo->title, "Legacy Replay"); - break; + case 0x0001: + sprintf(pdemo->title, "Legacy Replay"); + break; #endif - // too old, cannot support. - default: - CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath); - sprintf(pdemo->title, "INVALID REPLAY"); + // too old, cannot support. + default: + CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath); + sprintf(pdemo->title, "INVALID REPLAY"); } } @@ -2465,8 +2535,9 @@ void G_DoPlayDemo(char *defdemoname) { UINT8 i, p; lumpnum_t l; - char skin[17],color[17],*n,*pdemoname; - UINT8 version,subversion; + char skin[17], color[17], *n; + CLEANUP(Z_Pfree) char *pdemoname; + UINT8 version, subversion; UINT32 randseed; char msg[1024]; #if defined(SKIPERRORS) && !defined(DEVELOP) @@ -2488,11 +2559,13 @@ void G_DoPlayDemo(char *defdemoname) } else { - n = defdemoname+strlen(defdemoname); + n = defdemoname + strlen(defdemoname); + while (*n != '/' && *n != '\\' && n != defdemoname) n--; if (n != defdemoname) n++; + pdemoname = ZZ_Alloc(strlen(n)+1); strcpy(pdemoname,n); @@ -2510,6 +2583,7 @@ void G_DoPlayDemo(char *defdemoname) M_StartMessage(msg, NULL, MM_NOTHING); return; } + demobuf.p = demobuf.buffer; } // load demo resource from WAD @@ -2533,53 +2607,58 @@ void G_DoPlayDemo(char *defdemoname) // read demo header gameaction = ga_nothing; demo.playback = true; + if (memcmp(demobuf.p, DEMOHEADER, 12)) { snprintf(msg, 1024, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); M_StartMessage(msg, NULL, MM_NOTHING); - G_ResetDemoPlayback(pdemoname); + G_ResetDemoPlayback(); return; } + demobuf.p += 12; // DEMOHEADER version = READUINT8(demobuf.p); subversion = READUINT8(demobuf.p); demo.version = READUINT16(demobuf.p); - switch(demo.version) - { - case DEMOVERSION: // latest always supported - // demo title - M_Memcpy(demo.titlename, demobuf.p, 64); - demobuf.p += 64; - break; + switch (demo.version) + { + case DEMOVERSION: // latest always supported + // demo title + M_Memcpy(demo.titlename, demobuf.p, 64); + demobuf.p += 64; + break; #ifdef DEMO_COMPAT_100 - case 0x0001: - break; + case 0x0001: + break; #endif - // too old, cannot support. - default: - snprintf(msg, 1024, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname); - CONS_Alert(CONS_ERROR, "%s", msg); - M_StartMessage(msg, NULL, MM_NOTHING); - G_ResetDemoPlayback(pdemoname); - return; + // too old, cannot support. + default: + snprintf(msg, 1024, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname); + CONS_Alert(CONS_ERROR, "%s", msg); + M_StartMessage(msg, NULL, MM_NOTHING); + G_ResetDemoPlayback(); + return; } + demobuf.p += 16; // demo checksum + if (memcmp(demobuf.p, "PLAY", 4)) { snprintf(msg, 1024, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); M_StartMessage(msg, NULL, MM_NOTHING); - G_ResetDemoPlayback(pdemoname); + G_ResetDemoPlayback(); return; } + demobuf.p += 4; // "PLAY" gamemap = READINT16(demobuf.p); demobuf.p += 16; // mapmd5 - demoflags = READUINT8(demobuf.p); + #ifdef DEMO_COMPAT_100 if (demo.version == 0x0001) { @@ -2588,7 +2667,7 @@ void G_DoPlayDemo(char *defdemoname) snprintf(msg, 1024, M_GetText("%s is an alpha multiplayer replay and cannot be played.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); M_StartMessage(msg, NULL, MM_NOTHING); - G_ResetDemoPlayback(pdemoname); + G_ResetDemoPlayback(); return; } } @@ -2611,41 +2690,43 @@ void G_DoPlayDemo(char *defdemoname) { switch (error) { - case DFILE_ERROR_NOTLOADED: - snprintf(msg, 1024, - M_GetText("Required files for this demo are not loaded.\n\nUse\n\"playdemo %s -addfiles\"\nto load them and play the demo.\n"), - pdemoname); - break; + case DFILE_ERROR_NOTLOADED: + snprintf(msg, 1024, + "Required files for this demo are not loaded.\n\nUse\n\"playdemo %s -addfiles\"\nto load them and play the demo.\n", + pdemoname); + break; - case DFILE_ERROR_OUTOFORDER: - snprintf(msg, 1024, - M_GetText("Required files for this demo are loaded out of order.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n"), - pdemoname); - break; + case DFILE_ERROR_OUTOFORDER: + snprintf(msg, 1024, + "Required files for this demo are loaded out of order.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n", + pdemoname); + break; - case DFILE_ERROR_INCOMPLETEOUTOFORDER: - snprintf(msg, 1024, - M_GetText("Required files for this demo are not loaded, and some are out of order.\n\nUse\n\"playdemo %s -addfiles\"\nto load needed files and play the demo.\n"), - pdemoname); - break; + case DFILE_ERROR_INCOMPLETEOUTOFORDER: + snprintf(msg, 1024, + "Required files for this demo are not loaded, and some are out of order.\n\nUse\n\"playdemo %s -addfiles\"\nto load needed files and play the demo.\n", + pdemoname); + break; - case DFILE_ERROR_CANNOTLOAD: - snprintf(msg, 1024, - M_GetText("Required files for this demo cannot be loaded.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n"), - pdemoname); - break; + case DFILE_ERROR_CANNOTLOAD: + snprintf(msg, 1024, + "Required files for this demo cannot be loaded.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n", + pdemoname); + break; - case DFILE_ERROR_EXTRAFILES: - snprintf(msg, 1024, - M_GetText("You have additional files loaded beyond the demo's file list.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n"), - pdemoname); - break; + case DFILE_ERROR_EXTRAFILES: + snprintf(msg, 1024, + "You have additional files loaded beyond the demo's file list.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n", + pdemoname); + break; } CONS_Alert(CONS_ERROR, "%s", msg); + if (!CON_Ready()) // In the console they'll just see the notice there! No point pulling them out. M_StartMessage(msg, NULL, MM_NOTHING); - G_ResetDemoPlayback(pdemoname); + + G_ResetDemoPlayback(); return; } } @@ -2662,19 +2743,20 @@ void G_DoPlayDemo(char *defdemoname) switch (modeattacking) { - case ATTACKING_NONE: // 0 - break; - case ATTACKING_RECORD: // 1 - hu_demotime = READUINT32(demobuf.p); - hu_demolap = READUINT32(demobuf.p); - break; - default: // 3 - modeattacking = ATTACKING_NONE; - break; + case ATTACKING_NONE: // 0 + break; + case ATTACKING_RECORD: // 1 + hu_demotime = READUINT32(demobuf.p); + hu_demolap = READUINT32(demobuf.p); + break; + default: // 3 + modeattacking = ATTACKING_NONE; + break; } // Random seed randseed = READUINT32(demobuf.p); + #ifdef DEMO_COMPAT_100 if (demo.version != 0x0001) #endif @@ -2708,7 +2790,7 @@ void G_DoPlayDemo(char *defdemoname) snprintf(msg, 1024, M_GetText("%s features a character that is not currently loaded.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); M_StartMessage(msg, NULL, MM_NOTHING); - G_ResetDemoPlayback(pdemoname); + G_ResetDemoPlayback(); return; } @@ -2718,17 +2800,19 @@ void G_DoPlayDemo(char *defdemoname) snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); M_StartMessage(msg, NULL, MM_NOTHING); - G_ResetDemoPlayback(pdemoname); + G_ResetDemoPlayback(); return; } // Set color for (i = 0; i < MAXSKINCOLORS; i++) + { if (!stricmp(KartColor_Names[i],color)) // SRB2kart { players[0].skincolor = i; break; } + } // net var data CV_LoadNetVars(&demobuf.p); @@ -2739,12 +2823,10 @@ void G_DoPlayDemo(char *defdemoname) snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); M_StartMessage(msg, NULL, MM_NOTHING); - G_ResetDemoPlayback(pdemoname); + G_ResetDemoPlayback(); return; } - Z_Free(pdemoname); - memset(&oldcmd,0,sizeof(oldcmd)); memset(&oldghost,0,sizeof(oldghost)); memset(&ghostext,0,sizeof(ghostext)); @@ -2779,15 +2861,13 @@ void G_DoPlayDemo(char *defdemoname) snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); M_StartMessage(msg, NULL, MM_NOTHING); - G_ResetDemoPlayback(pdemoname); + G_ResetDemoPlayback(); return; } - Z_Free(pdemoname); - - memset(&oldcmd,0,sizeof(oldcmd)); - memset(&oldghost,0,sizeof(oldghost)); - memset(&ghostext,0,sizeof(ghostext)); + memset(&oldcmd, 0, sizeof(oldcmd)); + memset(&oldghost, 0, sizeof(oldghost)); + memset(&ghostext, 0, sizeof(ghostext)); #if defined(SKIPERRORS) && !defined(DEVELOP) if ((VERSION != version || SUBVERSION != subversion) && !skiperrors) @@ -2819,6 +2899,7 @@ void G_DoPlayDemo(char *defdemoname) while (p != 0xFF) { spectator = false; + if (p & DEMO_SPECTATOR) { spectator = true; @@ -2829,10 +2910,11 @@ void G_DoPlayDemo(char *defdemoname) snprintf(msg, 1024, M_GetText("%s is a Record Attack replay with spectators, and is thus invalid.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); M_StartMessage(msg, NULL, MM_NOTHING); - G_ResetDemoPlayback(pdemoname); + G_ResetDemoPlayback(); return; } } + slots[numslots] = p; numslots++; if (modeattacking && numslots > 1) @@ -2840,7 +2922,7 @@ void G_DoPlayDemo(char *defdemoname) snprintf(msg, 1024, M_GetText("%s is a Record Attack replay with multiple players, and is thus invalid.\n"), pdemoname); CONS_Alert(CONS_ERROR, "%s", msg); M_StartMessage(msg, NULL, MM_NOTHING); - G_ResetDemoPlayback(pdemoname); + G_ResetDemoPlayback(); return; } @@ -2862,12 +2944,15 @@ void G_DoPlayDemo(char *defdemoname) // Color M_Memcpy(color,demobuf.p,16); demobuf.p += 16; + for (i = 0; i < MAXSKINCOLORS; i++) + { if (!stricmp(KartColor_Names[i],color)) // SRB2kart { players[p].skincolor = i; break; } + } // Score, since Kart uses this to determine where you start on the map players[p].score = READUINT32(demobuf.p); @@ -2885,9 +2970,9 @@ void G_DoPlayDemo(char *defdemoname) // end of player read (the 0xFF marker) // so this is where we are to read our lua variables (if possible!) - if (demoflags & DF_LUAVARS) // again, used for compability, lua shit will be saved to replays regardless of if it's even been loaded + if (demoflags & DF_LUAVARS) // again, used for compability, lua shit will be saved to replays regardless of if it's even been loaded { - if (!gL) // No Lua state! ...I guess we'll just start one... + if (!gL) // No Lua state! ...I guess we'll just start one... LUA_ClearState(); // No modeattacking check, DF_LUAVARS won't be present here. @@ -2942,10 +3027,12 @@ void G_AddGhost(char *defdemoname) { INT32 i; lumpnum_t l; - char name[17],skin[17],color[17],*n,*pdemoname,md5[16]; + char name[17], skin[17], color[17], *n, md5[16]; + CLEANUP(Z_Pfree) char *pdemoname = NULL; demoghost *gh; + UINT8 *p; UINT8 flags; - UINT8 *buffer,*p; + CLEANUP(Z_Pfree) UINT8 *buffer = NULL; mapthing_t *mthing; UINT16 count, ghostversion; skin_t *ghskin = &skins[0]; @@ -2955,13 +3042,15 @@ void G_AddGhost(char *defdemoname) skin[16] = '\0'; color[16] = '\0'; - n = defdemoname+strlen(defdemoname); + n = defdemoname + strlen(defdemoname); + while (*n != '/' && *n != '\\' && n != defdemoname) n--; if (n != defdemoname) n++; + pdemoname = ZZ_Alloc(strlen(n)+1); - strcpy(pdemoname,n); + strcpy(pdemoname, n); // Internal if no extension, external if one exists if (FIL_CheckExtension(defdemoname)) @@ -2970,16 +3059,15 @@ void G_AddGhost(char *defdemoname) if (!FIL_ReadFileTag(defdemoname, &buffer, PU_LEVEL)) { CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), defdemoname); - Z_Free(pdemoname); return; } + p = buffer; } // load demo resource from WAD else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR) { CONS_Alert(CONS_ERROR, M_GetText("Failed to read lump '%s'.\n"), defdemoname); - Z_Free(pdemoname); return; } else // it's an internal demo @@ -2989,8 +3077,6 @@ void G_AddGhost(char *defdemoname) if (memcmp(p, DEMOHEADER, 12)) { CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Not a SRB2Kart replay.\n"), pdemoname); - Z_Free(pdemoname); - Z_Free(buffer); return; } @@ -2999,38 +3085,36 @@ void G_AddGhost(char *defdemoname) p++; // SUBVERSION ghostversion = READUINT16(p); - switch(ghostversion) + + switch (ghostversion) { - case DEMOVERSION: // latest always supported - p += 64; // title - break; + case DEMOVERSION: // latest always supported + p += 64; // title + break; #ifdef DEMO_COMPAT_100 - case 0x0001: - break; + case 0x0001: + break; #endif - // too old, cannot support. - default: - CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo version incompatible.\n"), pdemoname); - Z_Free(pdemoname); - Z_Free(buffer); - return; + // too old, cannot support. + default: + CONS_Alert(CONS_NOTICE, "Ghost %s: Demo version incompatible.\n", pdemoname); + return; } M_Memcpy(md5, p, 16); p += 16; // demo checksum + for (gh = ghosts; gh; gh = gh->next) + { if (!memcmp(md5, gh->checksum, 16)) // another ghost in the game already has this checksum? { // Don't add another one, then! CONS_Debug(DBG_SETUP, "Rejecting duplicate ghost %s (MD5 was matched)\n", pdemoname); - Z_Free(pdemoname); - Z_Free(buffer); return; } + } if (memcmp(p, "PLAY", 4)) { - CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo format unacceptable.\n"), pdemoname); - Z_Free(pdemoname); - Z_Free(buffer); + CONS_Alert(CONS_NOTICE, "Ghost %s: Demo format unacceptable.\n", pdemoname); return; } @@ -3042,9 +3126,7 @@ void G_AddGhost(char *defdemoname) if (!(flags & DF_GHOST)) { - CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: No ghost data in this demo.\n"), pdemoname); - Z_Free(pdemoname); - Z_Free(buffer); + CONS_Alert(CONS_NOTICE, "Ghost %s: No ghost data in this demo.\n", pdemoname); return; } @@ -3057,15 +3139,16 @@ void G_AddGhost(char *defdemoname) if (ghostversion != 0x0001) #endif G_SkipDemoExtraFiles(&p); // Don't wanna modify the file list for ghosts. - switch ((flags & DF_ATTACKMASK)>>DF_ATTACKSHIFT) + + switch ((flags & DF_ATTACKMASK) >> DF_ATTACKSHIFT) { - case ATTACKING_NONE: // 0 - break; - case ATTACKING_RECORD: // 1 - p += 8; // demo time, lap - break; - default: // 3 - break; + case ATTACKING_NONE: // 0 + break; + case ATTACKING_RECORD: // 1 + p += 8; // demo time, lap + break; + default: // 3 + break; } p += 4; // random seed @@ -3118,8 +3201,6 @@ void G_AddGhost(char *defdemoname) if (*p == DEMOMARKER) { CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Replay is empty.\n"), pdemoname); - Z_Free(pdemoname); - Z_Free(buffer); return; } @@ -3130,8 +3211,6 @@ void G_AddGhost(char *defdemoname) if (READUINT8(p) != 0) { CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Invalid player slot.\n"), pdemoname); - Z_Free(pdemoname); - Z_Free(buffer); return; } @@ -3155,8 +3234,6 @@ void G_AddGhost(char *defdemoname) if (READUINT8(p) != 0xFF) { CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Invalid player slot.\n"), pdemoname); - Z_Free(pdemoname); - Z_Free(buffer); return; } #ifdef DEMO_COMPAT_100 @@ -3164,11 +3241,13 @@ void G_AddGhost(char *defdemoname) #endif for (i = 0; i < numskins; i++) + { if (!stricmp(skins[i].name,skin)) { ghskin = &skins[i]; break; } + } if (i == numskins) { @@ -3183,21 +3262,26 @@ void G_AddGhost(char *defdemoname) gh->buffer = buffer; M_Memcpy(gh->checksum, md5, 16); gh->p = p; + buffer = NULL; // buffer can't be freed now! ghosts = gh; gh->version = ghostversion; mthing = playerstarts[0]; I_Assert(mthing); + { // A bit more complex than P_SpawnPlayer because ghosts aren't solid and won't just push themselves out of the ceiling. - fixed_t z,f,c; + fixed_t z, f, c; + gh->mo = P_SpawnMobj(mthing->x << FRACBITS, mthing->y << FRACBITS, 0, MT_GHOST); gh->mo->angle = FixedAngle(mthing->angle*FRACUNIT); f = gh->mo->floorz; c = gh->mo->ceilingz - mobjinfo[MT_PLAYER].height; + if (!!(mthing->options & MTF_AMBUSH) ^ !!(mthing->options & MTF_OBJECTFLIP)) { z = c; + if (mthing->options >> ZSHIFT) z -= ((mthing->options >> ZSHIFT) << FRACBITS); if (z < f) @@ -3206,13 +3290,16 @@ void G_AddGhost(char *defdemoname) else { z = f; + if (mthing->options >> ZSHIFT) z += ((mthing->options >> ZSHIFT) << FRACBITS); if (z > c) z = c; } + gh->mo->z = z; } + gh->mo->state = states+S_KART_STND1; // SRB2kart - was S_PLAY_STND gh->mo->sprite = gh->mo->state->sprite; gh->mo->frame = (gh->mo->state->frame & FF_FRAMEMASK) | tr_trans20<mo->color = ((skin_t*)gh->mo->skin)->prefcolor; + for (i = 0; i < MAXSKINCOLORS; i++) + { if (!stricmp(KartColor_Names[i],color)) // SRB2kart { gh->mo->color = (UINT8)i; break; } + } + gh->oldmo.color = gh->mo->color; CONS_Printf(M_GetText("Added ghost %s from %s\n"), name, pdemoname); - Z_Free(pdemoname); } // A simplified version of G_AddGhost... void G_UpdateStaffGhostName(lumpnum_t l) { - UINT8 *buffer,*p; + UINT8 *p; + CLEANUP(Z_Pfree) UINT8 *buffer = NULL; UINT16 ghostversion; UINT8 flags; @@ -3251,7 +3342,7 @@ void G_UpdateStaffGhostName(lumpnum_t l) // read demo header if (memcmp(p, DEMOHEADER, 12)) { - goto fail; + return; } p += 12; // DEMOHEADER @@ -3259,27 +3350,25 @@ void G_UpdateStaffGhostName(lumpnum_t l) p++; // SUBVERSION ghostversion = READUINT16(p); - switch(ghostversion) + switch (ghostversion) { - case DEMOVERSION: // latest always supported - p += 64; // full demo title - break; - + case DEMOVERSION: // latest always supported + p += 64; // full demo title + break; #ifdef DEMO_COMPAT_100 - case 0x0001: - break; + case 0x0001: + break; #endif - - // too old, cannot support. - default: - goto fail; + // too old, cannot support. + default: + return; } p += 16; // demo checksum if (memcmp(p, "PLAY", 4)) { - goto fail; + return; } p += 4; // "PLAY" @@ -3289,7 +3378,7 @@ void G_UpdateStaffGhostName(lumpnum_t l) flags = READUINT8(p); if (!(flags & DF_GHOST)) { - goto fail; // we don't NEED to do it here, but whatever + return; // we don't NEED to do it here, but whatever } #ifdef DEMO_COMPAT_100 @@ -3304,13 +3393,13 @@ void G_UpdateStaffGhostName(lumpnum_t l) switch ((flags & DF_ATTACKMASK)>>DF_ATTACKSHIFT) { - case ATTACKING_NONE: // 0 - break; - case ATTACKING_RECORD: // 1 - p += 8; // demo time, lap - break; - default: // 3 - break; + case ATTACKING_NONE: // 0 + break; + case ATTACKING_RECORD: // 1 + p += 8; // demo time, lap + break; + default: // 3 + break; } p += 4; // random seed @@ -3322,7 +3411,7 @@ void G_UpdateStaffGhostName(lumpnum_t l) // Player name M_Memcpy(dummystaffname, p,16); dummystaffname[16] = '\0'; - goto fail; // Not really a failure but whatever + return; // Not really a failure but whatever } #endif @@ -3330,6 +3419,7 @@ void G_UpdateStaffGhostName(lumpnum_t l) // Ehhhh don't need ghostversion here (?) so I'll reuse the var here ghostversion = READUINT16(p); + while (ghostversion--) { p += 2; @@ -3339,14 +3429,12 @@ void G_UpdateStaffGhostName(lumpnum_t l) // Assert first player is in and then read name if (READUINT8(p) != 0) - goto fail; - M_Memcpy(dummystaffname, p,16); + return; + + M_Memcpy(dummystaffname, p, 16); dummystaffname[16] = '\0'; // Ok, no longer any reason to care, bye -fail: - Z_Free(buffer); - return; } // @@ -3390,12 +3478,7 @@ void G_DoneLevelLoad(void) // called from stopdemo command, map command, and g_checkdemoStatus. void G_StopDemo(void) { - Z_Free(demobuf.buffer); - demobuf.buffer = NULL; - demo.playback = false; - if (demo.title) - modeattacking = ATTACKING_NONE; - demo.title = false; + G_ResetDemoPlayback(); demo.timing = false; singletics = false; @@ -3508,9 +3591,8 @@ void G_ResetDemoRecording(void) demo.recording = false; } -static void G_ResetDemoPlayback(char *pdemoname) +static void G_ResetDemoPlayback(void) { - Z_Free(pdemoname); Z_Free(demobuf.buffer); demobuf.buffer = NULL; demo.playback = false;