This commit is contained in:
Alam Ed Arias 2017-09-28 11:10:24 -04:00
parent 3a2a6076b3
commit 1be137f461
9 changed files with 18 additions and 18 deletions

View file

@ -7074,7 +7074,7 @@ struct {
{"ME_ALLEMERALDS",ME_ALLEMERALDS}, {"ME_ALLEMERALDS",ME_ALLEMERALDS},
{"ME_ULTIMATE",ME_ULTIMATE}, {"ME_ULTIMATE",ME_ULTIMATE},
{"ME_PERFECT",ME_PERFECT}, {"ME_PERFECT",ME_PERFECT},
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
// p_local.h constants // p_local.h constants
{"FLOATSPEED",FLOATSPEED}, {"FLOATSPEED",FLOATSPEED},

View file

@ -135,7 +135,7 @@ static const struct {
}; };
// goes through the above list and returns the utype string for the userdata type // 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) static const char *GetUserdataUType(lua_State *L)
{ {
UINT8 i; UINT8 i;

View file

@ -254,7 +254,7 @@ static int lib_searchBlockmap(lua_State *L)
if (P_MobjWasRemoved(mobj)){ // ...unless the original object was removed if (P_MobjWasRemoved(mobj)){ // ...unless the original object was removed
lua_pushboolean(L, false); // in which case we have to stop now regardless lua_pushboolean(L, false); // in which case we have to stop now regardless
return 1; return 1;
} }
} }
lua_pushboolean(L, retval); lua_pushboolean(L, retval);
return 1; return 1;

View file

@ -980,18 +980,18 @@ UINT8 M_CompletionEmblems(void) // Bah! Duplication sucks, but it's for a separa
levelnum = emblemlocations[i].level; levelnum = emblemlocations[i].level;
embtype = emblemlocations[i].var; embtype = emblemlocations[i].var;
flags = MV_BEATEN; flags = MV_BEATEN;
if (embtype & ME_ALLEMERALDS) if (embtype & ME_ALLEMERALDS)
flags |= MV_ALLEMERALDS; flags |= MV_ALLEMERALDS;
if (embtype & ME_ULTIMATE) if (embtype & ME_ULTIMATE)
flags |= MV_ULTIMATE; flags |= MV_ULTIMATE;
if (embtype & ME_PERFECT) if (embtype & ME_PERFECT)
flags |= MV_PERFECT; flags |= MV_PERFECT;
res = ((mapvisited[levelnum - 1] & flags) == flags); res = ((mapvisited[levelnum - 1] & flags) == flags);
emblemlocations[i].collected = res; emblemlocations[i].collected = res;
if (res) if (res)
++somethingUnlocked; ++somethingUnlocked;

View file

@ -6117,7 +6117,7 @@ static void M_DrawLoadGameData(void)
V_DrawFill(x+6, y+64, 72, 50, col); V_DrawFill(x+6, y+64, 72, 50, col);
} }
} }
V_DrawSmallScaledPatch(x, y, 0, savselp[0]); V_DrawSmallScaledPatch(x, y, 0, savselp[0]);
x += 2; x += 2;
y += 1; y += 1;
@ -6149,7 +6149,7 @@ static void M_DrawLoadGameData(void)
else else
patch = savselp[5]; patch = savselp[5];
} }
V_DrawSmallScaledPatch(x, y, flags, patch); V_DrawSmallScaledPatch(x, y, flags, patch);
y += 41; y += 41;
@ -9166,7 +9166,7 @@ static void M_DrawControl(void)
y += SMALLLINEHEIGHT; y += SMALLLINEHEIGHT;
} }
V_DrawScaledPatch(currentMenu->x - 20, cursory, 0, V_DrawScaledPatch(currentMenu->x - 20, cursory, 0,
W_CachePatchName("M_CURSOR", PU_CACHE)); W_CachePatchName("M_CURSOR", PU_CACHE));
} }

View file

@ -10187,7 +10187,7 @@ void A_FlickyAim(mobj_t *actor)
{ {
angle_t posvar; angle_t posvar;
fixed_t chasevar, chasex, chasey; fixed_t chasevar, chasex, chasey;
if (flickyhitwall) if (flickyhitwall)
actor->movedir *= -1; actor->movedir *= -1;

View file

@ -2549,7 +2549,7 @@ static boolean CanSaveLevel(INT32 mapnum)
if (G_IsSpecialStage(mapnum) // don't save in special stages if (G_IsSpecialStage(mapnum) // don't save in special stages
|| mapnum == lastmaploaded) // don't save if the last map loaded was this one || mapnum == lastmaploaded) // don't save if the last map loaded was this one
return false; return false;
// Any levels that have the savegame flag can save normally. // Any levels that have the savegame flag can save normally.
// If the game is complete for this save slot, then any level can save! // 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! // 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); camera.angle = FixedAngle((fixed_t)thing->angle << FRACBITS);
} }
} }
// Salt: CV_ClearChangedFlags() messes with your settings :( // Salt: CV_ClearChangedFlags() messes with your settings :(
/*if (!cv_cam_height.changed) /*if (!cv_cam_height.changed)
CV_Set(&cv_cam_height, cv_cam_height.defaultvalue); CV_Set(&cv_cam_height, cv_cam_height.defaultvalue);

View file

@ -8819,7 +8819,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
// x1.2 dist for analog // x1.2 dist for analog
if (P_AnalogMove(player)) if (P_AnalogMove(player))
dist = FixedMul(dist, 6*FRACUNIT/5); 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)) 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; dist <<= 1;
} }

View file

@ -972,7 +972,7 @@ void Y_StartIntermission(void)
{ {
INT32 i; INT32 i;
UINT8 completionEmblems = M_CompletionEmblems(); UINT8 completionEmblems = M_CompletionEmblems();
intertic = -1; intertic = -1;
#ifdef PARANOIA #ifdef PARANOIA
@ -1069,7 +1069,7 @@ void Y_StartIntermission(void)
if (modeattacking == ATTACKING_RECORD) if (modeattacking == ATTACKING_RECORD)
Y_UpdateRecordReplays(); Y_UpdateRecordReplays();
if (completionEmblems) if (completionEmblems)
CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for level completion.\n"), (UINT16)completionEmblems, completionEmblems > 1 ? "s" : ""); 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) if (!stagefailed)
mapvisited[gamemap-1] |= MV_BEATEN; mapvisited[gamemap-1] |= MV_BEATEN;
// all emeralds/ultimate/perfect emblems won't be possible in ss, oh well? // all emeralds/ultimate/perfect emblems won't be possible in ss, oh well?
if (completionEmblems) if (completionEmblems)
CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for level completion.\n"), (UINT16)completionEmblems, completionEmblems > 1 ? "s" : ""); CONS_Printf(M_GetText("\x82" "Earned %hu emblem%s for level completion.\n"), (UINT16)completionEmblems, completionEmblems > 1 ? "s" : "");