From ba4c82d38164734cdbe6435de35ad7737fedff53 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 25 Feb 2024 12:10:23 +0100 Subject: [PATCH] add splitscreen to screencoords and fix splitscreen for driftgauge --- src/d_netcmd.c | 2 +- src/k_kart.c | 45 ++++++++++++++++++++++++++++++++++++++------- src/m_menu.c | 6 ------ src/m_menu.h | 3 --- 4 files changed, 39 insertions(+), 17 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 1bb67fa2d..9c0f24a23 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -536,7 +536,7 @@ consvar_t cv_nametagmaxplayers = {"kartnametagmaxplayers", "3", CV_SAVE, nametag consvar_t cv_nametagmaxlenght = {"kartnametagmaxlenght", "12", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL}; //consvar_t cv_nametagscaling = {"nametagscaling", "160", CV_SAVE, nametagscaling_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_showownnametag = {"kartnametagshowown", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_smallnametags = {"kartnametagsmall", "Off", CV_SAVE, nametagsize_cons_t, Nametag_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_smallnametags = {"kartnametagsmall", "Off", CV_SAVE, nametagsize_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_nametaghop = {"kartnametaghop", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_nametagscore = {"kartnametagscore", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/k_kart.c b/src/k_kart.c index f30cfb492..5694d987f 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9024,7 +9024,30 @@ static void K_GetScreenCoords(vector2_t *vec, player_t *player, camera_t *came, // 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 + xres; + + + // get splitscreen index + int splitindex = stplyrnum; + + // adjust coords for splitscreen + if (splitscreen == 1){ // 2P + y = y>>1; + if (splitindex) + y = y + yres; + } + if (splitscreen >= 2) { // 3P or 4P + x = x>>1; + y = y>>1; + if (splitindex & 1) + x = x + xres; + if (splitindex >= 2) + y = y + yres; + } + + vec->y = y; vec->x = x; @@ -9034,7 +9057,7 @@ static void K_GetScreenCoords(vector2_t *vec, player_t *player, camera_t *came, //Decided to port and highly modify sunflower version for the main nametag drawing with additions by NepDisk. My previous one was broken anyway due to the changed screencoords and noscalestart static void K_drawNameTags(void) { - UINT8 i,j; + UINT8 i,j,k; INT32 trans = 0; vector2_t pos = {0}; fixed_t tagwidth; @@ -9114,9 +9137,9 @@ static void K_drawNameTags(void) } dup = vid.dupx; - + K_GetScreenCoords(&pos, stplyr, camera, players[i].mo->x, players[i].mo->y, players[i].mo->z + players[i].mo->height); - + //Check for negative screencoords if (pos.x == -1 || pos.y == -1) continue; @@ -9264,7 +9287,7 @@ static void K_drawDriftGauge(void) fixed_t basex,basey; INT32 drifttrans = 0; int dup = vid.dupx; - int i; + int i,j; UINT8 driftcolors[3][4] = { {0, 0, 10, 16}, // no drift @@ -9282,10 +9305,18 @@ static void K_drawDriftGauge(void) 0, 31, 47, 63, 79, 95, 111, 119, 127, 143, 159, 175, 183, 191, 199, 207, 223, 247 }; - if (!stplyr->mo || !stplyr->kartstuff[k_drift] || !camera->chase || splitscreen) + if (!stplyr->mo || !stplyr->kartstuff[k_drift] || !camera->chase) return; - - K_GetScreenCoords(&pos, stplyr, camera, stplyr->mo->x, stplyr->mo->y, stplyr->mo->z+FixedMul(cv_driftgaugeofs.value, cv_driftgaugeofs.value > 0 ? stplyr->mo->scale : mapobjectscale)); + + + if (!splitscreen) + K_GetScreenCoords(&pos, stplyr, camera, stplyr->mo->x, stplyr->mo->y, stplyr->mo->z+FixedMul(cv_driftgaugeofs.value, cv_driftgaugeofs.value > 0 ? stplyr->mo->scale : mapobjectscale)); + else + { + //Loop through each player camera for splitscreen. + for (j = 0; j <= stplyrnum; j++) + K_GetScreenCoords(&pos, stplyr, &camera[j], stplyr->mo->x, stplyr->mo->y, stplyr->mo->z+FixedMul(cv_driftgaugeofs.value, cv_driftgaugeofs.value > 0 ? stplyr->mo->scale : mapobjectscale)); + } //Check for negative screencoords if (pos.x == -1 || pos.y == -1) diff --git a/src/m_menu.c b/src/m_menu.c index e1a5a991d..1e23074c6 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3194,12 +3194,6 @@ void Saturn_menu_Onchange(void) OP_SaturnMenu[sm_colorhud_customcolor].status = status; } -void Nametag_menu_Onchange(void) -{ - if (!nametaggfx) - OP_NametagMenu[nt_ntchar].status = IT_GRAYEDOUT; -} - // ========================================================================== // END ORGANIZATION STUFF. // ========================================================================== diff --git a/src/m_menu.h b/src/m_menu.h index 3b0bb3049..8d1ebb723 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -276,9 +276,6 @@ void Bird_menu_Onchange(void); // Saturn menu updating void Saturn_menu_Onchange(void); -// Nametags Menu updating -void Nametag_menu_Onchange(void); - void M_ReplayHut(INT32 choice); void M_SetPlaybackMenuPointer(void);