diff --git a/src/command.c b/src/command.c index f19bb89c6..2eac48a7f 100644 --- a/src/command.c +++ b/src/command.c @@ -1233,7 +1233,7 @@ consvar_t *CV_FindVar(const char *name) static inline UINT16 CV_ComputeNetid(const char *s) { UINT16 ret = 0, i = 0; - static UINT16 premiers[16] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53}; + static const UINT16 premiers[16] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53}; while (*s) { diff --git a/src/console.c b/src/console.c index be9b1565b..1cba7ca24 100644 --- a/src/console.c +++ b/src/console.c @@ -852,7 +852,7 @@ boolean CON_Responder(event_t *ev) return true; // ctrl modifier -- changes behavior, adds shortcuts - if (ctrldown && (cv_keyboardlayout.value != 3 || (cv_keyboardlayout.value == 3 && !altdown))) + if (ctrldown && (cv_keyboardlayout.value != 3 || !altdown)) { // show all cvars/commands that match what we have inputted if (key == KEY_TAB) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index fedd0fe81..051c3e4d4 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2578,7 +2578,7 @@ static boolean CL_FinishedFileList(void) * \sa CL_ConnectToServer * */ -static boolean CL_ServerConnectionSearchTicker(tic_t *asksent) +static void CL_ServerConnectionSearchTicker(tic_t *asksent) { INT32 i; @@ -2596,7 +2596,7 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent) { i = SL_SearchServer(servernode); if (i < 0) - return true; + return; } joinnode = i; @@ -2624,7 +2624,7 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent) { cl_mode = CL_ASKFULLFILELIST; cl_lastcheckedfilecount = 0; - return true; + return; } cl_mode = cv_serverinfoscreen.value ? CL_VIEWSERVER : CL_CHECKFILES; @@ -2636,7 +2636,7 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent) *asksent = 0; } - return true; + return; } // Ask the info to the server (askinfo packet) @@ -2646,7 +2646,6 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent) *asksent = I_GetTime() + NEWTICRATE; } - return true; } static void FreeMapIcon(void) @@ -2678,8 +2677,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic switch (cl_mode) { case CL_SEARCHING: - if (!CL_ServerConnectionSearchTicker(asksent)) - return false; + CL_ServerConnectionSearchTicker(asksent); break; case CL_ASKFULLFILELIST: @@ -5980,13 +5978,11 @@ static void PT_ServerTics(SINT8 node) realend = gametic + CLIENTBACKUPTICS; cl_packetmissed = realstart > neededtic; - UINT8 *pak = (UINT8 *)&packet->cmds; - UINT8 *txtpak = (UINT8 *)&packet->cmds[packet->numslots * packet->numtics]; - if (realstart <= neededtic && realend > neededtic) { tic_t i, j; - pak = (UINT8 *)&packet->cmds; + UINT8 *pak = (UINT8 *)&packet->cmds; + UINT8 *txtpak = (UINT8 *)&packet->cmds[packet->numslots * packet->numtics]; for (i = realstart; i < realend; i++) { diff --git a/src/g_demo.c b/src/g_demo.c index 4acbba9f5..c36b3273b 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -1996,7 +1996,6 @@ static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick) UINT8 totalfiles, filesloaded, nmusfilecount; char filename[MAX_WADPATH]; UINT8 md5sum[16]; - boolean toomany = false; boolean alreadyloaded; UINT8 i, j; UINT8 error = 0; @@ -2006,53 +2005,44 @@ static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick) for (i = 0; i < totalfiles; ++i) { - if (toomany) - SKIPSTRING((*pp)); - else - { - strlcpy(filename, (char *)(*pp), sizeof filename); - SKIPSTRING((*pp)); - } + strlcpy(filename, (char *)(*pp), sizeof filename); + SKIPSTRING((*pp)); READMEM((*pp), md5sum, 16); // hue hue peepee - if (!toomany) + alreadyloaded = false; + nmusfilecount = 0; + + for (j = 0; j < numwadfiles; ++j) { - alreadyloaded = false; - nmusfilecount = 0; - - for (j = 0; j < numwadfiles; ++j) - { - if (wadfiles[j]->important && j > mainwads) - nmusfilecount++; - else - continue; - - if (memcmp(md5sum, wadfiles[j]->md5sum, 16) == 0) - { - alreadyloaded = true; - - if (i != nmusfilecount-1 && error < DFILE_ERROR_OUTOFORDER) - error |= DFILE_ERROR_OUTOFORDER; - - break; - } - } - - if (alreadyloaded) - { - filesloaded++; + if (wadfiles[j]->important && j > mainwads) + nmusfilecount++; + else continue; - } - if (numwadfiles >= MAX_WADFILES) - error = DFILE_ERROR_CANNOTLOAD; - else if (!quick && findfile(filename, md5sum, false) != FS_FOUND) - error = DFILE_ERROR_CANNOTLOAD; - else if (error < DFILE_ERROR_INCOMPLETEOUTOFORDER) - error |= DFILE_ERROR_NOTLOADED; - } else + if (memcmp(md5sum, wadfiles[j]->md5sum, 16) == 0) + { + alreadyloaded = true; + + if (i != nmusfilecount-1 && error < DFILE_ERROR_OUTOFORDER) + error |= DFILE_ERROR_OUTOFORDER; + + break; + } + } + + if (alreadyloaded) + { + filesloaded++; + continue; + } + + if (numwadfiles >= MAX_WADFILES) error = DFILE_ERROR_CANNOTLOAD; + else if (!quick && findfile(filename, md5sum, false) != FS_FOUND) + error = DFILE_ERROR_CANNOTLOAD; + else if (error < DFILE_ERROR_INCOMPLETEOUTOFORDER) + error |= DFILE_ERROR_NOTLOADED; } // Get final file count diff --git a/src/g_game.c b/src/g_game.c index 26e3d3df5..24490f2a0 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -4059,7 +4059,6 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool if (W_CheckNumForName(mapname) == LUMPERROR) { I_Error("Internal game map '%s' not found\n", mapname); - Command_ExitGame_f(); return; } diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c index 44d765d03..3f1e5340c 100644 --- a/src/hardware/hw_draw.c +++ b/src/hardware/hw_draw.c @@ -150,7 +150,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p if (!column->topdelta) { const UINT8 *source = (const UINT8 *)(column) + 3; - HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0])); + HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, source[0]); } } @@ -302,7 +302,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, if (!column->topdelta) { const UINT8 *source = (const UINT8 *)(column) + 3; - HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0])); + HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, source[0]); } } diff --git a/src/k_hud.c b/src/k_hud.c index b26029799..dac979de8 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -2095,7 +2095,7 @@ static void K_DrawKartPositionNum(INT32 num) fy = POSI_Y; fflags = V_SNAPTOLEFT|((stplyrnum == 2) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0); // flip P3 to the bottom. flipdraw = true; - if (num && num >= 10) + if (num >= 10) fx += W; // this seems dumb, but we need to do this in order for positions above 10 going off screen. } else // else, that means we're P2 or P4. @@ -4083,7 +4083,7 @@ static void K_drawBattleFullscreen(void) { if (i == displayplayers[0]) continue; - if (playeringame[i] && !stplyr->spectator) + if (playeringame[i]) return; } diff --git a/src/k_kart.c b/src/k_kart.c index e3e332316..14d87365b 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2001,11 +2001,9 @@ static void K_PlayGenericCombatSound(mobj_t *source, mobj_t *other, sfxenum_t sf if (!skin) return; - boolean alwaysHear = false; - if (cv_kartvoices.value && !P_MobjWasRemoved(other) && other->player != NULL) { - alwaysHear = P_IsDisplayPlayer(other->player); + boolean alwaysHear = P_IsDisplayPlayer(other->player); S_StartSound(alwaysHear ? NULL : source, skin->soundsid[S_sfx[sfx_id].skinsound]); } @@ -3724,10 +3722,8 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent) dust->momx = mo->momx/2; dust->momy = mo->momy/2; dust->momz = mo->momz/2; - } - - if (translucent) dust->flags2 |= MF2_SHADOW; + } return dust; } @@ -4740,8 +4736,7 @@ void K_RepairOrbitChain(mobj_t *orbit) prev->movedir = num; } - if (player->kartstuff[k_itemamount] != num) - player->kartstuff[k_itemamount] = num; + player->kartstuff[k_itemamount] = num; } } @@ -6399,7 +6394,6 @@ void K_SpawnWaterRunParticles(mobj_t *mobj) fixed_t runSpeed = 14 * mobj->scale; fixed_t curSpeed = INT32_MAX; fixed_t topSpeed = INT32_MAX; - fixed_t trailScale = FRACUNIT; if (mobj->player != NULL) { @@ -6430,6 +6424,8 @@ void K_SpawnWaterRunParticles(mobj_t *mobj) if ((!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + mobj->height >= mobj->watertop && mobj->z <= mobj->watertop) || (mobj->eflags & MFE_VERTICALFLIP && mobj->z + mobj->height >= mobj->waterbottom && mobj->z <= mobj->waterbottom)) { + fixed_t trailScale = FRACUNIT; + if (topSpeed > runSpeed) { trailScale = FixedMul(FixedDiv(curSpeed - runSpeed, topSpeed - runSpeed), mapobjectscale); diff --git a/src/lua_hudlib_drawlist.c b/src/lua_hudlib_drawlist.c index 6d3542c48..d2b2eeeb4 100644 --- a/src/lua_hudlib_drawlist.c +++ b/src/lua_hudlib_drawlist.c @@ -650,34 +650,34 @@ void LUA_HUD_DrawList(huddrawlist_h list) case DI_DrawString: switch(item->align) { - // hu_font - case align_left: - V_DrawString(LERPS(x), LERPS(y), item->flags, itemstr); - break; - case align_center: - V_DrawCenteredString(LERPS(x), LERPS(y), item->flags, itemstr); - break; - case align_right: - V_DrawRightAlignedString(LERPS(x), LERPS(y), item->flags, itemstr); - break; - case align_fixed: - V_DrawStringAtFixed(LERPS(x), LERPS(y), item->flags, itemstr); - break; - // hu_font, 0.5x scale - case align_small: - V_DrawSmallString(LERPS(x), LERPS(y), item->flags, itemstr); - break; - case align_smallright: - V_DrawRightAlignedSmallString(LERPS(x), LERPS(y), item->flags, itemstr); - break; - // tny_font - case align_thin: - V_DrawThinString(LERPS(x), LERPS(y), item->flags, itemstr); - break; - case align_thinright: - V_DrawRightAlignedThinString(LERPS(x), LERPS(y), item->flags, itemstr); - break; - } + // hu_font + case align_left: + V_DrawString(LERPS(x), LERPS(y), item->flags, itemstr); + break; + case align_center: + V_DrawCenteredString(LERPS(x), LERPS(y), item->flags, itemstr); + break; + case align_right: + V_DrawRightAlignedString(LERPS(x), LERPS(y), item->flags, itemstr); + break; + case align_fixed: + V_DrawStringAtFixed(LERPS(x), LERPS(y), item->flags, itemstr); + break; + // hu_font, 0.5x scale + case align_small: + V_DrawSmallString(LERPS(x), LERPS(y), item->flags, itemstr); + break; + case align_smallright: + V_DrawRightAlignedSmallString(LERPS(x), LERPS(y), item->flags, itemstr); + break; + // tny_font + case align_thin: + V_DrawThinString(LERPS(x), LERPS(y), item->flags, itemstr); + break; + case align_thinright: + V_DrawRightAlignedThinString(LERPS(x), LERPS(y), item->flags, itemstr); + break; + } break; case DI_DrawKartString: V_DrawKartString(LERPS(x), LERPS(y), item->flags, itemstr); @@ -690,7 +690,6 @@ void LUA_HUD_DrawList(huddrawlist_h list) break; default: I_Error("can't draw draw list item: invalid draw list item type"); - continue; } } } diff --git a/src/m_menu.c b/src/m_menu.c index 4e13ad10f..252aaffc6 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -5420,7 +5420,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na } if (cvar->flags & CV_NETVAR) - OP_CustomCvarMenu[ccvarposition] = (menuitem_t){ IT_STRING | IT_CVAR , NULL, Z_StrDup(va("\x85 %s", name)), cvar, ccvaralphakey }; + OP_CustomCvarMenu[ccvarposition] = (menuitem_t){ IT_STRING | IT_CVAR, NULL, Z_StrDup(va("\x85 %s", name)), cvar, ccvaralphakey }; else OP_CustomCvarMenu[ccvarposition] = (menuitem_t){ IT_STRING | IT_CVAR, NULL, Z_StrDup(name), cvar, ccvaralphakey }; diff --git a/src/m_textinput.c b/src/m_textinput.c index c49294094..a7c048e66 100644 --- a/src/m_textinput.c +++ b/src/m_textinput.c @@ -256,7 +256,7 @@ static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emot return true; } - if (ctrldown && (cv_keyboardlayout.value != 3 || (cv_keyboardlayout.value == 3 && !altdown))) + if (ctrldown && (cv_keyboardlayout.value!=3 || !altdown)) { if (key == 'x' || key == 'X') { @@ -381,10 +381,10 @@ static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emot // allow people to use keypad in console (good for typing IP addresses) - Calum if (key >= KEY_KEYPAD7 && key <= KEY_KPADDEL) { - char keypad_translation[] = {'7','8','9','-', - '4','5','6','+', - '1','2','3', - '0','.'}; + const char keypad_translation[] = {'7','8','9','-', + '4','5','6','+', + '1','2','3', + '0', '.'}; key = keypad_translation[key - KEY_KEYPAD7]; } diff --git a/src/p_enemy.c b/src/p_enemy.c index d1c96d6f7..cb9b16f2d 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3650,7 +3650,7 @@ static inline boolean PIT_GrenadeRing(mobj_t *thing) return true; if (thing->player && (thing->player->kartstuff[k_hyudorotimer] - || (G_BattleGametype() && thing->player && thing->player->kartstuff[k_bumper] <= 0 && thing->player->kartstuff[k_comebacktimer]))) + || (G_BattleGametype() && thing->player->kartstuff[k_bumper] <= 0 && thing->player->kartstuff[k_comebacktimer]))) return true; if ((gametype == GT_CTF || gametype == GT_TEAMMATCH) @@ -5301,7 +5301,7 @@ void A_MixUp(void *thing) if (playeringame[i] && players[i].mo && players[i].mo->health > 0 && players[i].playerstate == PST_LIVE && !players[i].exiting && !players[i].powers[pw_super]) { - if ((netgame || multiplayer) && players[i].spectator) // Ignore spectators + if (netgame && players[i].spectator) // Ignore spectators continue; numplayers++; @@ -7923,7 +7923,7 @@ void A_ItemPop(void *thing) if (!(actor->target && actor->target->player)) { - if (cv_debug && !(actor->target && actor->target->player)) + if (cv_debug) CONS_Printf("ERROR: Powerup has no target!\n"); return; } @@ -8785,7 +8785,7 @@ void A_ReaperThinker(void *thing) actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y); // The player we should target if it's near us: - for (i = 0; ipowers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL) - return; - if (UNLIKELY(maptol & TOL_NIGHTS)) - return; - if (UNLIKELY(mariomode)) - return; - else if (toucher->eflags & MFE_VERTICALFLIP) - { - if (special->z+special->height < toucher->z + toucher->height / 3 - || special->z+special->height > toucher->z + (toucher->height*2/3)) - return; // Only go in the mouth - } - else if (special->z < toucher->z + toucher->height / 3 - || special->z > toucher->z + (toucher->height*2/3)) - return; // Only go in the mouth - - toucher->momx = toucher->momy = toucher->momz = 0; - break; case MT_WATERDROP: if (special->state == &states[special->info->spawnstate]) @@ -1916,11 +1898,9 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source) P_SetThingPosition(target); P_InstaThrust(target,target->angle,FixedMul(2*FRACUNIT, target->scale)); target->momz = FixedMul(7*FRACUNIT, target->scale); - if (flip) - target->momz = -target->momz; - if (flip) { + target->momz = -target->momz; target = P_SpawnMobj(x,y,z-FixedMul(12*FRACUNIT, target->scale),MT_SPIKE); target->eflags |= MFE_VERTICALFLIP; } diff --git a/src/p_local.h b/src/p_local.h index e82408802..6eb3d7a8b 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -212,7 +212,6 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj); void P_GivePlayerRings(player_t *player, INT32 num_rings); void P_GivePlayerLives(player_t *player, INT32 numlives); UINT8 P_GetNextEmerald(void); -void P_GiveEmerald(boolean spawnObj); void P_ResetScore(player_t *player); boolean P_AutoPause(void); diff --git a/src/p_user.c b/src/p_user.c index b62847a4c..24b646ee3 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -220,32 +220,6 @@ UINT8 P_GetNextEmerald(void) return (UINT8)(gamemap - sstage_start); } -// -// P_GiveEmerald -// -// Award an emerald upon completion -// of a special stage. -// -void P_GiveEmerald(boolean spawnObj) -{ - INT32 i; - UINT8 em; - - S_StartSound(NULL, sfx_cgot); // Got the emerald! - em = P_GetNextEmerald(); - emeralds |= (1 << em); - - if (spawnObj) - { - for (i = 0; i < MAXPLAYERS; i++) - { - if (playeringame[i]) - P_SetMobjState(P_SpawnMobj(players[i].mo->x, players[i].mo->y, players[i].mo->z + players[i].mo->info->height, MT_GOTEMERALD), - mobjinfo[MT_GOTEMERALD].spawnstate + em); - } - } -} - // // P_ResetScore // @@ -1226,7 +1200,6 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->pitch = mobj->pitch; ghost->roll = mobj->roll; - ghost->sloperoll = mobj->sloperoll; ghost->rollangle = mobj->rollangle; ghost->sloperoll = mobj->sloperoll; ghost->slopepitch = mobj->slopepitch; @@ -3130,19 +3103,16 @@ void P_ToggleDemoCamera(UINT8 viewnum) return; } - if (!cam->freecam) // toggle on + if (!cam->freecam) // toggle on { cam->freecam = true; cam->button_a_held = 2; cam->reset_aiming = true; // get rid of some hud elements - if (displayplayers[0] != consoleplayer) - { - displayplayers[0] = consoleplayer; - } + displayplayers[0] = consoleplayer; } - else // toggle off + else // toggle off { cam->freecam = false; G_FixCamera(viewnum+1); @@ -4056,7 +4026,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall if (timeover) thiscam->angle = angle; - else if (!camstill && !resetcalled && !paused && timeover != 1) + else if (!camstill && !resetcalled && !paused) thiscam->angle = R_PointToAngle2(thiscam->x, thiscam->y, viewpointx, viewpointy); if (timeover == 1) diff --git a/src/r_bsp.cpp b/src/r_bsp.cpp index 55a475c9d..60d84c57f 100644 --- a/src/r_bsp.cpp +++ b/src/r_bsp.cpp @@ -991,7 +991,6 @@ static void R_Subsector(size_t num) visffloor[numffloors].height = polysec->floorheight; visffloor[numffloors].polyobj = po; visffloor[numffloors].slope = NULL; -// visffloor[numffloors].ffloor = rover; po->visplane = visffloor[numffloors].plane; numffloors++; } diff --git a/src/r_data.c b/src/r_data.c index 43ff16cbb..507696925 100644 --- a/src/r_data.c +++ b/src/r_data.c @@ -37,44 +37,6 @@ // Not sure if this is necessary, but it was in w_wad.c, so I'm putting it here too -Shadow Hog #include -// -// Texture definition. -// Each texture is composed of one or more patches, -// with patches being lumps stored in the WAD. -// The lumps are referenced by number, and patched -// into the rectangular texture space using origin -// and possibly other attributes. -// -typedef struct -{ - INT16 originx, originy; - INT16 patch, stepdir, colormap; -} ATTRPACK mappatch_t; - -// -// Texture definition. -// An SRB2 wall texture is a list of patches -// which are to be combined in a predefined order. -// -typedef struct -{ - char name[8]; - INT32 masked; - INT16 width; - INT16 height; - INT32 columndirectory; // FIXTHIS: OBSOLETE - INT16 patchcount; - mappatch_t patches[1]; -} ATTRPACK maptexture_t; - -// Store lists of lumps for F_START/F_END etc. -typedef struct -{ - UINT16 wadfile; - UINT16 firstlump; - size_t numlumps; -} lumplist_t; - // // Graphics. // SRB2 graphics for walls and sprites @@ -836,11 +798,7 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch) } else { - if (patchName != NULL) - { - Z_Free(patchName); - } - + Z_Free(patchName); patchName = (char *)Z_Malloc((texturesTokenLength+1)*sizeof(char),PU_STATIC,NULL); memcpy(patchName,texturesToken,texturesTokenLength*sizeof(char)); patchName[texturesTokenLength] = '\0'; diff --git a/src/r_data.h b/src/r_data.h index 090c363ed..168f72bf0 100644 --- a/src/r_data.h +++ b/src/r_data.h @@ -45,9 +45,6 @@ enum TEXTURETYPE_COMPOSITE, }; -// A maptexturedef_t describes a rectangular texture, -// which is composed of one or more mappatch_t structures -// that arrange graphic patches. typedef struct { // Keep name for switch changing, etc. diff --git a/src/r_plane.cpp b/src/r_plane.cpp index 05c4d943a..a6a52fe83 100644 --- a/src/r_plane.cpp +++ b/src/r_plane.cpp @@ -1282,10 +1282,7 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle else { // Don't mess with angle on slopes! We'll handle this ourselves later - if (viewangle != pl->viewangle + pl->plangle) - { - viewangle = pl->viewangle + pl->plangle; - } + viewangle = pl->viewangle + pl->plangle; ds->planeheight = abs(pl->height - pl->viewz); ds->planezlight = zlight[light]; diff --git a/src/r_things.h b/src/r_things.h index c8195891a..e8e30ca6b 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -50,7 +50,7 @@ extern fixed_t windowtop; extern fixed_t windowbottom; extern INT32 lengthcol; -FUNCINLINE static ATTRINLINE INT32 R_ThingLightLevel(mobj_t* thing) +FUNCINLINE static ATTRINLINE INT32 R_ThingLightLevel(const mobj_t* thing) { return (INT32)thing->lightlevel; } diff --git a/src/st_stuff.c b/src/st_stuff.c index debaad8fd..be5987fe7 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -185,7 +185,7 @@ static void ST_doPaletteStuff(void) #endif if (stplyr && stplyr->flashcount) - palette = CLAMP(stplyr->flashpal, 0, 13); + palette = min(stplyr->flashpal, 13); if (palette != st_palette) { diff --git a/src/y_inter.c b/src/y_inter.c index 27e794ffc..684797999 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -51,13 +51,6 @@ #include "hardware/hw_main.h" #endif -typedef struct -{ - char patch[9]; - INT32 points; - UINT8 display; -} y_bonus_t; - static y_data_t data; // graphics @@ -1609,9 +1602,6 @@ void Y_SetupVoteFinish(SINT8 pick, SINT8 level) if (votes[i] == -1 || endtype > 1) // Don't need to go on continue; - if (endtype == 2) - continue; - if (votecompare == -1) { votecompare = votes[i];