From 18f74e880a4ce5c90eb3fff1f0f3280669475339 Mon Sep 17 00:00:00 2001 From: SeventhSentinel Date: Wed, 27 Jun 2018 13:14:22 -0400 Subject: [PATCH] ssplayer -> viewnumber --- src/r_bsp.c | 10 +++++----- src/r_bsp.h | 2 +- src/r_main.c | 18 ++++++++---------- src/r_things.c | 18 +++++++++--------- src/r_things.h | 2 +- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/r_bsp.c b/src/r_bsp.c index 234d6ee0..56f159c2 100644 --- a/src/r_bsp.c +++ b/src/r_bsp.c @@ -855,7 +855,7 @@ static void R_AddPolyObjects(subsector_t *sub) drawseg_t *firstseg; -static void R_Subsector(size_t num, UINT8 ssplayer) +static void R_Subsector(size_t num, UINT8 viewnumber) { INT32 count, floorlightlevel, ceilinglightlevel, light; seg_t *line; @@ -1213,7 +1213,7 @@ static void R_Subsector(size_t num, UINT8 ssplayer) // Either you must pass the fake sector and handle validcount here, on the // real sector, or you must account for the lighting in some other way, // like passing it as an argument. - R_AddSprites(sub->sector, (floorlightlevel+ceilinglightlevel)/2, ssplayer); + R_AddSprites(sub->sector, (floorlightlevel+ceilinglightlevel)/2, viewnumber); firstseg = NULL; @@ -1419,7 +1419,7 @@ INT32 R_GetPlaneLight(sector_t *sector, fixed_t planeheight, boolean underside) // // killough 5/2/98: reformatted, removed tail recursion -void R_RenderBSPNode(INT32 bspnum, UINT8 ssplayer) +void R_RenderBSPNode(INT32 bspnum, UINT8 viewnumber) { node_t *bsp; INT32 side; @@ -1430,7 +1430,7 @@ void R_RenderBSPNode(INT32 bspnum, UINT8 ssplayer) // Decide which side the view point is on. side = R_PointOnSide(viewx, viewy, bsp); // Recursively divide front space. - R_RenderBSPNode(bsp->children[side], ssplayer); + R_RenderBSPNode(bsp->children[side], viewnumber); // Possibly divide back space. @@ -1448,5 +1448,5 @@ void R_RenderBSPNode(INT32 bspnum, UINT8 ssplayer) portalcullsector = NULL; } - R_Subsector(bspnum == -1 ? 0 : bspnum & ~NF_SUBSECTOR, ssplayer); + R_Subsector(bspnum == -1 ? 0 : bspnum & ~NF_SUBSECTOR, viewnumber); } diff --git a/src/r_bsp.h b/src/r_bsp.h index db340221..f493a8a6 100644 --- a/src/r_bsp.h +++ b/src/r_bsp.h @@ -37,7 +37,7 @@ extern INT32 doorclosed; void R_ClearClipSegs(void); void R_PortalClearClipSegs(INT32 start, INT32 end); void R_ClearDrawSegs(void); -void R_RenderBSPNode(INT32 bspnum, UINT8 ssplayer); +void R_RenderBSPNode(INT32 bspnum, UINT8 viewnumber); void R_AddPortal(INT32 line1, INT32 line2, INT32 x1, INT32 x2); #ifdef POLYOBJECTS diff --git a/src/r_main.c b/src/r_main.c index b66e47ce..5ce8c020 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1335,18 +1335,16 @@ void R_RenderPlayerView(player_t *player) { portal_pair *portal; const boolean skybox = (skyboxmo[0] && cv_skybox.value); - UINT8 ssplayer; + UINT8 viewnumber; if (player == &players[secondarydisplayplayer] && splitscreen) - ssplayer = 2; + viewnumber = 1; else if (player == &players[thirddisplayplayer] && splitscreen > 1) - ssplayer = 3; + viewnumber = 2; else if (player == &players[fourthdisplayplayer] && splitscreen > 2) - ssplayer = 4; - else if (splitscreen) - ssplayer = 1; + viewnumber = 3; else - ssplayer = 0; + viewnumber = 0; if (cv_homremoval.value && player == &players[displayplayer]) // if this is display player 1 { @@ -1383,7 +1381,7 @@ void R_RenderPlayerView(player_t *player) R_ClearVisibleFloorSplats(); #endif - R_RenderBSPNode((INT32)numnodes - 1, ssplayer); + R_RenderBSPNode((INT32)numnodes - 1, viewnumber); R_ClipSprites(); R_DrawPlanes(); #ifdef FLOORSPLATS @@ -1416,7 +1414,7 @@ void R_RenderPlayerView(player_t *player) mytotal = 0; ProfZeroTimer(); #endif - R_RenderBSPNode((INT32)numnodes - 1, ssplayer); + R_RenderBSPNode((INT32)numnodes - 1, viewnumber); R_ClipSprites(); #ifdef TIMING RDMSR(0x10, &mycount); @@ -1441,7 +1439,7 @@ void R_RenderPlayerView(player_t *player) validcount++; - R_RenderBSPNode((INT32)numnodes - 1, ssplayer); + R_RenderBSPNode((INT32)numnodes - 1, viewnumber); R_ClipSprites(); //R_DrawPlanes(); //R_DrawMasked(); diff --git a/src/r_things.c b/src/r_things.c index 2b9810fc..524be5a4 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -1670,7 +1670,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) // R_AddSprites // During BSP traversal, this adds sprites by sector. // -void R_AddSprites(sector_t *sec, INT32 lightlevel, UINT8 ssplayer) +void R_AddSprites(sector_t *sec, INT32 lightlevel, UINT8 viewnumber) { mobj_t *thing; precipmobj_t *precipthing; // Tails 08-25-2002 @@ -1716,19 +1716,19 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel, UINT8 ssplayer) if (splitscreen) { if (thing->eflags & MFE_DRAWONLYFORP1) - if (ssplayer != 1) + if (viewnumber != 0) continue; if (thing->eflags & MFE_DRAWONLYFORP2) - if (ssplayer != 2) + if (viewnumber != 1) continue; if (thing->eflags & MFE_DRAWONLYFORP3 && splitscreen > 1) - if (ssplayer != 3) + if (viewnumber != 2) continue; if (thing->eflags & MFE_DRAWONLYFORP4 && splitscreen > 2) - if (ssplayer != 4) + if (viewnumber != 3) continue; } @@ -1749,19 +1749,19 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel, UINT8 ssplayer) if (splitscreen) { if (thing->eflags & MFE_DRAWONLYFORP1) - if (ssplayer != 1) + if (viewnumber != 0) continue; if (thing->eflags & MFE_DRAWONLYFORP2) - if (ssplayer != 2) + if (viewnumber != 1) continue; if (thing->eflags & MFE_DRAWONLYFORP3 && splitscreen > 1) - if (ssplayer != 3) + if (viewnumber != 2) continue; if (thing->eflags & MFE_DRAWONLYFORP4 && splitscreen > 2) - if (ssplayer != 4) + if (viewnumber != 3) continue; } diff --git a/src/r_things.h b/src/r_things.h index c7d4989c..bd734ddd 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -55,7 +55,7 @@ void R_DelSpriteDefs(UINT16 wadnum); #endif //SoM: 6/5/2000: Light sprites correctly! -void R_AddSprites(sector_t *sec, INT32 lightlevel, UINT8 ssplayer); +void R_AddSprites(sector_t *sec, INT32 lightlevel, UINT8 viewnumber); void R_InitSprites(void); void R_ClearSprites(void); void R_ClipSprites(void);