diff --git a/src/d_main.c b/src/d_main.c index fdd24fb97..2b979e616 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -463,7 +463,7 @@ static boolean D_Display(void) viewssnum = i; #ifdef HWRENDER - if (rendermode != render_soft) + if (rendermode == render_opengl) HWR_RenderPlayerView(i, &players[displayplayers[i]]); else #endif diff --git a/src/d_netcmd.c b/src/d_netcmd.c index f4a4838cc..4ca65e956 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -835,6 +835,8 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_recordmultiplayerdemos); CV_RegisterVar(&cv_netdemosyncquality); CV_RegisterVar(&cv_maxdemosize); + CV_RegisterVar(&cv_demochangemap); + CV_RegisterVar(&cv_keyboardlayout); } @@ -2970,6 +2972,10 @@ static void Command_Map_f(void) } } + // spend atleast 35 seconds in one map + if (cv_demochangemap.value && demo.recording && demo.savemode != DSM_NOTSAVING && (timeinmap > 1463) && ((cv_demochangemap.value == 2 && newmapnum == gamemap) || newmapnum != gamemap)) + G_SaveDemo(); + fromlevelselect = false; D_MapChange(newmapnum, newgametype, newencoremode, newresetplayers, 0, false, false); diff --git a/src/g_game.c b/src/g_game.c index 1040f6638..060b2e9e3 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -346,6 +346,9 @@ consvar_t cv_netdemosyncquality = {"netdemo_syncquality", "1", CV_SAVE, netdemos static CV_PossibleValue_t maxdemosize_cons_t[] = {{10, "MIN"}, {100, "MAX"}, {0, NULL}}; consvar_t cv_maxdemosize = {"maxdemosize", "10", CV_SAVE, maxdemosize_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +static CV_PossibleValue_t demochangemap_cons_t[] = {{0, "Disabled"}, {1, "Diff Map"}, {2, "Always"}, {0, NULL}}; +consvar_t cv_demochangemap = {"netdemo_savemapchange", "Disabled", CV_SAVE, demochangemap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; + static UINT8 *savebuffer; // Analog Control diff --git a/src/g_game.h b/src/g_game.h index 977cc4dc3..83d85ed91 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -39,7 +39,7 @@ extern UINT8 *demo_p; // ====================================== // demoplaying back and demo recording -extern consvar_t cv_recordmultiplayerdemos, cv_netdemosyncquality, cv_maxdemosize; +extern consvar_t cv_recordmultiplayerdemos, cv_netdemosyncquality, cv_maxdemosize, cv_demochangemap; // Publicly-accessible demo vars struct demovars_s { diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index c2754aa01..ca20cc003 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -5088,6 +5088,7 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) float x1, x2; float z1, z2; float rightsin, rightcos; + float this_scale; spritedef_t *sprdef; spriteframe_t *sprframe; size_t lumpoff; @@ -5120,6 +5121,8 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) R_InterpolatePrecipMobjState(thing, FRACUNIT, &interp); } + this_scale = FIXED_TO_FLOAT(interp.scale); + // transform the origin point tr_x = FIXED_TO_FLOAT(interp.x) - gr_viewx; tr_y = FIXED_TO_FLOAT(interp.y) - gr_viewy; @@ -5172,6 +5175,9 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) x2 = FIXED_TO_FLOAT(spritecachedinfo[lumpoff].width - spritecachedinfo[lumpoff].offset); } + x1 *= this_scale; + x2 *= this_scale; + z1 = tr_y + x1 * rightsin; z2 = tr_y - x2 * rightsin; x1 = tr_x + x1 * rightcos; @@ -5199,8 +5205,8 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) #endif // set top/bottom coords - vis->gzt = FIXED_TO_FLOAT(interp.z + spritecachedinfo[lumpoff].topoffset); - vis->gz = vis->gzt - FIXED_TO_FLOAT(spritecachedinfo[lumpoff].height); + vis->gzt = FIXED_TO_FLOAT(interp.z) + (FIXED_TO_FLOAT(spritecachedinfo[lumpoff].topoffset) * this_scale); + vis->gz = vis->gzt - (FIXED_TO_FLOAT(spritecachedinfo[lumpoff].height) * this_scale); vis->precip = true; } @@ -5679,17 +5685,16 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player) { const boolean skybox = (skyboxmo[0] && cv_skybox.value); // True if there's a skybox object and skyboxes are on + FRGBAFloat ClearColor; + + ClearColor.red = 0.0f; + ClearColor.green = 0.0f; + ClearColor.blue = 0.0f; + ClearColor.alpha = 1.0f; + // Clear the color buffer, stops HOMs. Also seems to fix the skybox issue on Intel GPUs. if (viewnumber == 0) // Only do it if it's the first screen being rendered - { - FRGBAFloat ClearColor; - - ClearColor.red = 0.0f; - ClearColor.green = 0.0f; - ClearColor.blue = 0.0f; - ClearColor.alpha = 1.0f; HWD.pfnClearBuffer(true, false, false, &ClearColor); - } if (cv_grshaders.value) HWD.pfnSetShaderInfo(HWD_SHADERINFO_LEVELTIME, (INT32)leveltime); // The water surface shader needs the leveltime. @@ -5849,12 +5854,7 @@ void HWR_Startup(void) #endif if (msaa) - { - if (a2c) - HWD.pfnSetSpecialState(HWD_SET_MSAA, 2); - else - HWD.pfnSetSpecialState(HWD_SET_MSAA, 1); - } + HWD.pfnSetSpecialState(HWD_SET_MSAA, a2c ? 2 : 1); } startupdone = true; } @@ -5957,7 +5957,7 @@ void HWR_DoPostProcessor(player_t *player) HWD.pfnDrawPolygon(&Surf, v, 4, PF_Modulated|PF_Translucent|PF_NoTexture|PF_NoDepthTest); } - if (!cv_grscreentextures.value) // screen textures are needed for the rest of the effects + if (cv_grscreentextures.value != 2) // screen textures are needed for the rest of the effects return; // Capture the screen for intermission and screen waving @@ -6005,7 +6005,7 @@ void HWR_DoPostProcessor(player_t *player) HWD.pfnPostImgRedraw(v); // Capture the screen again for screen waving on the intermission - if(gamestate != GS_INTERMISSION) + if (gamestate != GS_INTERMISSION) HWD.pfnMakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1); } // Flipping of the screen isn't done here anymore diff --git a/src/m_menu.c b/src/m_menu.c index 5b5fc8f1a..83ed04ea7 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -628,10 +628,11 @@ static menuitem_t MISC_ReplayStartMenu[] = static menuitem_t MISC_ReplayOptionsMenu[] = { - {IT_CVAR|IT_STRING, NULL, "Record Replays", &cv_recordmultiplayerdemos, 0}, - {IT_CVAR|IT_STRING, NULL, "Sync Check Interval", &cv_netdemosyncquality, 10}, - {IT_CVAR|IT_STRING, NULL, "Max demo size (MiB)", &cv_maxdemosize, 20}, - {IT_CVAR|IT_STRING, NULL, "Replay Search Rate", &cv_replaysearchrate, 30}, + {IT_CVAR|IT_STRING, NULL, "Record Replays", &cv_recordmultiplayerdemos, 0}, + {IT_CVAR|IT_STRING, NULL, "Save Replays on Map change", &cv_demochangemap, 10}, + {IT_CVAR|IT_STRING, NULL, "Sync Check Interval", &cv_netdemosyncquality, 20}, + {IT_CVAR|IT_STRING, NULL, "Max demo size (MiB)", &cv_maxdemosize, 30}, + {IT_CVAR|IT_STRING, NULL, "Replay Search Rate", &cv_replaysearchrate, 40}, }; static tic_t playback_last_menu_interaction_leveltime = 0; diff --git a/src/p_mobj.c b/src/p_mobj.c index 30455aa45..a53025419 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -3633,7 +3633,7 @@ boolean P_PrecipThinker(precipmobj_t *mobj) return false; mobj->z = mobj->ceilingz; - mobj->momz = mobj->info->speed; + mobj->momz = cv_mobjscaleprecip.value ? FixedMul(mobj->info->speed, mapobjectscale) : mobj->info->speed; mobj->precipflags &= ~PCF_SPLASH; R_ResetPrecipitationMobjInterpolationState(mobj); } @@ -9975,7 +9975,7 @@ static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype mobj->ceilingz = P_GetSectorCeilingZAt(mobj->subsector->sector, x, y); mobj->z = z; - mobj->momz = info->speed; + mobj->momz = cv_mobjscaleprecip.value ? FixedMul(info->speed, mapobjectscale) : info->speed; mobj->thinker.function.acp1 = (actionf_p1)P_NullPrecipThinker; P_AddThinker(&mobj->thinker); diff --git a/src/p_spec.c b/src/p_spec.c index f09e06d75..c022ef384 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -1810,7 +1810,7 @@ void P_SwitchWeather(INT32 weathernum) precipmobj->tics = st->tics; precipmobj->sprite = st->sprite; precipmobj->frame = st->frame; - precipmobj->momz = mobjinfo[MT_RAIN].speed; + precipmobj->momz = cv_mobjscaleprecip.value ? FixedMul(mobjinfo[MT_RAIN].speed, mapobjectscale) : mobjinfo[MT_RAIN].speed; precipmobj->precipflags &= ~(PCF_INVISIBLE|PCF_SPLASH); // P_PrecipThinker will add this again if it needs to } @@ -1835,7 +1835,7 @@ void P_SwitchWeather(INT32 weathernum) precipmobj->tics = st->tics; precipmobj->sprite = st->sprite; precipmobj->frame = st->frame; - precipmobj->momz = mobjinfo[MT_SNOWFLAKE].speed; + precipmobj->momz = cv_mobjscaleprecip.value ? FixedMul(mobjinfo[MT_SNOWFLAKE].speed, mapobjectscale) : mobjinfo[MT_SNOWFLAKE].speed; precipmobj->precipflags &= ~(PCF_INVISIBLE|PCF_SPLASH); // P_PrecipThinker will add this again if it needs to } diff --git a/src/r_fps.c b/src/r_fps.c index b46c6e51b..9ccba8a7b 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -90,13 +90,17 @@ static size_t levelinterpolators_len; static size_t levelinterpolators_size; -static fixed_t R_LerpFixed(fixed_t from, fixed_t to, fixed_t frac) +static inline fixed_t R_LerpFixed(fixed_t from, fixed_t to, fixed_t frac) { + if (from == to) + return to; return from + FixedMul(frac, to - from); } -static angle_t R_LerpAngle(angle_t from, angle_t to, fixed_t frac) +static inline angle_t R_LerpAngle(angle_t from, angle_t to, fixed_t frac) { + if (from == to) + return to; return from + FixedMul(frac, to - from); } @@ -281,11 +285,6 @@ angle_t R_InterpolateAngle(angle_t from, angle_t to) return (R_LerpAngle(from, to, rendertimefrac)); }*/ -#define IFCHANGED(a, b)\ -if (mobj->a == mobj->b)\ -(out->a = mobj->a);\ -else - void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out) { if (frac == FRACUNIT) @@ -307,60 +306,32 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out) return; } - IFCHANGED(x, old_x) - out->x = R_LerpFixed(mobj->old_x, mobj->x, frac); - - IFCHANGED(y, old_y) - out->y = R_LerpFixed(mobj->old_y, mobj->y, frac); - - IFCHANGED(z, old_z) - out->z = R_LerpFixed(mobj->old_z, mobj->z, frac); - - IFCHANGED(spritexscale, old_spritexscale) - out->spritexscale = mobj->resetinterp ? mobj->spritexscale : R_LerpFixed(mobj->old_spritexscale, mobj->spritexscale, frac); - - IFCHANGED(spriteyscale, old_spriteyscale) - out->spriteyscale = mobj->resetinterp ? mobj->spriteyscale : R_LerpFixed(mobj->old_spriteyscale, mobj->spriteyscale, frac); - - IFCHANGED(spritexoffset, old_spritexoffset) - out->spritexoffset = mobj->resetinterp ? mobj->spritexoffset : R_LerpFixed(mobj->old_spritexoffset, mobj->spritexoffset, frac); - - IFCHANGED(spriteyoffset, old_spriteyoffset) - out->spriteyoffset = mobj->resetinterp ? mobj->spriteyoffset : R_LerpFixed(mobj->old_spriteyoffset, mobj->spriteyoffset, frac); - - IFCHANGED(scale, old_scale) - out->scale = mobj->resetinterp ? mobj->scale : R_LerpFixed(mobj->old_scale, mobj->scale, frac); - + out->x = R_LerpFixed(mobj->old_x, mobj->x, frac); + out->y = R_LerpFixed(mobj->old_y, mobj->y, frac); + out->z = R_LerpFixed(mobj->old_z, mobj->z, frac); + out->spritexscale = mobj->resetinterp ? mobj->spritexscale : R_LerpFixed(mobj->old_spritexscale, mobj->spritexscale, frac); + out->spriteyscale = mobj->resetinterp ? mobj->spriteyscale : R_LerpFixed(mobj->old_spriteyscale, mobj->spriteyscale, frac); + out->spritexoffset = mobj->resetinterp ? mobj->spritexoffset : R_LerpFixed(mobj->old_spritexoffset, mobj->spritexoffset, frac); + out->spriteyoffset = mobj->resetinterp ? mobj->spriteyoffset : R_LerpFixed(mobj->old_spriteyoffset, mobj->spriteyoffset, frac); + out->scale = mobj->resetinterp ? mobj->scale : R_LerpFixed(mobj->old_scale, mobj->scale, frac); //out->subsector = R_PointInSubsector(out->x, out->y); // why was this even done? out->subsector = mobj->subsector; if (mobj->player) - { - IFCHANGED(angle, player->old_frameangle) - out->angle = mobj->resetinterp ? mobj->player->frameangle : R_LerpAngle(mobj->player->old_frameangle, mobj->player->frameangle, frac); - } + out->angle = mobj->resetinterp ? mobj->player->frameangle : R_LerpAngle(mobj->player->old_frameangle, mobj->player->frameangle, frac); else - { - IFCHANGED(angle, old_angle) - out->angle = mobj->resetinterp ? mobj->angle : R_LerpAngle(mobj->old_angle, mobj->angle, frac); - } + out->angle = mobj->resetinterp ? mobj->angle : R_LerpAngle(mobj->old_angle, mobj->angle, frac); #ifdef HWRENDER if (cv_grmdls.value) { // pitch roll stuff - IFCHANGED(pitch, old_pitch) - out->pitch = mobj->resetinterp ? mobj->pitch : R_LerpAngle(mobj->old_pitch, mobj->pitch, frac); - - IFCHANGED(roll, old_roll) - out->roll = mobj->resetinterp ? mobj->roll : R_LerpAngle(mobj->old_roll, mobj->roll, frac); + out->pitch = mobj->resetinterp ? mobj->pitch : R_LerpAngle(mobj->old_pitch, mobj->pitch, frac); + out->roll = mobj->resetinterp ? mobj->roll : R_LerpAngle(mobj->old_roll, mobj->roll, frac); // and the slope stuff - IFCHANGED(slopepitch, old_slopepitch) - out->slopepitch = mobj->resetinterp ? mobj->slopepitch : R_LerpAngle(mobj->old_slopepitch, mobj->slopepitch, frac); - - IFCHANGED(sloperoll, old_sloperoll) - out->sloperoll = mobj->resetinterp ? mobj->sloperoll : R_LerpAngle(mobj->old_sloperoll, mobj->sloperoll, frac); + out->slopepitch = mobj->resetinterp ? mobj->slopepitch : R_LerpAngle(mobj->old_slopepitch, mobj->slopepitch, frac); + out->sloperoll = mobj->resetinterp ? mobj->sloperoll : R_LerpAngle(mobj->old_sloperoll, mobj->sloperoll, frac); } else #endif @@ -379,7 +350,7 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst out->x = mobj->x; out->y = mobj->y; out->z = mobj->z; - out->scale = FRACUNIT; + out->scale = cv_mobjscaleprecip.value ? mapobjectscale : FRACUNIT; out->subsector = mobj->subsector; out->angle = mobj->angle; out->spritexscale = mobj->spritexscale; @@ -392,7 +363,7 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst out->x = R_LerpFixed(mobj->old_x, mobj->x, frac); out->y = R_LerpFixed(mobj->old_y, mobj->y, frac); out->z = R_LerpFixed(mobj->old_z, mobj->z, frac); - out->scale = FRACUNIT; + out->scale = cv_mobjscaleprecip.value ? mapobjectscale : FRACUNIT; out->spritexscale = mobj->spritexscale; out->spriteyscale = mobj->spriteyscale; out->spritexoffset = mobj->spritexoffset; @@ -400,14 +371,9 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst //out->subsector = R_PointInSubsector(out->x, out->y); // i dont understand lol out->subsector = mobj->subsector; - - //IFCHANGED(angle, old_angle) - //out->angle = R_LerpAngle(mobj->old_angle, mobj->angle, frac); - out->angle = mobj->angle; + out->angle = R_LerpAngle(mobj->old_angle, mobj->angle, frac); } -#undef IFCHANGED - static void AddInterpolator(levelinterpolator_t* interpolator) { if (levelinterpolators_len >= levelinterpolators_size) @@ -602,11 +568,6 @@ void R_ClearLevelInterpolatorState(thinker_t *thinker) } } -#define IFCHANGED(a, b, c)\ -if (interp->a == interp->b)\ - (interp->a = interp->c);\ -else - void R_ApplyLevelInterpolators(fixed_t frac) { size_t i, ii; @@ -619,57 +580,35 @@ void R_ApplyLevelInterpolators(fixed_t frac) { case LVLINTERP_SectorPlane: if (interp->sectorplane.ceiling) - { - IFCHANGED(sectorplane.sector->ceilingheight, sectorplane.oldheight, sectorplane.bakheight) - interp->sectorplane.sector->ceilingheight = R_LerpFixed(interp->sectorplane.oldheight, interp->sectorplane.bakheight, frac); - } + interp->sectorplane.sector->ceilingheight = R_LerpFixed(interp->sectorplane.oldheight, interp->sectorplane.bakheight, frac); else - { - IFCHANGED(sectorplane.sector->floorheight, sectorplane.oldheight, sectorplane.bakheight) - interp->sectorplane.sector->floorheight = R_LerpFixed(interp->sectorplane.oldheight, interp->sectorplane.bakheight, frac); - } + interp->sectorplane.sector->floorheight = R_LerpFixed(interp->sectorplane.oldheight, interp->sectorplane.bakheight, frac); interp->sectorplane.sector->moved = true; break; case LVLINTERP_SectorScroll: if (interp->sectorscroll.ceiling) { - IFCHANGED(sectorscroll.sector->ceiling_xoffs, sectorscroll.oldxoffs, sectorscroll.bakxoffs) - interp->sectorscroll.sector->ceiling_xoffs = R_LerpFixed(interp->sectorscroll.oldxoffs, interp->sectorscroll.bakxoffs, frac); - - IFCHANGED(sectorscroll.sector->ceiling_yoffs, sectorscroll.oldyoffs, sectorscroll.bakyoffs) - interp->sectorscroll.sector->ceiling_yoffs = R_LerpFixed(interp->sectorscroll.oldyoffs, interp->sectorscroll.bakyoffs, frac); + interp->sectorscroll.sector->ceiling_xoffs = R_LerpFixed(interp->sectorscroll.oldxoffs, interp->sectorscroll.bakxoffs, frac); + interp->sectorscroll.sector->ceiling_yoffs = R_LerpFixed(interp->sectorscroll.oldyoffs, interp->sectorscroll.bakyoffs, frac); } else { - IFCHANGED(sectorscroll.sector->floor_xoffs, sectorscroll.oldxoffs, sectorscroll.bakxoffs) - interp->sectorscroll.sector->floor_xoffs = R_LerpFixed(interp->sectorscroll.oldxoffs, interp->sectorscroll.bakxoffs, frac); - - IFCHANGED(sectorscroll.sector->floor_yoffs, sectorscroll.oldyoffs, sectorscroll.bakyoffs) - interp->sectorscroll.sector->floor_yoffs = R_LerpFixed(interp->sectorscroll.oldyoffs, interp->sectorscroll.bakyoffs, frac); + interp->sectorscroll.sector->floor_xoffs = R_LerpFixed(interp->sectorscroll.oldxoffs, interp->sectorscroll.bakxoffs, frac); + interp->sectorscroll.sector->floor_yoffs = R_LerpFixed(interp->sectorscroll.oldyoffs, interp->sectorscroll.bakyoffs, frac); } break; case LVLINTERP_SideScroll: - IFCHANGED(sidescroll.side->textureoffset, sidescroll.oldtextureoffset, sidescroll.baktextureoffset) - interp->sidescroll.side->textureoffset = R_LerpFixed(interp->sidescroll.oldtextureoffset, interp->sidescroll.baktextureoffset, frac); - - IFCHANGED(sidescroll.side->rowoffset, sidescroll.oldrowoffset, sidescroll.bakrowoffset) - interp->sidescroll.side->rowoffset = R_LerpFixed(interp->sidescroll.oldrowoffset, interp->sidescroll.bakrowoffset, frac); + interp->sidescroll.side->textureoffset = R_LerpFixed(interp->sidescroll.oldtextureoffset, interp->sidescroll.baktextureoffset, frac); + interp->sidescroll.side->rowoffset = R_LerpFixed(interp->sidescroll.oldrowoffset, interp->sidescroll.bakrowoffset, frac); break; case LVLINTERP_Polyobj: for (ii = 0; ii < interp->polyobj.vertices_size; ii++) { - IFCHANGED(polyobj.polyobj->vertices[ii]->x, polyobj.oldvertices[ii * 2 ], polyobj.bakvertices[ii * 2 ]) - interp->polyobj.polyobj->vertices[ii]->x = R_LerpFixed(interp->polyobj.oldvertices[ii * 2 ], interp->polyobj.bakvertices[ii * 2 ], frac); - - IFCHANGED(polyobj.polyobj->vertices[ii]->y, polyobj.oldvertices[ii * 2 + 1], polyobj.bakvertices[ii * 2 + 1]) - interp->polyobj.polyobj->vertices[ii]->y = R_LerpFixed(interp->polyobj.oldvertices[ii * 2 + 1], interp->polyobj.bakvertices[ii * 2 + 1], frac); + interp->polyobj.polyobj->vertices[ii]->x = R_LerpFixed(interp->polyobj.oldvertices[ii * 2 ], interp->polyobj.bakvertices[ii * 2 ], frac); + interp->polyobj.polyobj->vertices[ii]->y = R_LerpFixed(interp->polyobj.oldvertices[ii * 2 + 1], interp->polyobj.bakvertices[ii * 2 + 1], frac); } - IFCHANGED(polyobj.polyobj->centerPt.x, polyobj.oldcx, polyobj.bakcx) - interp->polyobj.polyobj->centerPt.x = R_LerpFixed(interp->polyobj.oldcx, interp->polyobj.bakcx, frac); - - IFCHANGED(polyobj.polyobj->centerPt.y, polyobj.oldcy, polyobj.bakcy) - interp->polyobj.polyobj->centerPt.y = R_LerpFixed(interp->polyobj.oldcy, interp->polyobj.bakcy, frac); - + interp->polyobj.polyobj->centerPt.x = R_LerpFixed(interp->polyobj.oldcx, interp->polyobj.bakcx, frac); + interp->polyobj.polyobj->centerPt.y = R_LerpFixed(interp->polyobj.oldcy, interp->polyobj.bakcy, frac); break; /*case LVLINTERP_DynSlope: R_LerpVector3(&interp->dynslope.oldo, &interp->dynslope.bako, frac, &interp->dynslope.slope->o); @@ -680,8 +619,6 @@ void R_ApplyLevelInterpolators(fixed_t frac) } } -#undef IFCHANGED - void R_RestoreLevelInterpolators(void) { size_t i, ii; diff --git a/src/r_main.c b/src/r_main.c index b9b30a095..629358d50 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1468,12 +1468,12 @@ void R_SetupFrame(player_t *player, boolean skybox) else if (player->playerstate == PST_DEAD || player->exiting) chasecam = true; // force chasecam on - if (chasecam && !thiscam->chase) + if (chasecam && (thiscam && !thiscam->chase)) { P_ResetCamera(player, thiscam); thiscam->chase = true; } - else if (!chasecam) + else if (thiscam && !chasecam) thiscam->chase = false; newview->sky = !skybox; @@ -1486,7 +1486,7 @@ void R_SetupFrame(player_t *player, boolean skybox) newview->aim = player->awayviewaiming; newview->angle = viewmobj->angle; } - else if (!player->spectator && chasecam) + else if (!player->spectator && (thiscam && chasecam)) // use outside cam view { viewmobj = NULL; @@ -1532,7 +1532,7 @@ void R_SetupFrame(player_t *player, boolean skybox) newview->player = player; - if (chasecam && !player->awayviewtics && !player->spectator) + if ((thiscam && chasecam) && !player->awayviewtics && !player->spectator) { newview->x = thiscam->x; newview->y = thiscam->y; @@ -1551,7 +1551,7 @@ void R_SetupFrame(player_t *player, boolean skybox) newview->x += quake.x; newview->y += quake.y; - if (viewmobj->subsector && thiscam->subsector->sector) + if (!P_MobjWasRemoved(viewmobj) && viewmobj->subsector && thiscam && thiscam->subsector->sector) newview->sector = viewmobj->subsector->sector; else newview->sector = R_PointInSubsector(newview->x, newview->y)->sector; diff --git a/src/r_segs.c b/src/r_segs.c index babad0ac1..718f93f40 100644 --- a/src/r_segs.c +++ b/src/r_segs.c @@ -1686,7 +1686,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) lastopening = openings + pos; if (oldopenings == NULL) - return; + return; // borrowed fix from *cough* zdoom *cough* // [RH] We also need to adjust the openings pointers that @@ -2692,7 +2692,6 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (rover->norender == leveltime) continue; - // Let the renderer know this sector is sloped. if (*rover->b_slope || *rover->t_slope) frontsector->hasslope = true; diff --git a/src/r_things.c b/src/r_things.c index ad1e3ca05..100ca87de 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -902,6 +902,7 @@ static void R_DrawPrecipitationVisSprite(vissprite_t *vis) INT32 texturecolumn; fixed_t frac; patch_t *patch; + fixed_t this_scale = vis->thingscale; INT64 overflow_test; //Fab : R_InitSprites now sets a wad lump number @@ -925,7 +926,7 @@ static void R_DrawPrecipitationVisSprite(vissprite_t *vis) dc_colormap += COLORMAP_REMAPOFFSET; dc_iscale = FixedDiv(FRACUNIT, vis->scale); - dc_texturemid = vis->texturemid; + dc_texturemid = FixedDiv(vis->texturemid, this_scale); dc_texheight = 0; frac = vis->startfrac; @@ -1744,7 +1745,8 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) fixed_t iscale; //SoM: 3/17/2000 - fixed_t gz ,gzt; + fixed_t gz, gzt; + fixed_t this_scale; INT32 dist = 1; @@ -1770,6 +1772,8 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) R_InterpolatePrecipMobjState(thing, FRACUNIT, &interp); } + this_scale = interp.scale; + // transform the origin point tr_x = interp.x - viewx; tr_y = interp.y - viewy; @@ -1780,7 +1784,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) tz = gxt - gyt; // thing is behind view plane? - if (tz < MINZ) + if (tz < FixedMul(MINZ, this_scale)) return; gxt = -FixedMul(tr_x, viewsin); @@ -1821,14 +1825,14 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) lump = sprframe->lumpid[0]; //Fab: see note above // calculate edges of the shape - tx -= spritecachedinfo[lump].offset; + tx -= FixedMul(spritecachedinfo[lump].offset, this_scale); x1 = (centerxfrac + FixedMul (tx,xscale)) >>FRACBITS; // off the right side? if (x1 > viewwidth) return; - tx += spritecachedinfo[lump].width; + tx += FixedMul(spritecachedinfo[lump].width, this_scale); x2 = ((centerxfrac + FixedMul (tx,xscale)) >>FRACBITS) - 1; // off the left side @@ -1846,8 +1850,8 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) } //SoM: 3/17/2000: Disregard sprites that are out of view.. - gzt = interp.z + spritecachedinfo[lump].topoffset; - gz = gzt - spritecachedinfo[lump].height; + gzt = interp.z + FixedMul(spritecachedinfo[lump].topoffset, this_scale); + gz = gzt - FixedMul(spritecachedinfo[lump].height, this_scale); if (thing->subsector->sector->cullheight) { @@ -1857,7 +1861,9 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) // store information in a vissprite vis = R_NewVisSprite(); - vis->scale = vis->sortscale = yscale; //<scale = FixedMul(yscale, this_scale); + vis->sortscale = yscale; //<thingscale = interp.scale; vis->dispoffset = 0; // Monster Iestyn: 23/11/15 vis->gx = interp.x; vis->gy = interp.y; @@ -1890,9 +1896,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) iscale = FixedDiv(FRACUNIT, xscale); vis->startfrac = 0; - vis->xiscale = iscale; - - vis->thingscale = interp.scale; + vis->xiscale = FixedDiv(iscale, this_scale); if (vis->x1 > x1) vis->startfrac += vis->xiscale*(vis->x1-x1);