smol optimizations by avoiding multiple reevaluations
due to clamping macros, those may get reevaluated multiple times nothing crazy
This commit is contained in:
1 parent
32d8120516
commit
fcbf45521a
8 files changed
+68
-47
No files matched your search
+2
-1
@@ -163,7 +163,8 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
|
||||
nameonly(strcpy(wadfilename, wadfiles[i]->filename));
|
||||
|
||||
// Look below at the WRITE macros to understand what these numbers mean.
|
||||
if (p + 1 + 4 + min(strlen(wadfilename) + 1, MAX_WADPATH) + 16 > p_start + MAXFILENEEDED)
|
||||
const size_t len = strlen(wadfilename) + 1;
|
||||
if (p + 1 + 4 + min(len, MAX_WADPATH) + 16 > p_start + MAXFILENEEDED)
|
||||
{
|
||||
// Too many files to send all at once
|
||||
if (netbuffer->packettype == PT_MOREFILESNEEDED)
|
||||
|
||||
+2
-1
@@ -2490,8 +2490,9 @@ static void K_DrawDialSpeedometer(fixed_t speed,
|
||||
const UINT8 infoidx = (infoactive) ? 1 : 0;
|
||||
patch_t* dialpatch;
|
||||
|
||||
const fixed_t spd = FixedDiv(speed, divisor);
|
||||
const angle_t speedangle =
|
||||
FixedAngle(((min(135 * FRACUNIT, FixedDiv(speed, divisor)) - (45 * FRACUNIT))));
|
||||
FixedAngle(((min(135 * FRACUNIT, spd) - (45 * FRACUNIT))));
|
||||
|
||||
rot = R_GetRollAngle(speedangle);
|
||||
|
||||
|
||||
+14
-7
@@ -4878,7 +4878,9 @@ static void K_MoveHeldObjects(player_t *player)
|
||||
mobj_t *cur = player->mo->hnext;
|
||||
mobj_t *targ = player->mo;
|
||||
|
||||
if (P_IsObjectOnGround(player->mo) && player->speed > 0)
|
||||
const boolean ponground = P_IsObjectOnGround(player->mo);
|
||||
|
||||
if (ponground && player->speed > 0)
|
||||
player->kartstuff[k_bananadrag]++;
|
||||
|
||||
while (!P_MobjWasRemoved(cur))
|
||||
@@ -4935,13 +4937,18 @@ static void K_MoveHeldObjects(player_t *player)
|
||||
targz -= 8*(2*FRACUNIT)/7;
|
||||
}*/
|
||||
|
||||
if (cv_bananajitter.value && P_IsObjectOnGround(player->mo) && player->speed > 0 && player->kartstuff[k_bananadrag] > TICRATE
|
||||
&& M_RandomChance(min(FRACUNIT/2, FixedDiv(player->speed, K_GetKartSpeed(player, false))/2)))
|
||||
if (cv_bananajitter.value && ponground
|
||||
&& player->speed > 0 && player->kartstuff[k_bananadrag] > TICRATE)
|
||||
{
|
||||
if (leveltime & 1)
|
||||
cur->spriteyoffset += 8*(2*FRACUNIT)/7;
|
||||
else
|
||||
cur->spriteyoffset -= 8*(2*FRACUNIT)/7;
|
||||
const fixed_t halfpspeed = FixedDiv(player->speed, K_GetKartSpeed(player, false))/2;
|
||||
|
||||
if (M_RandomChance(min(FRACUNIT/2, halfpspeed)))
|
||||
{
|
||||
if (leveltime & 1)
|
||||
cur->spriteyoffset += 8*(2*FRACUNIT)/7;
|
||||
else
|
||||
cur->spriteyoffset -= 8*(2*FRACUNIT)/7;
|
||||
}
|
||||
}
|
||||
|
||||
if (speed > dist)
|
||||
|
||||
+3
-1
@@ -558,7 +558,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
||||
{
|
||||
special->momx = toucher->momx;
|
||||
special->momy = toucher->momy;
|
||||
special->momz = flip * max(P_AproxDistance(toucher->momx, toucher->momy) / 4, FixedMul(special->info->speed, special->scale));
|
||||
const fixed_t dist = P_AproxDistance(toucher->momx, toucher->momy) / 4;
|
||||
const fixed_t scale = FixedMul(special->info->speed, special->scale);
|
||||
special->momz = flip * max(dist, scale);
|
||||
if (flip * toucher->momz > 0)
|
||||
special->momz += toucher->momz / 8;
|
||||
if ((statenum_t)(special->state-states) != special->info->seestate)
|
||||
|
||||
+2
-1
@@ -7582,7 +7582,8 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
||||
{
|
||||
if (mobj->tracer->player)
|
||||
{
|
||||
fixed_t speeddifference = abs(topspeed - min(mobj->tracer->player->speed, K_GetKartSpeed(mobj->tracer->player, false)));
|
||||
const fixed_t pspeed = K_GetKartSpeed(mobj->tracer->player, false);
|
||||
fixed_t speeddifference = abs(topspeed - min(mobj->tracer->player->speed, pspeed));
|
||||
topspeed = topspeed - FixedMul(speeddifference, FRACUNIT-FixedDiv(distaway, distbarrier));
|
||||
}
|
||||
}
|
||||
|
||||
+8
-3
@@ -84,7 +84,8 @@ static void P_UpdateSlopeLightOffset(pslope_t *slope)
|
||||
light = FixedDiv(R_PointToAngle2(0, 0, abs(slope->d.x), abs(slope->d.y)), ANGLE_90);
|
||||
}
|
||||
|
||||
zMul = min(FRACUNIT, abs(slope->zdelta)*3/2); // *3/2, to make 60 degree slopes match walls.
|
||||
const int delta = abs(slope->zdelta)*3/2; // *3/2, to make 60 degree slopes match walls.
|
||||
zMul = min(FRACUNIT, delta);
|
||||
contrastFixed = FixedMul(contrastFixed, zMul);
|
||||
|
||||
extralight = -contrastFixed + FixedMul(light, contrastFixed * 2);
|
||||
@@ -123,10 +124,14 @@ static void P_ReconfigureVertexSlope(pslope_t *slope)
|
||||
vec2.z = (slope->vertices[2]->z - slope->vertices[0]->z) << FRACBITS;
|
||||
|
||||
// ugggggggh fixed-point maaaaaaath
|
||||
const int absx1 = abs(vec1.x); const int absy1 = abs(vec1.y); const int absz1 = abs(vec1.z);
|
||||
const int absx2 = abs(vec2.x); const int absy2 = abs(vec2.y); const int absz2 = abs(vec2.z);
|
||||
|
||||
slope->extent = max(
|
||||
max(max(abs(vec1.x), abs(vec1.y)), abs(vec1.z)),
|
||||
max(max(abs(vec2.x), abs(vec2.y)), abs(vec2.z))
|
||||
max(max(absx1, absy1), absz1),
|
||||
max(max(absx2, absy2), absz2)
|
||||
) >> (FRACBITS+5);
|
||||
|
||||
vec1.x /= slope->extent;
|
||||
vec1.y /= slope->extent;
|
||||
vec1.z /= slope->extent;
|
||||
|
||||
+2
-1
@@ -3949,7 +3949,8 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
|
||||
if (player->kartstuff[k_drift] != 0)
|
||||
{
|
||||
fixed_t panmax = (dist/5);
|
||||
pan = FixedDiv(FixedMul(min((fixed_t)player->kartstuff[k_driftcharge], K_GetKartDriftSparkValue(player)), panmax), K_GetKartDriftSparkValue(player));
|
||||
const INT32 sparkval = K_GetKartDriftSparkValue(player);
|
||||
pan = FixedDiv(FixedMul(min((fixed_t)player->kartstuff[k_driftcharge], sparkval), panmax), sparkval);
|
||||
if (pan > panmax)
|
||||
pan = panmax;
|
||||
if (player->kartstuff[k_drift] < 0)
|
||||
|
||||
+35
-32
@@ -622,7 +622,8 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
|
||||
// Look for central directory end signature near end of file.
|
||||
// Contains entry number (number of lumps), and central directory start offset.
|
||||
fseek(handle, 0, SEEK_END);
|
||||
if (!ResFindSignature(handle, pat_end, max(0, ftell(handle) - (22 + 65536))))
|
||||
const long startpos = ftell(handle) - (22 + 65536);
|
||||
if (!ResFindSignature(handle, pat_end, max(0, startpos)))
|
||||
{
|
||||
CONS_Alert(CONS_ERROR, "Missing central directory\n");
|
||||
return NULL;
|
||||
@@ -818,20 +819,20 @@ UINT16 W_InitFile(const char *filename, boolean local)
|
||||
|
||||
switch(type = ResourceFileDetect(filename))
|
||||
{
|
||||
case RET_SOC:
|
||||
lumpinfo = ResGetLumpsStandalone(handle, &numlumps, "OBJCTCFG");
|
||||
break;
|
||||
case RET_LUA:
|
||||
lumpinfo = ResGetLumpsStandalone(handle, &numlumps, "LUA_INIT");
|
||||
break;
|
||||
case RET_PK3:
|
||||
lumpinfo = ResGetLumpsZip(handle, &numlumps);
|
||||
break;
|
||||
case RET_WAD:
|
||||
lumpinfo = ResGetLumpsWad(handle, &numlumps, filename);
|
||||
break;
|
||||
default:
|
||||
CONS_Alert(CONS_ERROR, "Unsupported file format\n");
|
||||
case RET_SOC:
|
||||
lumpinfo = ResGetLumpsStandalone(handle, &numlumps, "OBJCTCFG");
|
||||
break;
|
||||
case RET_LUA:
|
||||
lumpinfo = ResGetLumpsStandalone(handle, &numlumps, "LUA_INIT");
|
||||
break;
|
||||
case RET_PK3:
|
||||
lumpinfo = ResGetLumpsZip(handle, &numlumps);
|
||||
break;
|
||||
case RET_WAD:
|
||||
lumpinfo = ResGetLumpsWad(handle, &numlumps, filename);
|
||||
break;
|
||||
default:
|
||||
CONS_Alert(CONS_ERROR, "Unsupported file format\n");
|
||||
}
|
||||
|
||||
if (lumpinfo == NULL)
|
||||
@@ -884,21 +885,21 @@ UINT16 W_InitFile(const char *filename, boolean local)
|
||||
// TODO: HACK ALERT - Load Lua & SOC stuff right here. I feel like this should be out of this place, but... Let's stick with this for now.
|
||||
switch (wadfile->type)
|
||||
{
|
||||
case RET_WAD:
|
||||
W_LoadDehackedLumps(numwadfiles - 1);
|
||||
break;
|
||||
case RET_PK3:
|
||||
W_LoadDehackedLumpsPK3(numwadfiles - 1);
|
||||
break;
|
||||
case RET_SOC:
|
||||
CONS_Printf(M_GetText("Loading SOC from %s\n"), wadfile->filename);
|
||||
DEH_LoadDehackedLumpPwad(numwadfiles - 1, 0);
|
||||
break;
|
||||
case RET_LUA:
|
||||
LUA_LoadLump(numwadfiles - 1, 0);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
case RET_WAD:
|
||||
W_LoadDehackedLumps(numwadfiles - 1);
|
||||
break;
|
||||
case RET_PK3:
|
||||
W_LoadDehackedLumpsPK3(numwadfiles - 1);
|
||||
break;
|
||||
case RET_SOC:
|
||||
CONS_Printf(M_GetText("Loading SOC from %s\n"), wadfile->filename);
|
||||
DEH_LoadDehackedLumpPwad(numwadfiles - 1, 0);
|
||||
break;
|
||||
case RET_LUA:
|
||||
LUA_LoadLump(numwadfiles - 1, 0);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (refreshdirmenu & REFRESHDIR_GAMEDATA)
|
||||
@@ -2136,7 +2137,8 @@ static int W_VerifyPK3(FILE *fp, lumpchecklist_t *checklist, boolean status)
|
||||
fseek(fp, 0, SEEK_END);
|
||||
file_size = ftell(fp);
|
||||
|
||||
if (!ResFindSignature(fp, pat_end, max(0, ftell(fp) - (22 + 65536))))
|
||||
const long size = file_size - (22 + 65536);
|
||||
if (!ResFindSignature(fp, pat_end, max(0, size)))
|
||||
return true;
|
||||
|
||||
fseek(fp, -4, SEEK_CUR);
|
||||
@@ -2409,7 +2411,8 @@ static int W_CheckPK3Contains(FILE *fp, lumpchecklist_t *checklist)
|
||||
fseek(fp, 0, SEEK_END);
|
||||
file_size = ftell(fp);
|
||||
|
||||
if (!ResFindSignature(fp, pat_end, max(0, ftell(fp) - (22 + 65536))))
|
||||
const long startpos = file_size - (22 + 65536);
|
||||
if (!ResFindSignature(fp, pat_end, max(0, startpos)))
|
||||
return true;
|
||||
|
||||
fseek(fp, -4, SEEK_CUR);
|
||||
|
||||
Reference in new issue
Block a user