From bcf72cc0e82b4c62e8c27726519df9a828ca0d0d Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 21 Oct 2024 05:55:44 +0200 Subject: [PATCH 1/3] revert some P_MobjWasRemoved checks i forgor about those may NOT be vanilla netsafe --- src/p_mobj.c | 77 +++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 0fc870045..4a71c4f6f 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -408,7 +408,7 @@ void P_ExplodeMissile(mobj_t *mo) P_RadiusAttack(mo, mo, 96*FRACUNIT); explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE); - if (!P_MobjWasRemoved(explodemo)) + if (explodemo) { P_SetScale(explodemo, mo->scale); explodemo->destscale = mo->destscale; @@ -417,7 +417,7 @@ void P_ExplodeMissile(mobj_t *mo) S_StartSound(explodemo, sfx_pop); } explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE); - if (!P_MobjWasRemoved(explodemo)) + if (explodemo) { P_SetScale(explodemo, mo->scale); explodemo->destscale = mo->destscale; @@ -426,7 +426,7 @@ void P_ExplodeMissile(mobj_t *mo) S_StartSound(explodemo, sfx_dmpain); } explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE); - if (!P_MobjWasRemoved(explodemo)) + if (explodemo) { P_SetScale(explodemo, mo->scale); explodemo->destscale = mo->destscale; @@ -435,7 +435,7 @@ void P_ExplodeMissile(mobj_t *mo) S_StartSound(explodemo, sfx_pop); } explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE); - if (!P_MobjWasRemoved(explodemo)) + if (explodemo) { P_SetScale(explodemo, mo->scale); explodemo->destscale = mo->destscale; @@ -3410,7 +3410,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj) I_Assert(mobj != NULL); I_Assert(mobj->player != NULL); I_Assert(!P_MobjWasRemoved(mobj)); - + if (P_MobjWasRemoved(mobj)) return; @@ -6030,41 +6030,41 @@ static void P_KoopaThinker(mobj_t *koopa) // void P_RollPitchMobj(mobj_t* mobj) { - boolean usedist = false; - + boolean usedist = false; + if (P_MobjWasRemoved(mobj)) - return; + return; - if (cv_sloperolldist.value > 0) - usedist = true; + if (cv_sloperolldist.value > 0) + usedist = true; - if (cv_spriteroll.value && cv_sloperoll.value == 2) - { - K_RollMobjBySlopes(mobj, usedist); - } - else - { - mobj->sloperoll = FixedAngle(0); - mobj->slopepitch = FixedAngle(0); - } + if (cv_spriteroll.value && cv_sloperoll.value == 2) + { + K_RollMobjBySlopes(mobj, usedist); + } + else + { + mobj->sloperoll = FixedAngle(0); + mobj->slopepitch = FixedAngle(0); + } } angle_t P_MobjPitchAndRoll(mobj_t *mobj) { - spritedef_t *sprdef; - spriteframe_t *sprframe; - angle_t ang = 0; + spritedef_t *sprdef; + spriteframe_t *sprframe; + angle_t ang = 0; angle_t camang = 0; angle_t return_angle = 0; - + if (!cv_spriteroll.value) return 0; - if (P_MobjWasRemoved(mobj)) - return 0; + if (P_MobjWasRemoved(mobj)) + return 0; - size_t rot = mobj->frame & FF_FRAMEMASK; - boolean papersprite = (mobj->frame & FF_PAPERSPRITE); + size_t rot = mobj->frame & FF_FRAMEMASK; + boolean papersprite = (mobj->frame & FF_PAPERSPRITE); if (mobj->skin && mobj->sprite == SPR_PLAY) { @@ -6095,12 +6095,12 @@ angle_t P_MobjPitchAndRoll(mobj_t *mobj) camang = R_PointToAngle(mobj->x, mobj->y); } - return_angle = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mobj->roll) + return_angle = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mobj->roll) + FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), mobj->pitch); if (cv_sloperoll.value) { - return_angle += FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), mobj->sloperoll) + return_angle += FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), mobj->sloperoll) + FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), mobj->slopepitch); } @@ -6263,7 +6263,7 @@ void P_MobjThinker(mobj_t *mobj) P_RemoveMobj(mobj); return; } - + if (cv_sloperoll.value == 2 && mobj->state == &states[S_SHADOW]) { mobj->slopepitch = mobj->target->slopepitch; @@ -6916,9 +6916,6 @@ void P_MobjThinker(mobj_t *mobj) // separate thinker if (mobj->flags & MF_PUSHABLE || (mobj->info->flags & MF_PUSHABLE && mobj->fuse)) { - if (P_MobjWasRemoved(mobj)) - return; - P_MobjCheckWater(mobj); P_PushableThinker(mobj); @@ -9434,11 +9431,11 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) mobj->destscale = mapobjectscale; mobj->scalespeed = mapobjectscale/12; } - + // Sprite rendering - mobj->realxscale = mobj->realyscale = mobj->scale; + mobj->realxscale = mobj->realyscale = mobj->scale; mobj->spritexscale = mobj->realxscale; - mobj->spriteyscale = mobj->realyscale; + mobj->spriteyscale = mobj->realyscale; mobj->spritexoffset = mobj->spriteyoffset = 0; // Funni slam sound when landing @@ -9892,11 +9889,11 @@ mobj_t *P_SpawnShadowMobj(mobj_t * caster) mobj->destscale = mapobjectscale; mobj->scalespeed = mapobjectscale/12; } - + // Sprite rendering - mobj->spritexscale = mobj->spriteyscale = mobj->scale; + mobj->spritexscale = mobj->spriteyscale = mobj->scale; mobj->spritexoffset = mobj->spriteyoffset = 0; - + // set subsector and/or block links P_SetThingPosition(mobj); I_Assert(mobj->subsector != NULL); @@ -10100,7 +10097,7 @@ void P_RemoveMobj(mobj_t *mobj) P_SetTarget(&mobj->hprev->hnext, cachenext); P_SetTarget(&mobj->hprev, NULL); } - + // clear the reference from the mapthing if (mobj->spawnpoint) mobj->spawnpoint->mobj = NULL; From 4267ac9a8d89a993227d2859da26ed0ddb8d23a4 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 21 Oct 2024 06:03:47 +0200 Subject: [PATCH 2/3] remove more P_MobjWasRemoved checks same as before, those may be not synchsafe --- src/p_inter.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index ca1d88ba2..29d7e4739 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2400,8 +2400,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da UINT8 shouldForce = LUAh_ShouldDamage(target, inflictor, source, damage); if (P_MobjWasRemoved(target)) return (shouldForce == 1); // mobj was removed - if (P_MobjWasRemoved(source)) - source = NULL; if (shouldForce == 1) force = true; else if (shouldForce == 2) @@ -2638,6 +2636,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da P_ResetPlayer(target->player); } else + { switch (target->type) { case MT_EGGMOBILE2: // egg slimer @@ -2651,9 +2650,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da P_SetMobjState(target, target->info->painstate); break; } - - if (P_MobjWasRemoved(target)) - return false; + } if (!P_MobjWasRemoved(target)) { From 81a14995da05f7f35a4612b12d21b40d4c55cad1 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 21 Oct 2024 06:14:24 +0200 Subject: [PATCH 3/3] trailing space hell --- src/k_kart.c | 95 ++++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index f71ceb049..b5a70ec4d 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -725,34 +725,34 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_showinput); CV_RegisterVar(&cv_showlaptimes); CV_RegisterVar(&cv_newspeedometer); - + CV_RegisterVar(&cv_battlespeedo); - + CV_RegisterVar(&cv_saltyhop); CV_RegisterVar(&cv_saltyhopsfx); CV_RegisterVar(&cv_saltysquish); - + //Colourized HUD CV_RegisterVar(&cv_colorizedhud); CV_RegisterVar(&cv_colorizedhudcolor); CV_RegisterVar(&cv_colorizeditembox); - + CV_RegisterVar(&cv_darkitembox); - + CV_RegisterVar(&cv_biglaps); - + CV_RegisterVar(&cv_highresportrait); - + CV_RegisterVar(&cv_slamsound); - + CV_RegisterVar(&cv_minihead); CV_RegisterVar(&cv_showminimapnames); CV_RegisterVar(&cv_showlapemblem); - - CV_RegisterVar(&cv_stagetitle); - + + CV_RegisterVar(&cv_stagetitle); + CV_RegisterVar(&cv_lessflicker); - + CV_RegisterVar(&cv_mouseturn); } @@ -3197,7 +3197,7 @@ static void K_StretchPlayerGravity(player_t *p) I_Assert(p != NULL); I_Assert(p->mo != NULL); I_Assert(!P_MobjWasRemoved(p->mo)); - + if (p->mo->slamsoundtimer) p->mo->slamsoundtimer--; @@ -3233,7 +3233,7 @@ static void K_StretchPlayerGravity(player_t *p) slamDiv = 0; else slamDiv = FixedDiv(p->mo->stretchslam, stretchScaleFactor); - + p->mo->spritexscale = (dxs+(((slamDiv*2)/3)*2)); p->mo->spriteyscale = (dys-(slamDiv)); if (p->mo->stretchslam > 0) @@ -3243,7 +3243,7 @@ static void K_StretchPlayerGravity(player_t *p) } } -static void K_QuiteSaltyHop(player_t *p) +static void K_QuiteSaltyHop(player_t *p) { // what the fuck is this haya fixed_t mos = FRACUNIT; // doesnt work correctly if it isnt :/ @@ -3265,7 +3265,7 @@ static void K_QuiteSaltyHop(player_t *p) p->mo->salty_zoffset = 0; p->mo->salty_momz = 0; p->mo->init_salty = true; - } + } else if ((p->mo->salty_jump)) { if (p->mo->eflags & MFE_JUSTHITFLOOR) { p->mo->salty_zoffset = 0; @@ -3299,7 +3299,7 @@ static void K_QuiteSaltyHop(player_t *p) p->mo->salty_jump = true; p->mo->salty_zoffset = 0; p->mo->salty_momz = 6*mos; - if (cv_saltyhopsfx.value) + if (cv_saltyhopsfx.value) S_StartSound(p->mo, sfx_s25a); } } @@ -4460,7 +4460,6 @@ void K_RepairOrbitChain(mobj_t *orbit) if (orbit->target && orbit->target->player) { player_t *player = orbit->target->player; - INT32 num = 0; mobj_t *cur = orbit->target->hnext; @@ -7111,7 +7110,7 @@ void K_LoadKartHUDGraphics(void) kp_karmasticker = W_CachePatchName("K_STKARM", PU_HUDGFX); kp_splitkarmabomb = W_CachePatchName("K_SPTKRM", PU_HUDGFX); kp_timeoutsticker = W_CachePatchName("K_STTOUT", PU_HUDGFX); - + if (xtra_speedo) // snowy speedometer { skp_smallsticker = W_CachePatchName("SP_SMSTC", PU_HUDGFX); @@ -7126,8 +7125,8 @@ void K_LoadKartHUDGraphics(void) { skp_smallsticker3 = W_CachePatchName("SP_SM3TC", PU_HUDGFX); } - - if (achi_speedo) + + if (achi_speedo) { skp_smallstickerachi = W_CachePatchName("SP_AMSTC", PU_HUDGFX); skp_speedpatchesachi[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd @@ -7137,7 +7136,7 @@ void K_LoadKartHUDGraphics(void) skp_speedpatchesachi[4] = W_CachePatchName("SP_APERC", PU_HUDGFX); } - if (big_lap){ + if (big_lap){ kp_lapstickerbig = W_CachePatchName("K_STLAPB", PU_HUDGFX); kp_lapstickerbig2 = W_CachePatchName("K_STLA2B", PU_HUDGFX); } @@ -7159,8 +7158,8 @@ void K_LoadKartHUDGraphics(void) kp_itembgclr[3] = W_CachePatchName("K_ISBCD", PU_HUDGFX); kp_itemmulstickerclr[1] = W_CachePatchName("K_ISMULC", PU_HUDGFX); kp_itemmulstickerclr[0] = W_CachePatchName("K_ITMULC", PU_HUDGFX); - - if (big_lap_color){ + + if (big_lap_color){ kp_lapstickerbigclr = W_CachePatchName("K_SCLAPB", PU_HUDGFX); kp_lapstickerbig2clr = W_CachePatchName("K_SCLA2B", PU_HUDGFX); } @@ -7170,8 +7169,8 @@ void K_LoadKartHUDGraphics(void) if (xtra_speedo3 && xtra_speedo_clr3) // 80x11 patch scaled to size skp_smallstickerclr3 = W_CachePatchName("SC_SM3TC", PU_HUDGFX); - - if (achi_speedo && achi_speedo_clr) + + if (achi_speedo && achi_speedo_clr) { skp_smallstickerachiclr = W_CachePatchName("SC_AMSTC", PU_HUDGFX); skp_speedpatchesachiclr[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd @@ -7202,13 +7201,13 @@ void K_LoadKartHUDGraphics(void) // Nametags if (nametaggfx) { - + nametagpic = W_CachePatchName("NTLINE", PU_HUDGFX); nametagline = W_CachePatchName("NTLINEV", PU_HUDGFX); nametagspeed = W_CachePatchName("NTSP", PU_HUDGFX); nametagweight = W_CachePatchName("NTWH", PU_HUDGFX); } - + if (driftgaugegfx){ driftgauge = W_CachePatchName("K_DGAU", PU_HUDGFX); driftgaugecolor = W_CachePatchName("K_DCAU", PU_HUDGFX); @@ -7775,7 +7774,7 @@ static void K_drawKartStats(void) flags = V_SNAPTOBOTTOM|V_SNAPTOLEFT; UINT8 splitnum = 0; - + for (; splitnum < MAXSPLITSCREENPLAYERS; ++splitnum) { if (stplyr == &players[displayplayers[splitnum]]) @@ -7784,7 +7783,7 @@ static void K_drawKartStats(void) if (!LUA_HudEnabled(hud_statdisplay)) return; - + //Internal offset for speedometer if (cv_kartspeedometer.value) { @@ -8348,7 +8347,7 @@ static void K_DrawKartPositionNum(INT32 num) scale *= 2; overtake = true; // this is used for splitscreen stuff in conjunction with flipdraw. } - + if (splitscreen || (cv_showinput.value && !splitscreen)) scale /= 2; @@ -8640,7 +8639,7 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I p = &players[tab[i].num]; if (cv_highresportrait.value) V_DrawSmallMappedPatch(x, y-4, 0, R_GetSkinFaceWant(p), colormap); - else + else V_DrawMappedPatch(x, y-4, 0, R_GetSkinFaceRank(p), colormap); } /*if (G_BattleGametype() && players[tab[i].num].kartstuff[k_bumper] > 0) -- not enough space for this @@ -8782,7 +8781,7 @@ static void K_drawKartSpeedometer(void) //KartZ speedo fixed_t fuspeed = 0; INT32 spdpatch = 0; - + INT32 speedtype = 0; INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT); @@ -8810,7 +8809,7 @@ static void K_drawKartSpeedometer(void) } // man. - if ((cv_newspeedometer.value == 1) || (cv_newspeedometer.value == 2 && !xtra_speedo) || (cv_newspeedometer.value == 3 && !achi_speedo) || (cv_newspeedometer.value == 4 && !kartzspeedo) || (cv_newspeedometer.value == 5 && !xtra_speedo3)) + if ((cv_newspeedometer.value == 1) || (cv_newspeedometer.value == 2 && !xtra_speedo) || (cv_newspeedometer.value == 3 && !achi_speedo) || (cv_newspeedometer.value == 4 && !kartzspeedo) || (cv_newspeedometer.value == 5 && !xtra_speedo3)) { switch (speedtype) { case 1: @@ -8859,8 +8858,8 @@ static void K_drawKartSpeedometer(void) V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, (V_HUDTRANS|splitflags), (skp_smallstickerachi)); V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed, 3, NULL); V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatchesachi[cv_kartspeedometer.value]); - } - } + } + } else if (cv_newspeedometer.value == 5 && xtra_speedo3) // why bother if we dont? { if (K_UseColorHud() && xtra_speedo_clr3) //Colourized hud @@ -8874,19 +8873,19 @@ static void K_drawKartSpeedometer(void) V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed, 3, NULL); V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatches[cv_kartspeedometer.value]); } - + // Kart Z speedo bullshit... // Draw the Speed counter. else if (cv_newspeedometer.value == 4 && kartzspeedo) { fuspeed = FixedDiv(stplyr->speed, mapobjectscale)/FRACUNIT; - + #define NUM_INTERVALS 22 const int speedIntervals[NUM_INTERVALS] = {2, 5, 7, 10, 12, 15, 17, 20, 22, 25, 27, 30, 32, 35, 37, 40, 42, 45, 47, 50, 52, 55}; - for (int i = 0; i < NUM_INTERVALS; ++i) + for (int i = 0; i < NUM_INTERVALS; ++i) { - if (fuspeed < speedIntervals[i]) + if (fuspeed < speedIntervals[i]) { spdpatch = i; break; @@ -9076,9 +9075,9 @@ static boolean K_GetScreenCoords(vector2_t *vec, player_t *player, mobj_t *targe // project the angle to get our final X coordinate x = FixedMul(FINETANGENT(((x+ANGLE_90)>>ANGLETOFINESHIFT) & 4095), fov); if (splitscreen == 1) // divide by 320/200 (1.6) on 2P splitscreen - x = (x/2) + (x/8); + x = (x/2) + (x/8); x = x + xres; - + // now clip in screen-space if (!dontclip && (x < 0 || x > xres*2 || y < 0 || y > yres*2)) return false; @@ -9141,7 +9140,7 @@ static void K_drawNameTags(void) fixed_t maxdistance = (10*cv_nametagdist.value)* mapobjectscale; flipped = 0; fixed_t z; - + if (i > PLAYERSMASK) continue; if (!players[i].mo || P_MobjWasRemoved(players[i].mo) || players[i].spectator || !playeringame[i]) @@ -9180,7 +9179,7 @@ static void K_drawNameTags(void) trans = V_40TRANS; else if (distance > (maxdistance*3/5)) trans = V_20TRANS; - else + else trans = 0; break; case 3: @@ -9380,7 +9379,7 @@ skipcrap: if (!K_GetScreenCoords(&pos, stplyr, stplyr->mo, FixedMul(cv_driftgaugeofs.value, cv_driftgaugeofs.value > 0 ? stplyr->mo->scale : mapobjectscale), false)) return; - basex = pos.x>>FRACBITS; + basex = pos.x>>FRACBITS; basey = pos.y>>FRACBITS; fixed_t barx; @@ -9654,12 +9653,12 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags) colormap = R_GetTranslationColormap(TC_RAINBOW, mo->color, GTC_CACHE); else colormap = R_GetLocalTranslationColormap(mo->skin, mo->localskin, mo->color, GTC_CACHE, skinlocal); - + if (cv_minihead.value) V_DrawFixedPatch(amxpos + (2*FRACUNIT), amypos + (2*FRACUNIT), FRACUNIT/2, flags, ((skinlocal) ? localfacemmapprefix : facemmapprefix)[skin], colormap); else V_DrawFixedPatch(amxpos, amypos, FRACUNIT, flags, ((skinlocal) ? localfacemmapprefix : facemmapprefix)[skin], colormap); - + if (cv_showminimapnames.value && !(modeattacking || gamestate == GS_TIMEATTACK)) { const char *player_name = va("%c%s", V_GetSkincolorChar(mo->color), player_names[mo->player - players]); @@ -10505,7 +10504,7 @@ void K_drawKartHUD(void) // Draw the item window if (LUA_HudEnabled(hud_item) && !freecam) - K_drawKartItem(); + K_drawKartItem(); if (cv_driftgauge.value && !modeattacking) {