Merge branch 'Saturn-Next' into Saturn-Testing
This commit is contained in:
commit
d963df36f1
19 files changed
+139
-149
No files matched your search
+3
-1
@@ -2154,7 +2154,7 @@ static void CL_ReloadReceivedSavegame(void)
|
||||
// we dont have P_ForceLocalAngle so were setting it manually here
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
localangle[i] = (angle_t)(players[displayplayers[i]].cmd.angleturn << 16);
|
||||
P_ForceLocalAngle(&players[displayplayers[i]], (angle_t)(players[displayplayers[i]].cmd.angleturn << 16));
|
||||
}
|
||||
|
||||
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
|
||||
@@ -4527,6 +4527,8 @@ static void Got_AddPlayer(const UINT8 **p, INT32 playernum)
|
||||
DEBFILE("spawning me\n");
|
||||
}
|
||||
|
||||
P_ForceLocalAngle(&players[newplayernum], (angle_t)(players[newplayernum].cmd.angleturn << 16));
|
||||
|
||||
D_SendPlayerConfig();
|
||||
addedtogame = true;
|
||||
}
|
||||
|
||||
@@ -484,6 +484,7 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
|
||||
|
||||
G_CopyTiccmd(cmd, &oldcmd[playernum], 1);
|
||||
|
||||
// what in the actual fuck is this???
|
||||
// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
|
||||
if (((players[displayplayers[0]].mo && players[displayplayers[0]].speed > 0) // Moving
|
||||
|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
|
||||
|
||||
+1
-1
@@ -160,7 +160,7 @@ typedef enum
|
||||
const char *G_BuildMapName(INT32 map);
|
||||
void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer);
|
||||
|
||||
// copy ticcmd_t to and fro the normal way
|
||||
// copy ticcmd_t to and from the normal way
|
||||
ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
|
||||
// copy ticcmd_t to and fro network packets
|
||||
ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
|
||||
|
||||
+18
-8
@@ -3978,15 +3978,19 @@ void K_PuntMine(mobj_t *thismine, mobj_t *punter)
|
||||
mine->floorz = thismine->floorz;
|
||||
mine->ceilingz = thismine->ceilingz;
|
||||
|
||||
//Since we aren't using P_KillMobj, we need to clean up the hnext reference
|
||||
{
|
||||
P_SetTarget(&thismine->target->hnext, NULL); //target is the player who owns the mine
|
||||
thismine->target->player->kartstuff[k_bananadrag] = 0;
|
||||
thismine->target->player->kartstuff[k_itemheld] = 0;
|
||||
// Copy interp data
|
||||
mine->old_angle = thismine->old_angle;
|
||||
mine->old_x = thismine->old_x;
|
||||
mine->old_y = thismine->old_y;
|
||||
mine->old_z = thismine->old_z;
|
||||
|
||||
if (--thismine->target->player->kartstuff[k_itemamount] <= 0)
|
||||
thismine->target->player->kartstuff[k_itemtype] = KITEM_NONE;
|
||||
}
|
||||
// Since we aren't using P_KillMobj, we need to clean up the hnext reference
|
||||
P_SetTarget(&thismine->target->hnext, NULL); // target is the player who owns the mine
|
||||
thismine->target->player->kartstuff[k_bananadrag] = 0;
|
||||
thismine->target->player->kartstuff[k_itemheld] = 0;
|
||||
|
||||
if (--thismine->target->player->kartstuff[k_itemamount] <= 0)
|
||||
thismine->target->player->kartstuff[k_itemtype] = KITEM_NONE;
|
||||
|
||||
P_RemoveMobj(thismine);
|
||||
|
||||
@@ -4422,6 +4426,12 @@ void K_DropHnextList(player_t *player)
|
||||
dropwork->floorz = work->floorz;
|
||||
dropwork->ceilingz = work->ceilingz;
|
||||
|
||||
// Copy interp data
|
||||
dropwork->old_angle = work->old_angle;
|
||||
dropwork->old_x = work->old_x;
|
||||
dropwork->old_y = work->old_y;
|
||||
dropwork->old_z = work->old_z;
|
||||
|
||||
if (ponground)
|
||||
{
|
||||
// floorz and ceilingz aren't properly set to account for FOFs and Polyobjects on spawn
|
||||
|
||||
+2
-8
@@ -251,14 +251,8 @@ int mobj_angle_setter(lua_State *L)
|
||||
mobj_t *mo = GETMO();
|
||||
|
||||
mo->angle = luaL_checkangle(L, 2);
|
||||
for (UINT8 i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (mo->player == P_GetLocalPlayerForNum(i))
|
||||
{
|
||||
localangle[i] = mo->angle;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (mo->player)
|
||||
P_ForceLocalAngle(mo->player, mo->angle);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
+1
-1
@@ -1874,7 +1874,7 @@ static const char* OP_SaturnHudTooltips[] =
|
||||
"Disable the animation of the Positionnumber\nwhen overtaking someone.",
|
||||
"Flash current Lap Time when doing a Lap on the Timer.",
|
||||
"Use extra graphics for multiple sneakers, bananas and jawz.",
|
||||
"Change when the item amount is to be displayed\nMultiple will always display the number.\nwhen you have multiple of the same Item.\nAlways will always display the number regardless of Item amount.",
|
||||
"Change when the item amount is to be displayed.\nMultiple will always display the number.\nWhen you have multiple of the same Item.\nAlways will always display the number regardless of Item amount.",
|
||||
"Enables an animation while the roulette is active.",
|
||||
"Show the big 'LAP' text on a lap change.",
|
||||
"Show the big Cecho Messages.",
|
||||
|
||||
+1
-8
@@ -869,14 +869,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
||||
|
||||
toucher->angle = special->angle;
|
||||
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (player == P_GetLocalPlayerForNum(i))
|
||||
{
|
||||
localangle[i] = toucher->angle;
|
||||
break;
|
||||
}
|
||||
}
|
||||
P_ForceLocalAngle(player, toucher->angle);
|
||||
|
||||
P_ResetPlayer(player);
|
||||
|
||||
|
||||
+4
-1
@@ -192,6 +192,7 @@ void P_DoPlayerPain(player_t *player, mobj_t *source, mobj_t *inflictor);
|
||||
void P_ResetPlayer(player_t *player);
|
||||
player_t *P_GetLocalPlayerForNum(UINT8 pnum);
|
||||
INT32 P_GetLocalPlayerNumForNum(UINT8 pnum);
|
||||
INT32 P_GetLocalPlayerNumForPlayer(const player_t *player);
|
||||
boolean P_IsLocalPlayer(const player_t *player);
|
||||
boolean P_IsLocalPlayerNum(UINT8 pnum);
|
||||
boolean P_IsDisplayPlayer(const player_t *player);
|
||||
@@ -226,7 +227,9 @@ void P_PlayerThink(player_t *player);
|
||||
void P_PlayerAfterThink(player_t *player);
|
||||
void P_DoPlayerExit(player_t *player);
|
||||
void P_DoTimeOver(player_t *player);
|
||||
//void P_NightserizePlayer(player_t *player, INT32 ptime);
|
||||
|
||||
angle_t P_GetLocalAngle(player_t *player);
|
||||
void P_ForceLocalAngle(player_t *player, angle_t angle);
|
||||
|
||||
void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move);
|
||||
fixed_t P_ReturnThrustX(mobj_t *mo, angle_t angle, fixed_t move);
|
||||
|
||||
+1
-8
@@ -223,14 +223,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
|
||||
|
||||
if (!demo.playback || P_AnalogMove(object->player))
|
||||
{
|
||||
for (UINT8 j = 0; j <= splitscreen; ++j)
|
||||
{
|
||||
if (object->player == P_GetLocalPlayerForNum(j))
|
||||
{
|
||||
localangle[j] = spring->angle;
|
||||
break;
|
||||
}
|
||||
}
|
||||
P_ForceLocalAngle(object->player, spring->angle);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+9
-9
@@ -10681,8 +10681,9 @@ void P_SpawnPlayer(INT32 playernum)
|
||||
mobj = P_SpawnMobj(0, 0, 0, MT_PLAYER);
|
||||
I_Assert(mobj != NULL);
|
||||
(mobj->player = p)->mo = mobj;
|
||||
//P_SetTarget(&p->mo, mobj);
|
||||
|
||||
mobj->angle = 0;
|
||||
mobj->angle = mobj->old_angle = 0;
|
||||
|
||||
// set color translations for player sprites
|
||||
mobj->color = p->skincolor;
|
||||
@@ -10789,14 +10790,13 @@ void P_AfterPlayerSpawn(INT32 playernum)
|
||||
mobj_t *mobj = p->mo;
|
||||
UINT8 i;
|
||||
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (playernum == P_GetLocalPlayerNumForNum(i))
|
||||
{
|
||||
localangle[i] = mobj->angle;
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Update interpolation
|
||||
mobj->old_x = mobj->x;
|
||||
mobj->old_y = mobj->y;
|
||||
mobj->old_z = mobj->z;
|
||||
mobj->old_angle = mobj->angle;
|
||||
|
||||
P_ForceLocalAngle(p, mobj->angle);
|
||||
|
||||
p->viewheight = 32<<FRACBITS;
|
||||
|
||||
|
||||
+3
-6
@@ -1383,13 +1383,10 @@ static void Polyobj_rotateThings(polyobj_t *po, vector2_t origin, angle_t delta,
|
||||
{
|
||||
mo->angle += delta;
|
||||
|
||||
for (UINT8 i = 0; i <= splitscreen; i++)
|
||||
if (mo->player)
|
||||
{
|
||||
if (mo->player == P_GetLocalPlayerForNum(i))
|
||||
{
|
||||
localangle[i] += delta;
|
||||
break;
|
||||
}
|
||||
angle_t localangle = P_GetLocalAngle(mo->player);
|
||||
P_ForceLocalAngle(mo->player, localangle + delta);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+7
-17
@@ -339,7 +339,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save, boolean reloading)
|
||||
for (j = 0; j < NUMKARTSTUFF; j++)
|
||||
player->kartstuff[j] = READINT32(save->p);
|
||||
|
||||
player->frameangle = READANGLE(save->p);
|
||||
player->frameangle = player->old_frameangle = READANGLE(save->p);
|
||||
|
||||
player->playerstate = READUINT8(save->p);
|
||||
player->pflags = READUINT32(save->p);
|
||||
@@ -2037,15 +2037,15 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
|
||||
|
||||
if (diff & MD_POS)
|
||||
{
|
||||
mobj->x = READFIXED(save->p);
|
||||
mobj->y = READFIXED(save->p);
|
||||
mobj->angle = READANGLE(save->p);
|
||||
mobj->x = mobj->old_x = READFIXED(save->p);
|
||||
mobj->y = mobj->old_y = READFIXED(save->p);
|
||||
mobj->angle = mobj->old_angle = READANGLE(save->p);
|
||||
}
|
||||
else
|
||||
{
|
||||
mobj->x = mobj->spawnpoint->x << FRACBITS;
|
||||
mobj->y = mobj->spawnpoint->y << FRACBITS;
|
||||
mobj->angle = FixedAngle(mobj->spawnpoint->angle*FRACUNIT);
|
||||
mobj->x = mobj->old_x = mobj->spawnpoint->x << FRACBITS;
|
||||
mobj->y = mobj->old_y = mobj->spawnpoint->y << FRACBITS;
|
||||
mobj->angle = mobj->old_angle = FixedAngle(mobj->spawnpoint->angle*FRACUNIT);
|
||||
}
|
||||
|
||||
if (diff & MD_MOM)
|
||||
@@ -2107,16 +2107,6 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
|
||||
i = READUINT8(save->p);
|
||||
mobj->player = &players[i];
|
||||
mobj->player->mo = mobj;
|
||||
|
||||
// added for angle prediction
|
||||
if (consoleplayer == i)
|
||||
localangle[0] = mobj->angle;
|
||||
else if (displayplayers[1] == i)
|
||||
localangle[1] = mobj->angle;
|
||||
else if (displayplayers[2] == i)
|
||||
localangle[2] = mobj->angle;
|
||||
else if (displayplayers[3] == i)
|
||||
localangle[3] = mobj->angle;
|
||||
}
|
||||
if (diff & MD_MOVEDIR)
|
||||
mobj->movedir = READANGLE(save->p);
|
||||
|
||||
+7
-20
@@ -3559,14 +3559,7 @@ DoneSection2:
|
||||
|
||||
if (!demo.playback || P_AnalogMove(player))
|
||||
{
|
||||
for (UINT8 j = 0; j <= splitscreen; ++j)
|
||||
{
|
||||
if (player == P_GetLocalPlayerForNum(j))
|
||||
{
|
||||
localangle[j] = player->mo->angle;
|
||||
break;
|
||||
}
|
||||
}
|
||||
P_ForceLocalAngle(player, player->mo->angle);
|
||||
}
|
||||
|
||||
if (!(lines[i].flags & ML_EFFECT4))
|
||||
@@ -7517,22 +7510,16 @@ void T_Pusher(pusher_t *p)
|
||||
thing->player->pflags |= PF_JUMPED;
|
||||
|
||||
thing->player->pflags |= PF_SLIDING;
|
||||
thing->angle = R_PointToAngle2 (0, 0, xspeed<<(FRACBITS-PUSH_FACTOR), yspeed<<(FRACBITS-PUSH_FACTOR));
|
||||
thing->angle = R_PointToAngle2(0, 0, xspeed<<(FRACBITS-PUSH_FACTOR), yspeed<<(FRACBITS-PUSH_FACTOR));
|
||||
|
||||
if (!demo.playback || P_AnalogMove(thing->player))
|
||||
{
|
||||
for (UINT8 i = 0; i <= splitscreen; ++i)
|
||||
{
|
||||
if (thing->player == P_GetLocalPlayerForNum(i))
|
||||
{
|
||||
if (thing->angle - localangle[i] > ANGLE_180)
|
||||
localangle[i] -= (localangle[i] - thing->angle) / 8;
|
||||
else
|
||||
localangle[i] += (thing->angle - localangle[i]) / 8;
|
||||
angle_t angle = P_GetLocalAngle(thing->player);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (thing->angle - angle > ANGLE_180)
|
||||
P_ForceLocalAngle(thing->player, angle - (angle - thing->angle) / 8);
|
||||
else
|
||||
P_ForceLocalAngle(thing->player, angle + (thing->angle - angle) / 8);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+4
-10
@@ -65,14 +65,7 @@ void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle,
|
||||
thing->reactiontime = TICRATE/2; // don't move for about half a second
|
||||
|
||||
// absolute angle position
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (thing == P_GetLocalPlayerForNum(i)->mo)
|
||||
{
|
||||
localangle[i] = angle;
|
||||
break;
|
||||
}
|
||||
}
|
||||
P_ForceLocalAngle(thing->player, angle);
|
||||
|
||||
// move chasecam at new player location
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
@@ -106,6 +99,7 @@ void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle,
|
||||
P_FlashPal(thing->player, PAL_MIXUP, 10);
|
||||
}
|
||||
|
||||
thing->old_angle += (angle-thing->angle);
|
||||
thing->angle = angle;
|
||||
|
||||
thing->momx = thing->momy = thing->momz = 0;
|
||||
@@ -150,18 +144,18 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle
|
||||
thing->reactiontime = TICRATE/2; // don't move for about half a second
|
||||
|
||||
// absolute angle position
|
||||
P_ForceLocalAngle(thing->player, angle);
|
||||
|
||||
// move chasecam at new player location
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (thing->player != &players[displayplayers[i]])
|
||||
continue;
|
||||
|
||||
localangle[i] = angle;
|
||||
if (camera[i].chase)
|
||||
P_ResetCamera(thing->player, &camera[i]);
|
||||
|
||||
R_ResetViewInterpolation(i + 1);
|
||||
break;
|
||||
}
|
||||
|
||||
// don't run in place after a teleport
|
||||
|
||||
+55
-29
@@ -996,6 +996,19 @@ INT32 P_GetLocalPlayerNumForNum(UINT8 pnum)
|
||||
return (pnum == 0 ? consoleplayer : displayplayers[pnum]);
|
||||
}
|
||||
|
||||
INT32 P_GetLocalPlayerNumForPlayer(const player_t *player)
|
||||
{
|
||||
for (UINT8 i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (player == P_GetLocalPlayerForNum(i))
|
||||
{
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
//
|
||||
// P_IsLocalPlayer
|
||||
//
|
||||
@@ -1162,6 +1175,9 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
|
||||
|
||||
ghost = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_GHOST);
|
||||
|
||||
// not sure if this is safe to do...........
|
||||
//P_SetTarget(&ghost->target, mobj);
|
||||
|
||||
P_SetScale(ghost, mobj->scale);
|
||||
ghost->scalespeed = mobj->scalespeed;
|
||||
ghost->destscale = mobj->scale;
|
||||
@@ -1175,10 +1191,7 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
|
||||
ghost->color = mobj->color;
|
||||
ghost->colorized = mobj->colorized; // Kart: they should also be colorized if their origin is
|
||||
|
||||
if (mobj->player)
|
||||
ghost->angle = mobj->player->frameangle;
|
||||
else
|
||||
ghost->angle = mobj->angle;
|
||||
ghost->angle = (mobj->player ? mobj->player->frameangle : mobj->angle);
|
||||
|
||||
ghost->sprite = mobj->sprite;
|
||||
ghost->frame = mobj->frame;
|
||||
@@ -1191,6 +1204,9 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
|
||||
ghost->localskin = mobj->localskin;
|
||||
ghost->skinlocal = mobj->skinlocal;
|
||||
|
||||
// same deal...
|
||||
//ghost->standingslope = mobj->standingslope;
|
||||
|
||||
ghost->spritexscale = mobj->spritexscale;
|
||||
ghost->spriteyscale = mobj->spriteyscale;
|
||||
ghost->spritexoffset = mobj->spritexoffset;
|
||||
@@ -2600,15 +2616,7 @@ static void P_DoZoomTube(player_t *player)
|
||||
if (player->mo->tracer)
|
||||
{
|
||||
player->mo->angle = R_PointToAngle2(player->mo->x, player->mo->y, player->mo->tracer->x, player->mo->tracer->y);
|
||||
|
||||
for (UINT8 i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (player == P_GetLocalPlayerForNum(i))
|
||||
{
|
||||
localangle[i] = player->mo->angle;
|
||||
break;
|
||||
}
|
||||
}
|
||||
P_ForceLocalAngle(player, player->mo->angle);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2794,14 +2802,7 @@ void P_HomingAttack(mobj_t *source, mobj_t *enemy) // Home in on your target
|
||||
|
||||
if (source->player)
|
||||
{
|
||||
for (UINT8 i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (source->player == P_GetLocalPlayerForNum(i))
|
||||
{
|
||||
localangle[i] = source->angle;
|
||||
break;
|
||||
}
|
||||
}
|
||||
P_ForceLocalAngle(source->player, source->angle);
|
||||
}
|
||||
|
||||
// change slope
|
||||
@@ -5197,14 +5198,8 @@ void P_PlayerAfterThink(player_t *player)
|
||||
player->mo->tracer->target->health += cmd->sidemove;
|
||||
player->mo->angle += cmd->sidemove << ANGLETOFINESHIFT; // 2048 --> ANGLE_MAX
|
||||
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (player == P_GetLocalPlayerForNum(i))
|
||||
{
|
||||
localangle[i] = player->mo->angle; // Adjust the local control angle.
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Adjust the local control angle.
|
||||
P_ForceLocalAngle(player, player->mo->angle);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5243,3 +5238,34 @@ void P_PlayerAfterThink(player_t *player)
|
||||
|
||||
K_KartPlayerAfterThink(player);
|
||||
}
|
||||
|
||||
angle_t P_GetLocalAngle(player_t *player)
|
||||
{
|
||||
// this function is from vanilla srb2. can you tell?
|
||||
// (hint: they have separate variables for all of this shit instead of arrays)
|
||||
UINT8 i;
|
||||
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (player == &players[displayplayers[i]])
|
||||
return localangle[i];
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void P_ForceLocalAngle(player_t *player, angle_t angle)
|
||||
{
|
||||
UINT8 i;
|
||||
|
||||
angle = angle & ~UINT16_MAX;
|
||||
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (player == &players[displayplayers[i]])
|
||||
{
|
||||
localangle[i] = angle;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -500,7 +500,7 @@ clipsolid:
|
||||
// 0 | 0 | 1 | 2
|
||||
// 1 | 4 | 5 | 6
|
||||
// 2 | 8 | 9 | A
|
||||
INT32 checkcoord[12][4] =
|
||||
const INT32 checkcoord[12][4] =
|
||||
{
|
||||
{3, 0, 2, 1},
|
||||
{3, 0, 2, 0},
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ extern portal_t *g_portal; // is curline a portal seg?
|
||||
|
||||
// drawsegs are allocated on the fly... see r_segs.c
|
||||
|
||||
extern INT32 checkcoord[12][4];
|
||||
extern const INT32 checkcoord[12][4];
|
||||
|
||||
extern drawseg_t *curdrawsegs;
|
||||
extern drawseg_t *drawsegs;
|
||||
|
||||
@@ -150,6 +150,26 @@ subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y);
|
||||
#define R_PointToDist(x, y) R_PointToDist2(viewx, viewy, x, y)
|
||||
#define R_PointToDist2(px2, py2, px1, py1) FixedHypot((px1) - (px2), (py1) - (py2))
|
||||
|
||||
FUNCMATH FUNCINLINE static ATTRINLINE fixed_t R_QuickDist(fixed_t x1, fixed_t y1, fixed_t x, fixed_t y)
|
||||
{
|
||||
const fixed_t absx = abs(x - x1);
|
||||
const fixed_t absy = abs(y - y1);
|
||||
#ifdef __cplusplus
|
||||
return std::max<fixed_t>(absx, absy);
|
||||
#else
|
||||
return max(absx, absy);
|
||||
#endif
|
||||
}
|
||||
|
||||
// Takes 2 fixed-point coordinates, returns "distance" between them and camera,
|
||||
// as an fixed-point integer.
|
||||
// It is very rough, tho it is used only for optimizing out unnecessary
|
||||
// interpolation, so it is kinda ok on big distances.
|
||||
FUNCINLINE static ATTRINLINE PUREFUNC fixed_t R_QuickCamDist(fixed_t x, fixed_t y)
|
||||
{
|
||||
return R_QuickDist(viewx, viewy, x, y);
|
||||
}
|
||||
|
||||
line_t *R_GetFFloorLine(const line_t *line, const ffloor_t *pfloor, const sector_t *sector);
|
||||
side_t *R_GetFFloorSide(const line_t *line, const ffloor_t *pfloor, const sector_t *sector);
|
||||
|
||||
|
||||
@@ -35,26 +35,6 @@ extern "C" {
|
||||
|
||||
#define FEETADJUST (4<<FRACBITS) // R_AddSingleSpriteDef
|
||||
|
||||
FUNCINLINE static ATTRINLINE fixed_t R_QuickDist(fixed_t x1, fixed_t y1, fixed_t x, fixed_t y)
|
||||
{
|
||||
const fixed_t absx = abs(x - x1);
|
||||
const fixed_t absy = abs(y - y1);
|
||||
#ifdef __cplusplus
|
||||
return std::max<fixed_t>(absx, absy);
|
||||
#else
|
||||
return max(absx, absy);
|
||||
#endif
|
||||
}
|
||||
|
||||
// Takes 2 fixed-point coordinates, returns "distance" between them and camera,
|
||||
// as an fixed-point integer.
|
||||
// It is very rough, tho it is used only for optimizing out unnecessary
|
||||
// interpolation, so it is kinda ok on big distances.
|
||||
FUNCINLINE static ATTRINLINE fixed_t R_QuickCamDist(fixed_t x, fixed_t y)
|
||||
{
|
||||
return R_QuickDist(viewx, viewy, x, y);
|
||||
}
|
||||
|
||||
// Constant arrays used for psprite clipping
|
||||
// and initializing clipping.
|
||||
extern INT16 *negonearray;
|
||||
|
||||
Reference in new issue
Block a user