diff --git a/src/d_main.c b/src/d_main.c index a3a769dac..5f31f53c9 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1149,13 +1149,19 @@ static void D_FindAddonsToAutoload(void) // ok so theres still issues with players adding stuff to autoload by accident // sometimes this stuff contains maps // you can probably imagine how that goes in a netgame.... - if (W_CheckAutoLoadContainsMap(wadsToAutoload)) + int retmap = W_CheckAutoLoadContainsMap(wadsToAutoload); + if (retmap == -1) + { + CONS_Alert(CONS_WARNING, "Autoload: file %s was not found or not valid.\n", wadsToAutoload); + continue; + } + if (retmap > 0) { CONS_Alert(CONS_WARNING, "Autoload: file %s contains map data, this WILL cause crashes and desynchs! skipping...\n", wadsToAutoload); continue; } - if (!postload && W_CheckPostLoadList(wadsToAutoload)) + if (!postload && W_CheckPostLoadList(wadsToAutoload) > 0) { CONS_Printf("Autoload: forcing postload for file %s\n", wadsToAutoload); postload = true; diff --git a/src/k_kart.c b/src/k_kart.c index f0fc5ec5c..d9c6a77eb 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1755,25 +1755,56 @@ void K_RespawnChecker(player_t *player) mobj_t *mo; angle_t newangle; fixed_t newx, newy, newz; - +#ifdef PHOBOS_BUILD + const fixed_t fscale = player->mo->scale; +#else + static const fixed_t fscale = FRACUNIT; // does NOT use scale, since this effect doesn't scale properly +#endif newangle = FixedAngle(((360/8)*i)*FRACUNIT); - newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31<mo->y + P_ReturnThrustY(player->mo, newangle, 31<mo->x + P_ReturnThrustX(player->mo, newangle, 31 * fscale); + newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31 * fscale); if (player->mo->eflags & MFE_VERTICALFLIP) newz = player->mo->z + player->mo->height; else newz = player->mo->z; mo = P_SpawnMobj(newx, newy, newz, MT_DEZLASER); - if (mo) + if (!P_MobjWasRemovedCompat(mo)) { if (player->mo->eflags & MFE_VERTICALFLIP) mo->eflags |= MFE_VERTICALFLIP; P_SetTarget(&mo->target, player->mo); mo->angle = newangle+ANGLE_90; - mo->momz = (8<mo); - P_SetScale(mo, (mo->destscale = FRACUNIT)); + mo->momz = (8 * fscale) * P_MobjFlip(player->mo); + P_SetScale(mo, (mo->destscale = fscale)); } +#ifndef PHOBOS_BUILD + // vanilla compat really is annoying....... + // but this stuff is messed up on mobjscaled maps + // and we gotta respawn it locally to avoid desynchs... + if (mapobjectscale != FRACUNIT) + { + // hide the normal lazers! + mo->flags2 |= MF2_DONTDRAW; + + newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 31 * player->mo->scale); + newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 31 * player->mo->scale); + + // now spawn our local lazers + mo = P_SpawnMobj(newx, newy, newz, MT_DEZLASER); + if (!P_MobjWasRemovedCompat(mo)) + { + if (player->mo->eflags & MFE_VERTICALFLIP) + mo->eflags |= MFE_VERTICALFLIP; + P_SetTarget(&mo->target, player->mo); + mo->angle = newangle+ANGLE_90; + mo->momz = (8 * player->mo->scale) * P_MobjFlip(player->mo); + P_SetScale(mo, (mo->destscale = player->mo->scale)); + + mo->islocal = true; // Keep this local! + } + } +#endif } } } @@ -3151,10 +3182,8 @@ static void K_SpawnDriftSparks(player_t *player) for (i = 0; i < 2; i++) { - fixed_t driftExtraScale = 0; - - angle_t thrustangle = (travelangle + ((i&1) ? -1 : 1)*ANGLE_135); - fixed_t smolscale = FixedMul(32*FRACUNIT, player->mo->scale); + const angle_t thrustangle = (travelangle + ((i&1) ? -1 : 1)*ANGLE_135); + const fixed_t smolscale = FixedMul(32*FRACUNIT, player->mo->scale); newx = player->mo->x + P_ReturnThrustX(player->mo, thrustangle, smolscale); newy = player->mo->y + P_ReturnThrustY(player->mo, thrustangle, smolscale); @@ -3166,9 +3195,9 @@ static void K_SpawnDriftSparks(player_t *player) spark->angle = travelangle-(ANGLE_45/5)*player->kartstuff[k_drift]; // scale increase while driftspark level gained timer is running - driftExtraScale = FixedDiv(player->driftsparkGrowTimer, DRIFTSPARKGROWTICS); + const fixed_t driftExtraScale = FixedDiv(player->driftsparkGrowTimer, DRIFTSPARKGROWTICS); spark->destscale = FixedMul(player->mo->scale, FRACUNIT + FixedMul(driftExtraScale, cv_driftsparkpulse.value)); - P_SetScale(spark, spark->destscale); // why not use what we calculated above? + P_SetScale(spark, spark->destscale); spark->momx = player->mo->momx/2; spark->momy = player->mo->momy/2; @@ -3263,7 +3292,7 @@ static void K_StretchPlayerGravity(player_t *player) fixed_t tempxscale = pmo->realxscale; fixed_t tempyscale = pmo->realyscale; - stretchScaleFactor = FixedDiv(FRACUNIT*60, cv_gravstretch.value); + stretchScaleFactor = FixedDiv(mapobjectscale*60, cv_gravstretch.value); stretchScaleFactor = min(stretchScaleFactor, MAXSTRETCHDIV); if (pmo->slamsoundtimer) @@ -3271,26 +3300,26 @@ static void K_StretchPlayerGravity(player_t *player) if (!P_IsObjectOnGround(pmo)) { - fixed_t pzmom = abs(pmo->momz); + const fixed_t pzmom = abs(pmo->momz); const fixed_t stretchDiv = FixedDiv(pzmom, stretchScaleFactor); - if (abs(pzmom/FRACUNIT) != 0) + if (abs(pzmom/mapobjectscale) != 0) { - if (((tempxscale-(stretchDiv))) > (tempxscale/5)) + if ((tempxscale - stretchDiv) > (tempxscale / 5)) { pmo->spritexscale = (tempxscale - stretchDiv); pmo->stretchslam = pzmom; } else - pmo->spritexscale = (tempxscale/5); + pmo->spritexscale = (tempxscale / 5); - pmo->spriteyscale = (tempyscale + ((stretchDiv*2)/3)); + pmo->spriteyscale = (tempyscale + ((stretchDiv * 2) / 3)); } } else if (pmo->stretchslam > 0) { // Funni slam sound when landing - if (cv_slamsound.value && (pmo->eflags & MFE_JUSTHITFLOOR) && !pmo->slamsoundtimer && (pmo->stretchslam > 4*FRACUNIT)) + if (cv_slamsound.value && (pmo->eflags & MFE_JUSTHITFLOOR) && !pmo->slamsoundtimer && (pmo->stretchslam > 4*mapobjectscale)) { S_StartSound(pmo, sfx_s3k4c); pmo->slamsoundtimer = TICRATE; @@ -3298,9 +3327,9 @@ static void K_StretchPlayerGravity(player_t *player) const fixed_t slamDiv = FixedDiv(pmo->stretchslam, stretchScaleFactor); - pmo->spritexscale = (tempxscale + (((slamDiv*2)/3)*2)); + pmo->spritexscale = (tempxscale + (((slamDiv * 2) / 3 ) * 2)); pmo->spriteyscale = (tempyscale - slamDiv); - pmo->stretchslam -= (4*FRACUNIT); + pmo->stretchslam -= (4*mapobjectscale); } else pmo->stretchslam = 0; @@ -3320,11 +3349,11 @@ static void K_SaltySquish(player_t *player) if (pmo->stretchslam > 0) { - const fixed_t slamDiv = FixedDiv(pmo->stretchslam, FRACUNIT*60); // stretchScaleFactor = FixedDiv(FRACUNIT*60, FRACUNIT) + const fixed_t slamDiv = FixedDiv(pmo->stretchslam, mapobjectscale*60); // stretchScaleFactor = FixedDiv(mapobjectscale*60, FRACUNIT) - pmo->spritexscale = (tempxscale + (((slamDiv*2)/3)*2)); + pmo->spritexscale = (tempxscale + (((slamDiv * 2) / 3) * 2)); pmo->spriteyscale = (tempyscale - slamDiv); - pmo->stretchslam -= (4*FRACUNIT); + pmo->stretchslam -= (4*mapobjectscale); } else pmo->stretchslam = 0; @@ -3393,7 +3422,7 @@ static void K_QuiteSaltyHop(player_t *player) psalty->momz = 0; // shlamma damma if (cv_saltysquish.value) - pmo->stretchslam += 8*FRACUNIT; + pmo->stretchslam += 8*mapobjectscale; } else if (psalty->zoffset > 0) { @@ -3656,7 +3685,7 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent) dust = P_SpawnMobj(rand_x, rand_y, mo->z, MT_WIPEOUTTRAIL); P_SetTarget(&dust->target, mo); - dust->angle = R_PointToAngle2(0,0,mo->momx,mo->momy); + dust->angle = R_PointToAngle2(0, 0, mo->momx, mo->momy); dust->destscale = mo->scale; P_SetScale(dust, mo->scale); K_FlipFromObject(dust, mo); @@ -3682,6 +3711,11 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent) void K_DriftDustHandling(mobj_t *spawner) { angle_t anglediff; +#ifdef PHOBOS_BUILD + const fixed_t fscale = spawner->scale; +#else + static const fixed_t fscale = FRACUNIT; // should be spawner->scale but the below calls P_Random! +#endif if (leveltime % 2 != 0 || !P_IsObjectOnGround(spawner)) return; @@ -3698,7 +3732,7 @@ void K_DriftDustHandling(mobj_t *spawner) { angle_t playerangle = spawner->angle; - if (spawner->player->speed < 5<player->speed < (5 * fscale)) return; if (spawner->player->cmd.forwardmove < 0) @@ -3709,7 +3743,7 @@ void K_DriftDustHandling(mobj_t *spawner) } else { - if (P_AproxDistance(spawner->momx, spawner->momy) < 5<momx, spawner->momy) < (5 * fscale)) return; anglediff = abs((signed)(spawner->angle - R_PointToAngle2(0, 0, spawner->momx, spawner->momy))); @@ -3722,13 +3756,29 @@ void K_DriftDustHandling(mobj_t *spawner) if (anglediff > ANG10*4) // Trying to turn further than 40 degrees { + mobj_t *dust = NULL; + fixed_t spawnx = P_RandomRange(-spawnrange, spawnrange)<x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST); - dust->momx = FixedMul(spawner->momx + (P_RandomRange(-speedrange, speedrange)<scale)/4); - dust->momy = FixedMul(spawner->momy + (P_RandomRange(-speedrange, speedrange)<scale)/4); - dust->momz = P_MobjFlip(spawner) * (P_RandomRange(1, 4) * (spawner->scale)); + + dust = P_SpawnMobj(spawner->x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST); + + const INT32 momxrand = P_RandomRange(-speedrange, speedrange); + const INT32 momyrand = P_RandomRange(-speedrange, speedrange); + const INT32 momzrand = P_RandomRange(1, 4); + + if (P_MobjWasRemovedCompat(dust)) + return; + +#ifdef PHOBOS_BUILD + dust->momx = FixedMul(spawner->momx + (momxrand * spawner->scale), 3*FRACUNIT/4); + dust->momy = FixedMul(spawner->momy + (momyrand * spawner->scale), 3*FRACUNIT/4); +#else + dust->momx = FixedMul(spawner->momx + (momxrand<scale)/4); + dust->momy = FixedMul(spawner->momy + (momyrand<scale)/4); +#endif + dust->momz = P_MobjFlip(spawner) * (momzrand * (spawner->scale)); P_SetScale(dust, spawner->scale/2); dust->destscale = spawner->scale * 3; dust->scalespeed = spawner->scale/12; @@ -3737,6 +3787,33 @@ void K_DriftDustHandling(mobj_t *spawner) S_StartSound(spawner, sfx_screec); K_MatchGenericExtraFlags(dust, spawner); + +#ifndef PHOBOS_BUILD + // vanilla compat really is annoying....... + // but this stuff is messed up on mobjscaled maps + // and we gotta respawn it locally to avoid desynchs... + if (mapobjectscale != FRACUNIT) + { + // hide the normal dust! + dust->flags2 |= MF2_DONTDRAW; + + // now spawn our dust locally + dust = P_SpawnMobj(spawner->x + spawnx, spawner->y + spawny, spawner->z, MT_DRIFTDUST); + + if (P_MobjWasRemovedCompat(dust)) + return; + + dust->momx = FixedMul(spawner->momx + (momxrand * spawner->scale), 3*FRACUNIT/4); + dust->momy = FixedMul(spawner->momy + (momyrand * spawner->scale), 3*FRACUNIT/4); + dust->momz = P_MobjFlip(spawner) * (momzrand * (spawner->scale)); + P_SetScale(dust, spawner->scale/2); + dust->destscale = spawner->scale * 3; + dust->scalespeed = spawner->scale/12; + dust->islocal = true; // Keep this local! + + K_MatchGenericExtraFlags(dust, spawner); + } +#endif } } diff --git a/src/p_mobj.c b/src/p_mobj.c index b57b14434..2355aa104 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6280,16 +6280,39 @@ static void P_MobjSceneryThink(mobj_t *mobj) case MT_SMOLDERING: if (leveltime % 2 == 0) { + mobj_t *smoke; fixed_t x = P_RandomRange(-35, 35)*mobj->scale; fixed_t y = P_RandomRange(-35, 35)*mobj->scale; fixed_t z = P_RandomRange(0, 70)*mobj->scale; - mobj_t *smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_SMOKE); + smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_SMOKE); P_SetMobjState(smoke, S_OPAQUESMOKE1); K_MatchGenericExtraFlags(smoke, mobj); smoke->scale = mobj->scale * 2; smoke->destscale = mobj->scale * 6; - smoke->momz = P_RandomRange(4, 9)*FRACUNIT*P_MobjFlip(smoke); + const INT32 momrand = P_RandomRange(4, 9); +#ifdef PHOBOS_BUILD + smoke->momz = momrand*mobj->scale*P_MobjFlip(smoke); +#else + smoke->momz = momrand*FRACUNIT*P_MobjFlip(smoke); + + // vanilla compat really is annoying....... + // but this stuff is messed up on mobjscaled maps + // so we gotta respawn it locally to avoid desynchs... + if (mapobjectscale != FRACUNIT) + { + // hide the smoke! + smoke->flags2 |= MF2_DONTDRAW; + + smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_SMOKE); + P_SetMobjState(smoke, S_OPAQUESMOKE1); + K_MatchGenericExtraFlags(smoke, mobj); + smoke->scale = mobj->scale * 2; + smoke->destscale = mobj->scale * 6; + smoke->momz = momrand*mobj->scale*P_MobjFlip(smoke); + smoke->islocal = true; // Keep this local! + } +#endif } break; case MT_BOOMPARTICLE: diff --git a/src/p_saveg.c b/src/p_saveg.c index a589f3d21..825a871f9 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -1109,6 +1109,10 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8 if (mobj->type == MT_HOOPCENTER && mobj->threshold == 4242) return; + // do not send over locally spawned mobjs + if (mobj->islocal) + return; + if (mobj->spawnpoint && mobj->info->doomednum != -1) { // spawnpoint is not modified but we must save it since it is an identifier @@ -1134,9 +1138,17 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8 if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0) #endif diff |= MD_MOM; +#ifdef PHOBOS_BUILD + if (mobj->radius != FixedMul(mapobjectscale, mobj->info->radius)) +#else if (mobj->radius != mobj->info->radius) +#endif diff |= MD_RADIUS; +#ifdef PHOBOS_BUILD + if (mobj->height != FixedMul(mapobjectscale, mobj->info->height)) +#else if (mobj->height != mobj->info->height) +#endif diff |= MD_HEIGHT; if (mobj->flags != mobj->info->flags) diff |= MD_FLAGS; @@ -1179,11 +1191,19 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8 diff |= MD_MOVEFACTOR; if (mobj->fuse) diff |= MD_FUSE; +#ifdef PHOBOS_BUILD + if (mobj->watertop != INT32_MAX) +#else if (mobj->watertop) +#endif diff |= MD_WATERTOP; if (mobj->waterbottom) diff |= MD_WATERBOTTOM; +#ifdef PHOBOS_BUILD + if (mobj->scale != mapobjectscale) +#else if (mobj->scale != FRACUNIT) +#endif diff |= MD_SCALE; if (mobj->destscale != mobj->scale) diff |= MD_DSCALE; @@ -2090,11 +2110,19 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) if (diff & MD_RADIUS) mobj->radius = READFIXED(save->p); else +#ifdef PHOBOS_BUILD + mobj->radius = FixedMul(mobj->info->radius, mapobjectscale); +#else mobj->radius = mobj->info->radius; +#endif if (diff & MD_HEIGHT) mobj->height = READFIXED(save->p); else +#ifdef PHOBOS_BUILD + mobj->height = FixedMul(mobj->info->height, mapobjectscale); +#else mobj->height = mobj->info->height; +#endif if (diff & MD_FLAGS) mobj->flags = READUINT32(save->p); else @@ -2166,12 +2194,20 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) mobj->fuse = READINT32(save->p); if (diff & MD_WATERTOP) mobj->watertop = READFIXED(save->p); +#ifdef PHOBOS_BUILD + else + mobj->watertop = INT32_MAX; +#endif if (diff & MD_WATERBOTTOM) mobj->waterbottom = READFIXED(save->p); if (diff & MD_SCALE) mobj->scale = READFIXED(save->p); else +#ifdef PHOBOS_BUILD + mobj->scale = mapobjectscale; +#else mobj->scale = FRACUNIT; +#endif if (diff & MD_DSCALE) mobj->destscale = READFIXED(save->p); else diff --git a/src/p_setup.c b/src/p_setup.c index 27cbf76a2..239462b25 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3424,7 +3424,13 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local) { // check if someone tries to load maps locally lol // do this here so we can skip loading the file anyways - if (W_CheckAutoLoadContainsMap(wadfilename)) + int retmap = W_CheckAutoLoadContainsMap(wadfilename); + if (retmap == -1) + { + CONS_Alert(CONS_WARNING, "addilelocal: file %s was not found or not valid.\n", wadfilename); + return UINT16_MAX; + } + if (retmap > 0) { CONS_Alert(CONS_WARNING, "addilelocal: locally added file %s contains map data, this WILL cause crashes and desynchs! not added.\n", wadfilename); return UINT16_MAX; diff --git a/src/r_draw_flush.cpp b/src/r_draw_flush.cpp index b135c6125..bb5e71b58 100644 --- a/src/r_draw_flush.cpp +++ b/src/r_draw_flush.cpp @@ -6,7 +6,7 @@ // Copyright (C) 1996 by id Software, Inc. // Copyright (C) 1999 by Chi Hoang, Lee Killough, Jim Flynn, Rand Phares, Ty Halderman // Copyright (C) 1999-2000 by Jess Haas, Nicolas Kalkhof, Colin Phipps, Florian Schulze -// Copyright (C) Copyright 2005, 2006 by Florian Schulze, Colin Phipps, Neil Stevens, Andrey Budko +// Copyright (C) 2005, 2006 by Florian Schulze, Colin Phipps, Neil Stevens, Andrey Budko // Copyright (C) 2013 by James Haley, Stephen McGranahan, et al. // // This program is free software distributed under the diff --git a/src/r_segs.cpp b/src/r_segs.cpp index 3f6b9d449..2e982a5bf 100644 --- a/src/r_segs.cpp +++ b/src/r_segs.cpp @@ -61,7 +61,6 @@ fixed_t rw_distance = 0; static INT32 rw_x, rw_stopx; static angle_t rw_centerangle; static fixed_t rw_offset; -static fixed_t rw_offset2; // for splats static fixed_t rw_scale, rw_scalestep; static fixed_t rw_midtexturemid, rw_toptexturemid, rw_bottomtexturemid; static INT32 worldtop, worldbottom, worldhigh, worldlow; @@ -264,12 +263,7 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3 else if (P_ApplyLightOffset(lightnum, frontsector)) lightnum += curline->lightOffset; - if (lightnum < 0) - walllights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - walllights = scalelight[LIGHTLEVELS - 1]; - else - walllights = scalelight[lightnum]; + walllights = R_GetWallLight(lightnum); } if (frontsector->heightsec != -1) @@ -371,12 +365,7 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3 lightnum = rlight->lightnum; - if (lightnum < 0) - xwalllights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - xwalllights = scalelight[LIGHTLEVELS-1]; - else - xwalllights = scalelight[lightnum]; + xwalllights = R_GetWallLight(lightnum); pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT; @@ -824,12 +813,7 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf else if (P_ApplyLightOffset(lightnum, frontsector)) lightnum += curline->lightOffset; - if (lightnum < 0) - walllights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - walllights = scalelight[LIGHTLEVELS-1]; - else - walllights = scalelight[lightnum]; + walllights = R_GetWallLight(lightnum); } maskedtexturecol = drawseg->thicksidecol; @@ -971,12 +955,7 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf lightnum = rlight->lightnum; - if (lightnum < 0) - xwalllights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - xwalllights = scalelight[LIGHTLEVELS-1]; - else - xwalllights = scalelight[lightnum]; + xwalllights = R_GetWallLight(lightnum); pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT; @@ -1467,12 +1446,7 @@ static void R_RenderSegLoop(drawcolumndata_t* dc) else if (P_ApplyLightOffset(lightnum, curline->frontsector)) lightnum += curline->lightOffset; - if (lightnum < 0) - xwalllights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - xwalllights = scalelight[LIGHTLEVELS-1]; - else - xwalllights = scalelight[lightnum]; + xwalllights = R_GetWallLight(lightnum); pindex = FixedMul(rw_scale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT; @@ -2551,7 +2525,6 @@ void R_StoreWallRange(INT32 start, INT32 stop) rw_offset = -rw_offset; /// don't use texture offset for splats - rw_offset2 = rw_offset + curline->offset; rw_offset += sidedef->textureoffset + curline->offset; rw_centerangle = ANGLE_90 + viewangle - rw_normalangle; @@ -2564,12 +2537,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (P_ApplyLightOffset(lightnum, frontsector)) lightnum += curline->lightOffset; - if (lightnum < 0) - walllights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - walllights = scalelight[LIGHTLEVELS - 1]; - else - walllights = scalelight[lightnum]; + walllights = R_GetWallLight(lightnum); } // if a floor / ceiling plane is on the wrong side diff --git a/src/r_segs.h b/src/r_segs.h index c40fcd331..47b9499b6 100644 --- a/src/r_segs.h +++ b/src/r_segs.h @@ -22,6 +22,11 @@ extern "C" { #pragma interface #endif +FUNCINLINE static ATTRINLINE lighttable_t** R_GetWallLight(INT32 llevel) +{ + return scalelight[CLAMP(llevel, 0, LIGHTLEVELS-1)]; +} + void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2); void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pffloor); void R_StoreWallRange(INT32 start, INT32 stop); diff --git a/src/r_things.cpp b/src/r_things.cpp index c90880b23..8612c6df9 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -1062,12 +1062,7 @@ static void R_SplitSprite(vissprite_t *sprite) { INT32 lightnum = R_GetSoftLightlevel(*sector->lightlist[i].lightlevel); - if (lightnum < 0) - spritelights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - spritelights = scalelight[LIGHTLEVELS-1]; - else - spritelights = scalelight[lightnum]; + spritelights = R_GetWallLight(lightnum); newsprite->extra_colormap = sector->lightlist[i].extra_colormap; @@ -1745,12 +1740,7 @@ static void R_ProjectSprite(mobj_t *thing) } } - if (lightnum < 0) - lights_array = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - lights_array = scalelight[LIGHTLEVELS-1]; - else - lights_array = scalelight[lightnum]; + lights_array = R_GetWallLight(lightnum); } // store information in a vissprite @@ -2087,16 +2077,11 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel) if (!sec->numlights) { - if (sec->heightsec == -1) lightlevel = sec->lightlevel; + if (sec->heightsec == -1) + lightlevel = sec->lightlevel; lightnum = R_GetSoftLightlevel(lightlevel); - - if (lightnum < 0) - spritelights = scalelight[0]; - else if (lightnum >= LIGHTLEVELS) - spritelights = scalelight[LIGHTLEVELS-1]; - else - spritelights = scalelight[lightnum]; + spritelights = R_GetWallLight(lightnum); } // Handle all things in sector.