From d27f16c4d5a142fb0d29fc29d978b76ba5d77d48 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Wed, 5 Aug 2020 14:34:17 -0400 Subject: [PATCH] A bunch of easy files (1-5 conflicts) g_state.h, hu_stuff.h, lua_hud.h, m_misc.h, p_polyobj.c, p_telept.c, r_draw.c, r_draw8.c, r_sky.c --- src/g_state.h | 7 -- src/hu_stuff.h | 11 +-- src/lua_hud.h | 21 ----- src/m_misc.h | 13 --- src/p_polyobj.c | 6 -- src/p_telept.c | 60 ++++--------- src/r_draw.c | 222 +----------------------------------------------- src/r_draw8.c | 5 -- src/r_sky.c | 7 -- 9 files changed, 19 insertions(+), 333 deletions(-) diff --git a/src/g_state.h b/src/g_state.h index 664ce5d97..3aa4a3da7 100644 --- a/src/g_state.h +++ b/src/g_state.h @@ -58,11 +58,4 @@ extern UINT8 titlemapinaction; extern UINT8 ultimatemode; // was sk_insane extern gameaction_t gameaction; -<<<<<<< HEAD -======= -extern boolean botingame; -extern UINT8 botskin; -extern UINT16 botcolor; - ->>>>>>> srb2/next #endif //__G_STATE__ diff --git a/src/hu_stuff.h b/src/hu_stuff.h index 37dff8b6f..3b859ebe9 100644 --- a/src/hu_stuff.h +++ b/src/hu_stuff.h @@ -124,18 +124,11 @@ void HU_Drawer(void); char HU_dequeueChatChar(void); void HU_Erase(void); void HU_clearChatChars(void); -<<<<<<< HEAD -void HU_drawPing(INT32 x, INT32 y, UINT32 ping, INT32 flags); // Lat': Ping drawer for scoreboard. +void HU_drawPing(INT32 x, INT32 y, UINT32 ping, boolean notext, INT32 flags); // Lat': Ping drawer for scoreboard. void HU_drawMiniPing(INT32 x, INT32 y, UINT32 ping, INT32 flags); +void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer); //void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer); //void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer); -void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer, INT32 hilicol); -======= -void HU_drawPing(INT32 x, INT32 y, UINT32 ping, boolean notext, INT32 flags); // Lat': Ping drawer for scoreboard. -void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer); -void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer); -void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer); ->>>>>>> srb2/next void HU_DrawEmeralds(INT32 x, INT32 y, INT32 pemeralds); INT32 HU_CreateTeamScoresTbl(playersort_t *tab, UINT32 dmtotals[]); diff --git a/src/lua_hud.h b/src/lua_hud.h index 998e8b2bd..0221f991b 100644 --- a/src/lua_hud.h +++ b/src/lua_hud.h @@ -15,7 +15,6 @@ enum hud { hud_textspectator, hud_time, -<<<<<<< HEAD hud_gametypeinfo, hud_minimap, hud_item, @@ -30,29 +29,9 @@ enum hud { hud_freeplay, hud_rankings, // Tab rankings -======= - hud_rings, - hud_lives, - // Match / CTF / Tag / Ringslinger - hud_weaponrings, - hud_powerstones, - hud_teamscores, - // NiGHTS mode - hud_nightslink, - hud_nightsdrill, - hud_nightsspheres, - hud_nightsscore, - hud_nightstime, - hud_nightsrecords, - // TAB scores overlays - hud_rankings, - hud_coopemeralds, - hud_tokens, - hud_tabemblems, // Intermission hud_intermissiontally, hud_intermissionmessages, ->>>>>>> srb2/next hud_MAX }; diff --git a/src/m_misc.h b/src/m_misc.h index 30cbd4ac5..ac5a923bc 100644 --- a/src/m_misc.h +++ b/src/m_misc.h @@ -40,17 +40,7 @@ void M_SaveFrame(void); void M_StopMovie(void); // the file where game vars and settings are saved -<<<<<<< HEAD -#ifdef DC -#define CONFIGFILENAME "srb2dc.cfg" -#elif defined (PSP) -#define CONFIGFILENAME "srb2psp.cfg" -#else #define CONFIGFILENAME "kartconfig.cfg" -#endif -======= -#define CONFIGFILENAME "config.cfg" ->>>>>>> srb2/next INT32 M_MapNumber(char first, char second); @@ -111,8 +101,6 @@ boolean M_IsPathAbsolute (const char *path); void M_MkdirEach (const char *path, int start, int mode); void M_MkdirEachUntil (const char *path, int start, int end, int mode); -<<<<<<< HEAD -======= /* Return offset to the first word in a string. */ /* E.g. cursor += M_JumpWord(line + cursor); */ int M_JumpWord (const char *s); @@ -127,7 +115,6 @@ trailing zeros, or "" if the fractional part is zero. */ const char * M_Ftrim (double); ->>>>>>> srb2/next // counting bits, for weapon ammo code, usually FUNCMATH UINT8 M_CountBits(UINT32 num, UINT8 size); diff --git a/src/p_polyobj.c b/src/p_polyobj.c index d435eeb0d..59e3479a0 100644 --- a/src/p_polyobj.c +++ b/src/p_polyobj.c @@ -1157,7 +1157,6 @@ static void Polyobj_rotateThings(polyobj_t *po, vertex_t origin, angle_t delta, if (turnthings == 2 || (turnthings == 1 && !mo->player)) { mo->angle += delta; if (mo->player == &players[consoleplayer]) -<<<<<<< HEAD localangle[0] += delta; else if (mo->player == &players[displayplayers[1]]) localangle[1] += delta; @@ -1165,11 +1164,6 @@ static void Polyobj_rotateThings(polyobj_t *po, vertex_t origin, angle_t delta, localangle[2] += delta; else if (mo->player == &players[displayplayers[3]]) localangle[3] += delta; -======= - localangle += delta; - else if (mo->player == &players[secondarydisplayplayer]) - localangle2 += delta; ->>>>>>> srb2/next } } } diff --git a/src/p_telept.c b/src/p_telept.c index 51e6902b0..e32e16bbb 100644 --- a/src/p_telept.c +++ b/src/p_telept.c @@ -100,15 +100,12 @@ void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle, thing->player->starpostscale = starpostscale; thing->player->starpostnum = starpostnum; -<<<<<<< HEAD -======= thing->player->drawangle = drawangle; // Reset map starposts for the player's new info. P_ResetStarposts(); P_ClearStarPost(starpostnum); ->>>>>>> srb2/next P_ResetPlayer(thing->player); P_SetPlayerMobjState(thing, S_KART_STILL1); // SRB2kart - was S_PLAY_STND @@ -153,34 +150,6 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle else thing->player->viewz = thing->z + thing->player->viewheight; -<<<<<<< HEAD - if (!dontstopmove) - thing->reactiontime = TICRATE/2; // don't move for about half a second - - // absolute angle position - if (thing == players[consoleplayer].mo) - localangle[0] = angle; - else if (r_splitscreen) - { - for (i = 1; i <= r_splitscreen; i++) - { - if (thing == players[displayplayers[i]].mo) - { - localangle[i] = angle; - break; - } - } - } - - // move chasecam at new player location - for (i = 0; i <= r_splitscreen; i++) - { - if (thing->player == &players[displayplayers[i]] && camera[i].chase) - P_ResetCamera(thing->player, &camera[i]); - } - -======= ->>>>>>> srb2/next // don't run in place after a teleport if (!dontstopmove) { @@ -197,29 +166,30 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle thing->player->rmomx = thing->player->rmomy = 0; thing->player->speed = 0; P_ResetPlayer(thing->player); -<<<<<<< HEAD P_SetPlayerMobjState(thing, S_KART_STILL1); // SRB2kart - was S_PLAY_STND -======= - P_SetPlayerMobjState(thing, S_PLAY_STND); thing->reactiontime = TICRATE/2; // don't move for about half a second thing->player->drawangle = angle; ->>>>>>> srb2/next } else thing->player->drawangle += (angle - thing->angle); - // absolute angle position - if (thing->player == &players[consoleplayer]) - localangle = angle; - if (thing->player == &players[secondarydisplayplayer]) - localangle2 = angle; + for (i = 0; i <= r_splitscreen; i++) + { + if (thing == players[displayplayers[i]].mo) + { + // absolute angle position + localangle[i] = angle; - // move chasecam at new player location - if (splitscreen && camera2.chase && thing->player == &players[secondarydisplayplayer]) - P_ResetCamera(thing->player, &camera2); - else if (camera.chase && thing->player == &players[displayplayer]) - P_ResetCamera(thing->player, &camera); + if (camera[i].chase) + { + // move chasecam at new player location + P_ResetCamera(thing->player, &camera[i]); + } + + break; + } + } if (flash) P_FlashPal(thing->player, PAL_MIXUP, 10); diff --git a/src/r_draw.c b/src/r_draw.c index c9ad9dd46..eed662d46 100644 --- a/src/r_draw.c +++ b/src/r_draw.c @@ -138,23 +138,14 @@ UINT32 nflatxshift, nflatyshift, nflatshiftup, nflatmask; #define ALLWHITE_TT_CACHE_INDEX (MAXSKINS + 3) #define RAINBOW_TT_CACHE_INDEX (MAXSKINS + 4) #define BLINK_TT_CACHE_INDEX (MAXSKINS + 5) -<<<<<<< HEAD -#define TT_CACHE_SIZE (MAXSKINS + 6) +#define DASHMODE_TT_CACHE_INDEX (MAXSKINS + 6) +#define TT_CACHE_SIZE (MAXSKINS + 7) #define SKIN_RAMP_LENGTH 16 #define DEFAULT_STARTTRANSCOLOR 96 #define NUM_PALETTE_ENTRIES 256 static UINT8** translationtablecache[TT_CACHE_SIZE] = {NULL}; -// SKINCOLOR DEFINITIONS HAVE BEEN MOVED TO K_KART.C -======= -#define DASHMODE_TT_CACHE_INDEX (MAXSKINS + 6) -#define DEFAULT_STARTTRANSCOLOR 96 -#define NUM_PALETTE_ENTRIES 256 - -static UINT8** translationtablecache[MAXSKINS + 7] = {NULL}; ->>>>>>> srb2/next - CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1]; /** \brief The R_InitTranslationTables @@ -180,199 +171,6 @@ void R_InitTranslationTables(void) W_ReadLump(W_GetNumForName("TRANS90"), transtables+0x80000); } -<<<<<<< HEAD -======= - -/** \brief Generates a translation colormap. - - \param dest_colormap colormap to populate - \param skinnum number of skin, TC_DEFAULT or TC_BOSS - \param color translation color - - \return void -*/ - -// Define for getting accurate color brightness readings according to how the human eye sees them. -// https://en.wikipedia.org/wiki/Relative_luminance -// 0.2126 to red -// 0.7152 to green -// 0.0722 to blue -// (See this same define in hw_md2.c!) -#define SETBRIGHTNESS(brightness,r,g,b) \ - brightness = (UINT8)(((1063*((UINT16)r)/5000) + (3576*((UINT16)g)/5000) + (361*((UINT16)b)/5000)) / 3) - -/** \brief Generates the rainbow colourmaps that are used when a player has the invincibility power... stolen from kart, with permission - - \param dest_colormap colormap to populate - \param skincolor translation color -*/ -static void R_RainbowColormap(UINT8 *dest_colormap, UINT16 skincolor) -{ - INT32 i; - RGBA_t color; - UINT8 brightness; - INT32 j; - UINT8 colorbrightnesses[16]; - UINT16 brightdif; - INT32 temp; - - // first generate the brightness of all the colours of that skincolour - for (i = 0; i < 16; i++) - { - color = V_GetColor(skincolors[skincolor].ramp[i]); - SETBRIGHTNESS(colorbrightnesses[i], color.s.red, color.s.green, color.s.blue); - } - - // next, for every colour in the palette, choose the transcolor that has the closest brightness - for (i = 0; i < NUM_PALETTE_ENTRIES; i++) - { - if (i == 0 || i == 31) // pure black and pure white don't change - { - dest_colormap[i] = (UINT8)i; - continue; - } - color = V_GetColor(i); - SETBRIGHTNESS(brightness, color.s.red, color.s.green, color.s.blue); - brightdif = 256; - for (j = 0; j < 16; j++) - { - temp = abs((INT16)brightness - (INT16)colorbrightnesses[j]); - if (temp < brightdif) - { - brightdif = (UINT16)temp; - dest_colormap[i] = skincolors[skincolor].ramp[j]; - } - } - } -} - -#undef SETBRIGHTNESS - -static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, UINT16 color) -{ - INT32 i, starttranscolor, skinramplength; - - // Handle a couple of simple special cases - if (skinnum < TC_DEFAULT) - { - switch (skinnum) - { - case TC_ALLWHITE: - memset(dest_colormap, 0, NUM_PALETTE_ENTRIES * sizeof(UINT8)); - return; - case TC_RAINBOW: - if (color >= numskincolors) - I_Error("Invalid skin color #%hu.", (UINT16)color); - if (color != SKINCOLOR_NONE) - { - R_RainbowColormap(dest_colormap, color); - return; - } - break; - case TC_BLINK: - if (color >= numskincolors) - I_Error("Invalid skin color #%hu.", (UINT16)color); - if (color != SKINCOLOR_NONE) - { - memset(dest_colormap, skincolors[color].ramp[3], NUM_PALETTE_ENTRIES * sizeof(UINT8)); - return; - } - break; - default: - break; - } - - for (i = 0; i < NUM_PALETTE_ENTRIES; i++) - dest_colormap[i] = (UINT8)i; - - // White! - if (skinnum == TC_BOSS) - { - for (i = 0; i < 16; i++) - dest_colormap[31-i] = i; - } - else if (skinnum == TC_METALSONIC) - { - for (i = 0; i < 6; i++) - { - dest_colormap[skincolors[SKINCOLOR_BLUE].ramp[12-i]] = skincolors[SKINCOLOR_BLUE].ramp[i]; - } - dest_colormap[159] = dest_colormap[253] = dest_colormap[254] = 0; - for (i = 0; i < 16; i++) - dest_colormap[96+i] = dest_colormap[skincolors[SKINCOLOR_COBALT].ramp[i]]; - } - else if (skinnum == TC_DASHMODE) // This is a long one, because MotorRoach basically hand-picked the indices - { - // greens -> ketchups - dest_colormap[96] = dest_colormap[97] = 48; - dest_colormap[98] = 49; - dest_colormap[99] = 51; - dest_colormap[100] = 52; - dest_colormap[101] = dest_colormap[102] = 54; - dest_colormap[103] = 34; - dest_colormap[104] = 37; - dest_colormap[105] = 39; - dest_colormap[106] = 41; - for (i = 0; i < 5; i++) - dest_colormap[107 + i] = 43 + i; - - // reds -> steel blues - dest_colormap[32] = 146; - dest_colormap[33] = 147; - dest_colormap[34] = dest_colormap[35] = 170; - dest_colormap[36] = 171; - dest_colormap[37] = dest_colormap[38] = 172; - dest_colormap[39] = dest_colormap[40] = dest_colormap[41] = 173; - dest_colormap[42] = dest_colormap[43] = dest_colormap[44] = 174; - dest_colormap[45] = dest_colormap[46] = dest_colormap[47] = 175; - dest_colormap[71] = 139; - - // steel blues -> oranges - dest_colormap[170] = 52; - dest_colormap[171] = 54; - dest_colormap[172] = 56; - dest_colormap[173] = 42; - dest_colormap[174] = 45; - dest_colormap[175] = 47; - } - return; - } - else if (color == SKINCOLOR_NONE) - { - for (i = 0; i < NUM_PALETTE_ENTRIES; i++) - dest_colormap[i] = (UINT8)i; - return; - } - - if (color >= numskincolors) - I_Error("Invalid skin color #%hu.", (UINT16)color); - - starttranscolor = (skinnum != TC_DEFAULT) ? skins[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR; - - if (starttranscolor >= NUM_PALETTE_ENTRIES) - I_Error("Invalid startcolor #%d.", starttranscolor); - - // Fill in the entries of the palette that are fixed - for (i = 0; i < starttranscolor; i++) - dest_colormap[i] = (UINT8)i; - - i = starttranscolor + 16; - if (i < NUM_PALETTE_ENTRIES) - { - for (i = (UINT8)i; i < NUM_PALETTE_ENTRIES; i++) - dest_colormap[i] = (UINT8)i; - skinramplength = 16; - } - else - skinramplength = i - NUM_PALETTE_ENTRIES; // shouldn't this be NUM_PALETTE_ENTRIES - starttranscolor? - - // Build the translated ramp - for (i = 0; i < skinramplength; i++) - dest_colormap[starttranscolor + i] = (UINT8)skincolors[color].ramp[i]; -} - - ->>>>>>> srb2/next /** \brief Retrieves a translation colormap from the cache. \param skinnum number of skin, TC_DEFAULT or TC_BOSS @@ -387,15 +185,6 @@ UINT8* R_GetTranslationColormap(INT32 skinnum, skincolornum_t color, UINT8 flags INT32 skintableindex; // Adjust if we want the default colormap -<<<<<<< HEAD - if (skinnum == TC_DEFAULT) skintableindex = DEFAULT_TT_CACHE_INDEX; - else if (skinnum == TC_BOSS) skintableindex = BOSS_TT_CACHE_INDEX; - else if (skinnum == TC_METALSONIC) skintableindex = METALSONIC_TT_CACHE_INDEX; - else if (skinnum == TC_ALLWHITE) skintableindex = ALLWHITE_TT_CACHE_INDEX; - else if (skinnum == TC_RAINBOW) skintableindex = RAINBOW_TT_CACHE_INDEX; - else if (skinnum == TC_BLINK) skintableindex = BLINK_TT_CACHE_INDEX; - else skintableindex = skinnum; -======= switch (skinnum) { case TC_DEFAULT: skintableindex = DEFAULT_TT_CACHE_INDEX; break; @@ -407,7 +196,6 @@ UINT8* R_GetTranslationColormap(INT32 skinnum, skincolornum_t color, UINT8 flags case TC_DASHMODE: skintableindex = DASHMODE_TT_CACHE_INDEX; break; default: skintableindex = skinnum; break; } ->>>>>>> srb2/next if (flags & GTC_CACHE) { @@ -452,12 +240,7 @@ void R_FlushTranslationColormapCache(void) memset(translationtablecache[i], 0, MAXSKINCOLORS * sizeof(UINT8**)); } -<<<<<<< HEAD -/* -UINT8 R_GetColorByName(const char *name) -======= UINT16 R_GetColorByName(const char *name) ->>>>>>> srb2/next { UINT16 color = (UINT16)atoi(name); if (color > 0 && color < numskincolors) @@ -481,7 +264,6 @@ UINT16 R_GetSuperColorByName(const char *name) Z_Free(realname); return color; } -*/ // ========================================================================== // COMMON DRAWER FOR 8 AND 16 BIT COLOR MODES diff --git a/src/r_draw8.c b/src/r_draw8.c index 49f89f365..cb699cb59 100644 --- a/src/r_draw8.c +++ b/src/r_draw8.c @@ -105,11 +105,6 @@ void R_DrawColumn_8(void) } } -<<<<<<< HEAD -#define TRANSPARENTPIXEL 255 - -======= ->>>>>>> srb2/next void R_Draw2sMultiPatchColumn_8(void) { INT32 count; diff --git a/src/r_sky.c b/src/r_sky.c index 04fe840c0..09b7d6e2d 100644 --- a/src/r_sky.c +++ b/src/r_sky.c @@ -76,12 +76,5 @@ void R_SetupSkyDraw(void) void R_SetSkyScale(void) { fixed_t difference = vid.fdupx-(vid.dupx< 1) - scr *= 2; - skyscale = FixedDiv(scr, vid.fdupx+difference); -======= skyscale = FixedDiv(fovtan, vid.fdupx+difference); ->>>>>>> srb2/next }