From 1be137f4610f88635b08877d015eac9c2c4521bf Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Thu, 28 Sep 2017 11:10:24 -0400 Subject: [PATCH] cleanup --- src/dehacked.c | 2 +- src/lua_baselib.c | 2 +- src/lua_blockmaplib.c | 2 +- src/m_cond.c | 10 +++++----- src/m_menu.c | 6 +++--- src/p_enemy.c | 2 +- src/p_setup.c | 4 ++-- src/p_user.c | 2 +- src/y_inter.c | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 383a32bf3..cddbd1a0e 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -7074,7 +7074,7 @@ struct { {"ME_ALLEMERALDS",ME_ALLEMERALDS}, {"ME_ULTIMATE",ME_ULTIMATE}, {"ME_PERFECT",ME_PERFECT}, - + #ifdef HAVE_BLUA // p_local.h constants {"FLOATSPEED",FLOATSPEED}, diff --git a/src/lua_baselib.c b/src/lua_baselib.c index b88a9712e..4d845df52 100644 --- a/src/lua_baselib.c +++ b/src/lua_baselib.c @@ -135,7 +135,7 @@ static const struct { }; // goes through the above list and returns the utype string for the userdata type -// returns "unknown" instead if we couldn't find the right userdata type +// returns "unknown" instead if we couldn't find the right userdata type static const char *GetUserdataUType(lua_State *L) { UINT8 i; diff --git a/src/lua_blockmaplib.c b/src/lua_blockmaplib.c index ccd90f993..ebfd6a2df 100644 --- a/src/lua_blockmaplib.c +++ b/src/lua_blockmaplib.c @@ -254,7 +254,7 @@ static int lib_searchBlockmap(lua_State *L) if (P_MobjWasRemoved(mobj)){ // ...unless the original object was removed lua_pushboolean(L, false); // in which case we have to stop now regardless return 1; - } + } } lua_pushboolean(L, retval); return 1; diff --git a/src/m_cond.c b/src/m_cond.c index 9339c4989..e9d655694 100644 --- a/src/m_cond.c +++ b/src/m_cond.c @@ -980,18 +980,18 @@ UINT8 M_CompletionEmblems(void) // Bah! Duplication sucks, but it's for a separa levelnum = emblemlocations[i].level; embtype = emblemlocations[i].var; flags = MV_BEATEN; - + if (embtype & ME_ALLEMERALDS) flags |= MV_ALLEMERALDS; - + if (embtype & ME_ULTIMATE) flags |= MV_ULTIMATE; - + if (embtype & ME_PERFECT) flags |= MV_PERFECT; - + res = ((mapvisited[levelnum - 1] & flags) == flags); - + emblemlocations[i].collected = res; if (res) ++somethingUnlocked; diff --git a/src/m_menu.c b/src/m_menu.c index 8afee97f7..34af84e53 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -6117,7 +6117,7 @@ static void M_DrawLoadGameData(void) V_DrawFill(x+6, y+64, 72, 50, col); } } - + V_DrawSmallScaledPatch(x, y, 0, savselp[0]); x += 2; y += 1; @@ -6149,7 +6149,7 @@ static void M_DrawLoadGameData(void) else patch = savselp[5]; } - + V_DrawSmallScaledPatch(x, y, flags, patch); y += 41; @@ -9166,7 +9166,7 @@ static void M_DrawControl(void) y += SMALLLINEHEIGHT; } - + V_DrawScaledPatch(currentMenu->x - 20, cursory, 0, W_CachePatchName("M_CURSOR", PU_CACHE)); } diff --git a/src/p_enemy.c b/src/p_enemy.c index df1371cab..0689f27ff 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -10187,7 +10187,7 @@ void A_FlickyAim(mobj_t *actor) { angle_t posvar; fixed_t chasevar, chasex, chasey; - + if (flickyhitwall) actor->movedir *= -1; diff --git a/src/p_setup.c b/src/p_setup.c index e82099244..60f456ce3 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2549,7 +2549,7 @@ static boolean CanSaveLevel(INT32 mapnum) if (G_IsSpecialStage(mapnum) // don't save in special stages || mapnum == lastmaploaded) // don't save if the last map loaded was this one return false; - + // Any levels that have the savegame flag can save normally. // If the game is complete for this save slot, then any level can save! // On the other side of the spectrum, if lastmaploaded is 0, then the save file has only just been created and needs to save ASAP! @@ -2942,7 +2942,7 @@ boolean P_SetupLevel(boolean skipprecip) camera.angle = FixedAngle((fixed_t)thing->angle << FRACBITS); } } - + // Salt: CV_ClearChangedFlags() messes with your settings :( /*if (!cv_cam_height.changed) CV_Set(&cv_cam_height, cv_cam_height.defaultvalue); diff --git a/src/p_user.c b/src/p_user.c index 5de9aa17b..cfe9b334b 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -8819,7 +8819,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall // x1.2 dist for analog if (P_AnalogMove(player)) dist = FixedMul(dist, 6*FRACUNIT/5); - + if (player->climbing || player->exiting || player->playerstate == PST_DEAD || (player->powers[pw_carry] == CR_ROPEHANG || player->powers[pw_carry] == CR_GENERIC || player->powers[pw_carry] == CR_MACESPIN)) dist <<= 1; } diff --git a/src/y_inter.c b/src/y_inter.c index 761348480..8f647ad7e 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -972,7 +972,7 @@ void Y_StartIntermission(void) { INT32 i; UINT8 completionEmblems = M_CompletionEmblems(); - + intertic = -1; #ifdef PARANOIA @@ -1069,7 +1069,7 @@ void Y_StartIntermission(void) if (modeattacking == ATTACKING_RECORD) Y_UpdateRecordReplays(); - + if (completionEmblems) CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for level completion.\n"), (UINT16)completionEmblems, completionEmblems > 1 ? "s" : ""); } @@ -1172,7 +1172,7 @@ void Y_StartIntermission(void) { if (!stagefailed) mapvisited[gamemap-1] |= MV_BEATEN; - + // all emeralds/ultimate/perfect emblems won't be possible in ss, oh well? if (completionEmblems) CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for level completion.\n"), (UINT16)completionEmblems, completionEmblems > 1 ? "s" : "");