revert bunch of lugstuff specific stuff so i dont desynch and stuffs
This commit is contained in:
1 parent
a8a71cc70c
commit
34196dc989
13 files changed
+86
-135
No files matched your search
+20
-33
@@ -525,8 +525,6 @@ consvar_t cv_sliptideroll = {"sliptideroll", "Off", CV_SAVE, CV_OnOff, NULL, 0,
|
||||
|
||||
consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
static void G_FixCamera(UINT8 view);
|
||||
|
||||
#if MAXPLAYERS > 16
|
||||
#error "please update player_name table using the new value for MAXPLAYERS"
|
||||
#endif
|
||||
@@ -1470,6 +1468,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
||||
lang += (cmd->angleturn<<16);
|
||||
|
||||
cmd->angleturn = (INT16)(lang >> 16);
|
||||
cmd->latency = modeattacking ? 0 : (leveltime & 0xFF); // Send leveltime when this tic was generated to the server for control lag calculations
|
||||
|
||||
if (!hu_stopped)
|
||||
{
|
||||
@@ -1493,14 +1492,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
||||
-Making a Mario Kart 8 Deluxe tier baby mode that steers you away from walls and whatnot. You know what, do what you want!
|
||||
*/
|
||||
if (gamestate == GS_LEVEL)
|
||||
{
|
||||
LUAh_PlayerCmd(player, cmd);
|
||||
|
||||
// Send leveltime when this tic was generated to the server for control lag calculations.
|
||||
// Only do this when in a level. Also do this after the hook, so that it can't overwrite this.
|
||||
cmd->latency = modeattacking ? 0 : (leveltime & 0xFF);
|
||||
}
|
||||
|
||||
//Reset away view if a command is given.
|
||||
if ((cmd->forwardmove || cmd->sidemove || cmd->buttons)
|
||||
&& displayplayers[0] != consoleplayer && ssplayer == 1)
|
||||
@@ -2090,6 +2083,7 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive)
|
||||
UINT8 viewd;
|
||||
|
||||
INT32 *displayplayerp;
|
||||
camera_t *camerap;
|
||||
|
||||
INT32 olddisplayplayer;
|
||||
INT32 playersviewable;
|
||||
@@ -2128,15 +2122,29 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive)
|
||||
(*displayplayerp) = playernum;
|
||||
if ((*displayplayerp) != olddisplayplayer)
|
||||
{
|
||||
G_FixCamera(viewnum);
|
||||
camerap = &camera[viewnum-1];
|
||||
P_ResetCamera(&players[(*displayplayerp)], camerap);
|
||||
|
||||
// Make sure the viewport doesn't interpolate at all into
|
||||
// its new position -- just snap instantly into place.
|
||||
R_ResetViewInterpolation(viewnum);
|
||||
}
|
||||
|
||||
if (viewnum > splits)
|
||||
{
|
||||
for (viewd = splits+1; viewd < viewnum; ++viewd)
|
||||
{
|
||||
displayplayers[viewd-1] = G_FindView(displayplayers[viewd-1], viewd, onlyactive, playernum < olddisplayplayer);
|
||||
G_FixCamera(viewd);
|
||||
displayplayerp = (&displayplayers[viewd-1]);
|
||||
camerap = &camera[viewd];
|
||||
|
||||
(*displayplayerp) = G_FindView(0, viewd, onlyactive, false);
|
||||
|
||||
P_ResetCamera(&players[(*displayplayerp)], camerap);
|
||||
|
||||
|
||||
// Make sure the viewport doesn't interpolate at all into
|
||||
// its new position -- just snap instantly into place.
|
||||
R_ResetViewInterpolation(viewd);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2194,26 +2202,6 @@ void G_ResetViews(void)
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// G_FixCamera
|
||||
// Reset camera position, angle and interpolation on a view
|
||||
// after changing state.
|
||||
//
|
||||
static void G_FixCamera(UINT8 view)
|
||||
{
|
||||
player_t *player = &players[displayplayers[view - 1]];
|
||||
|
||||
// The order of displayplayers can change, which would
|
||||
// invalidate localangle.
|
||||
localangle[view - 1] = player->cmd.angleturn;
|
||||
|
||||
P_ResetCamera(player, &camera[view - 1]);
|
||||
|
||||
// Make sure the viewport doesn't interpolate at all into
|
||||
// its new position -- just snap instantly into place.
|
||||
R_ResetViewInterpolation(view);
|
||||
}
|
||||
|
||||
//
|
||||
// G_Ticker
|
||||
// Make ticcmd_ts for the players.
|
||||
@@ -3096,7 +3084,6 @@ void G_DoReborn(INT32 playernum)
|
||||
oldmo = player->mo;
|
||||
// Don't leave your carcass stuck 10-billion feet in the ground!
|
||||
P_RemoveMobj(player->mo);
|
||||
P_SetTarget(&player->mo, NULL);
|
||||
}
|
||||
|
||||
B_RespawnBot(playernum);
|
||||
@@ -3119,7 +3106,6 @@ void G_DoReborn(INT32 playernum)
|
||||
oldmo = player->mo;
|
||||
// Don't leave your carcass stuck 10-billion feet in the ground!
|
||||
P_RemoveMobj(player->mo);
|
||||
P_SetTarget(&player->mo, NULL);
|
||||
}
|
||||
|
||||
G_SpawnPlayer(playernum, starpost);
|
||||
@@ -5669,6 +5655,7 @@ void G_ConsGhostTic(INT32 playernum)
|
||||
mobj = (mobj_t *)th;
|
||||
if (mobj->type == (mobjtype_t)type && mobj->x == x && mobj->y == y && mobj->z == z)
|
||||
break;
|
||||
mobj = NULL; // wasn't this one, keep searching.
|
||||
}
|
||||
if (mobj && mobj->health != health) // Wasn't damaged?! This is desync! Fix it!
|
||||
{
|
||||
|
||||
@@ -4293,13 +4293,6 @@ void K_UpdateHnextList(player_t *player, boolean clean)
|
||||
|
||||
P_RemoveMobj(work);
|
||||
}
|
||||
|
||||
if (player->mo->hnext == NULL || P_MobjWasRemoved(player->mo->hnext))
|
||||
{
|
||||
// Like below, try to clean up the pointer if it's NULL.
|
||||
// Maybe this was a cause of the shrink/eggbox fails?
|
||||
P_SetTarget(&player->mo->hnext, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
// For getting hit!
|
||||
|
||||
+7
-10
@@ -2418,11 +2418,9 @@ void A_1upThinker(mobj_t *actor)
|
||||
if (closestplayer == -1 || skins[players[closestplayer].skin].spritedef.numframes <= states[S_PLAY_BOX1].frame)
|
||||
{ // Closest player not found (no players in game?? may be empty dedicated server!), or does not have correct sprite.
|
||||
actor->frame = 0;
|
||||
if (actor->tracer)
|
||||
{
|
||||
mobj_t *tracer = actor->tracer;
|
||||
P_SetTarget(&actor->tracer, NULL);
|
||||
P_RemoveMobj(tracer);
|
||||
if (actor->tracer) {
|
||||
P_RemoveMobj(actor->tracer);
|
||||
P_SetTarget(&actor->target, NULL);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -3929,11 +3927,10 @@ void A_MineExplode(mobj_t *actor)
|
||||
for (d = 0; d < 16; d++)
|
||||
K_SpawnKartExplosion(actor->x, actor->y, actor->z, explodedist + 32*mapobjectscale, 32, type, d*(ANGLE_45/4), true, false, actor->target); // 32 <-> 64
|
||||
|
||||
skincolors_t color = SKINCOLOR_KETCHUP;
|
||||
if (!P_MobjWasRemoved(actor->target) && actor->target->player)
|
||||
color = actor->target->player->skincolor;
|
||||
|
||||
K_SpawnMineExplosion(actor, color);
|
||||
if (actor->target && actor->target->player)
|
||||
K_SpawnMineExplosion(actor, actor->target->player->skincolor);
|
||||
else
|
||||
K_SpawnMineExplosion(actor, SKINCOLOR_KETCHUP);
|
||||
|
||||
P_SpawnMobj(actor->x, actor->y, actor->z, MT_MINEEXPLOSIONSOUND);
|
||||
|
||||
|
||||
+1
-1
@@ -2390,7 +2390,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|
||||
else if (target->player && target->player->spectator)
|
||||
return false;
|
||||
|
||||
if (!P_MobjWasRemoved(source) && source->player && source->player->spectator)
|
||||
if (source && source->player && source->player->spectator)
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+8
-10
@@ -1548,13 +1548,13 @@ static boolean PIT_CheckThing(mobj_t *thing)
|
||||
{
|
||||
tmfloorz = tmceilingz = topz; // block while in air
|
||||
tmceilingslope = NULL;
|
||||
P_SetTarget(&tmfloorthing, thing); // needed for side collision
|
||||
tmfloorthing = thing; // needed for side collision
|
||||
}
|
||||
else if (topz < tmceilingz && tmthing->z <= thing->z+thing->height)
|
||||
{
|
||||
tmceilingz = topz;
|
||||
tmceilingslope = NULL;
|
||||
P_SetTarget(&tmfloorthing, thing); // thing we may stand on
|
||||
tmfloorthing = thing; // thing we may stand on
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -1585,13 +1585,13 @@ static boolean PIT_CheckThing(mobj_t *thing)
|
||||
{
|
||||
tmfloorz = tmceilingz = topz; // block while in air
|
||||
tmfloorslope = NULL;
|
||||
P_SetTarget(&tmfloorthing, thing); // needed for side collision
|
||||
tmfloorthing = thing; // needed for side collision
|
||||
}
|
||||
else if (topz > tmfloorz && tmthing->z+tmthing->height >= thing->z)
|
||||
{
|
||||
tmfloorz = topz;
|
||||
tmfloorslope = NULL;
|
||||
P_SetTarget(&tmfloorthing, thing); // thing we may stand on
|
||||
tmfloorthing = thing; // thing we may stand on
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1991,8 +1991,8 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
|
||||
}
|
||||
|
||||
// tmfloorthing is set when tmfloorz comes from a thing's top
|
||||
P_SetTarget(&tmfloorthing, NULL);
|
||||
P_SetTarget(&tmhitthing, NULL);
|
||||
tmfloorthing = NULL;
|
||||
tmhitthing = NULL;
|
||||
|
||||
validcount++;
|
||||
|
||||
@@ -2492,10 +2492,8 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
|
||||
|
||||
if (tmceilingz - tmfloorz < thing->height)
|
||||
{
|
||||
if (tmfloorthing != NULL)
|
||||
{
|
||||
P_SetTarget(&tmhitthing, tmfloorthing);
|
||||
}
|
||||
if (tmfloorthing)
|
||||
tmhitthing = tmfloorthing;
|
||||
return false; // doesn't fit
|
||||
}
|
||||
|
||||
|
||||
+17
-30
@@ -5830,7 +5830,7 @@ static void P_AddOverlay(mobj_t *thing)
|
||||
// Keeps the hnext list from corrupting.
|
||||
static void P_RemoveOverlay(mobj_t *thing)
|
||||
{
|
||||
mobj_t *mo, **p;
|
||||
mobj_t *mo;
|
||||
if (overlaycap == thing)
|
||||
{
|
||||
P_SetTarget(&overlaycap, thing->hnext);
|
||||
@@ -5838,12 +5838,12 @@ static void P_RemoveOverlay(mobj_t *thing)
|
||||
return;
|
||||
}
|
||||
|
||||
for (mo = *(p = &overlaycap); mo; mo = *(p = &mo->hnext))
|
||||
for (mo = overlaycap; mo; mo = mo->hnext)
|
||||
{
|
||||
if (mo != thing)
|
||||
if (mo->hnext != thing)
|
||||
continue;
|
||||
|
||||
P_SetTarget(p, thing->hnext);
|
||||
P_SetTarget(&mo->hnext, thing->hnext);
|
||||
P_SetTarget(&thing->hnext, NULL);
|
||||
return;
|
||||
}
|
||||
@@ -5944,7 +5944,7 @@ static void P_AddShadow(mobj_t *thing)
|
||||
// Keeps the hnext list from corrupting.
|
||||
static void P_RemoveShadow(mobj_t *thing)
|
||||
{
|
||||
mobj_t *mo, **p;
|
||||
mobj_t *mo;
|
||||
if (shadowcap == thing)
|
||||
{
|
||||
P_SetTarget(&shadowcap, thing->hnext);
|
||||
@@ -5952,12 +5952,12 @@ static void P_RemoveShadow(mobj_t *thing)
|
||||
return;
|
||||
}
|
||||
|
||||
for (mo = *(p = &shadowcap); mo; mo = *(p = &mo->hnext))
|
||||
for (mo = shadowcap; mo; mo = mo->hnext)
|
||||
{
|
||||
if (mo != thing)
|
||||
if (mo->hnext != thing)
|
||||
continue;
|
||||
|
||||
P_SetTarget(p, thing->hnext);
|
||||
P_SetTarget(&mo->hnext, thing->hnext);
|
||||
P_SetTarget(&thing->hnext, NULL);
|
||||
return;
|
||||
}
|
||||
@@ -6129,8 +6129,7 @@ void P_MobjThinker(mobj_t *mobj)
|
||||
mobj->flags2 &= ~MF2_PUSHED;
|
||||
mobj->eflags &= ~(MFE_SPRUNG|MFE_JUSTBOUNCEDWALL);
|
||||
|
||||
P_SetTarget(&tmfloorthing, NULL);
|
||||
P_SetTarget(&tmhitthing, NULL);
|
||||
tmfloorthing = tmhitthing = NULL;
|
||||
|
||||
// 970 allows ANY mobj to trigger a linedef exec
|
||||
if (mobj->subsector && GETSECSPECIAL(mobj->subsector->sector->special, 2) == 8)
|
||||
@@ -6177,9 +6176,6 @@ void P_MobjThinker(mobj_t *mobj)
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (P_MobjWasRemoved(mobj))
|
||||
return;
|
||||
}
|
||||
|
||||
if (mobj->type == MT_GHOST && mobj->fuse > 0 // Not guaranteed to be MF_SCENERY or not MF_SCENERY!
|
||||
@@ -10079,8 +10075,7 @@ void P_RemoveMobj(mobj_t *mobj)
|
||||
// killough 11/98:
|
||||
//
|
||||
// Remove any references to other mobjs.
|
||||
P_SetTarget(&mobj->target, NULL);
|
||||
P_SetTarget(&mobj->tracer, NULL);
|
||||
P_SetTarget(&mobj->target, P_SetTarget(&mobj->tracer, NULL));
|
||||
|
||||
// repair hnext chain
|
||||
mobj_t *cachenext = mobj->hnext;
|
||||
@@ -10107,7 +10102,7 @@ void P_RemoveMobj(mobj_t *mobj)
|
||||
|
||||
// clear the reference from the mapthing
|
||||
if (mobj->spawnpoint)
|
||||
P_SetTarget(&mobj->spawnpoint->mobj, NULL);
|
||||
mobj->spawnpoint->mobj = NULL;
|
||||
|
||||
R_RemoveMobjInterpolator(mobj);
|
||||
|
||||
@@ -10645,9 +10640,7 @@ void P_SpawnPlayer(INT32 playernum)
|
||||
|
||||
mobj = P_SpawnMobj(0, 0, 0, MT_PLAYER);
|
||||
I_Assert(mobj != NULL);
|
||||
|
||||
mobj->player = p;
|
||||
P_SetTarget(&p->mo, mobj);
|
||||
(mobj->player = p)->mo = mobj;
|
||||
|
||||
mobj->angle = 0;
|
||||
|
||||
@@ -11871,10 +11864,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
|
||||
P_SetTarget(&mobj->hprev->hnext, mobj);
|
||||
}
|
||||
else
|
||||
{
|
||||
P_SetTarget(&mobj->hprev, NULL);
|
||||
P_SetTarget(&mobj->hnext, NULL);
|
||||
}
|
||||
mobj->hprev = mobj->hnext = NULL;
|
||||
|
||||
nextmobj = mobj;
|
||||
}
|
||||
@@ -11900,7 +11890,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
|
||||
mobj->z -= mobj->height/2;
|
||||
|
||||
// Link all the collision sprites together.
|
||||
P_SetTarget(&mobj->hnext, NULL);
|
||||
mobj->hnext = NULL;
|
||||
P_SetTarget(&mobj->hprev, nextmobj);
|
||||
P_SetTarget(&mobj->hprev->hnext, mobj);
|
||||
|
||||
@@ -11927,7 +11917,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
|
||||
mobj->z -= mobj->height/2;
|
||||
|
||||
// Link all the collision sprites together.
|
||||
P_SetTarget(&mobj->hnext, NULL);
|
||||
mobj->hnext = NULL;
|
||||
P_SetTarget(&mobj->hprev, nextmobj);
|
||||
P_SetTarget(&mobj->hprev->hnext, mobj);
|
||||
|
||||
@@ -12014,10 +12004,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
|
||||
P_SetTarget(&mobj->hprev->hnext, mobj);
|
||||
}
|
||||
else
|
||||
{
|
||||
P_SetTarget(&mobj->hprev, NULL);
|
||||
P_SetTarget(&mobj->hnext, NULL);
|
||||
}
|
||||
mobj->hprev = mobj->hnext = NULL;
|
||||
|
||||
nextmobj = mobj;
|
||||
}
|
||||
@@ -12054,7 +12041,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
|
||||
mobj->z -= mobj->height/2;
|
||||
|
||||
// Link all the collision sprites together.
|
||||
P_SetTarget(&mobj->hnext, NULL);
|
||||
mobj->hnext = NULL;
|
||||
P_SetTarget(&mobj->hprev, nextmobj);
|
||||
P_SetTarget(&mobj->hprev->hnext, mobj);
|
||||
|
||||
|
||||
+11
-2
@@ -2315,6 +2315,7 @@ static void P_LevelInitStuff(boolean reloadinggamestate)
|
||||
void P_LoadThingsOnly(void)
|
||||
{
|
||||
// Search through all the thinkers.
|
||||
mobj_t *mo;
|
||||
thinker_t *think;
|
||||
|
||||
virtres_t* virt = vres_GetMap(lastloadedmaplumpnum);
|
||||
@@ -2323,8 +2324,12 @@ void P_LoadThingsOnly(void)
|
||||
for (think = thinkercap.next; think != &thinkercap; think = think->next)
|
||||
{
|
||||
if (think->function.acp1 != (actionf_p1)P_MobjThinker)
|
||||
continue;
|
||||
P_RemoveMobj((mobj_t *)think);
|
||||
continue; // not a mobj thinker
|
||||
|
||||
mo = (mobj_t *)think;
|
||||
|
||||
if (mo)
|
||||
P_RemoveMobj(mo);
|
||||
}
|
||||
|
||||
P_LevelInitStuff(false);
|
||||
@@ -3069,6 +3074,9 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
|
||||
displayplayers[0] = consoleplayer; // Start with your OWN view, please!
|
||||
}
|
||||
|
||||
// clear special respawning que
|
||||
iquehead = iquetail = 0;
|
||||
|
||||
P_MapEnd();
|
||||
|
||||
// Remove the loading shit from the screen
|
||||
@@ -3121,6 +3129,7 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
|
||||
|
||||
if (rendermode != render_none)
|
||||
{
|
||||
R_ResetViewInterpolation(0);
|
||||
R_ResetViewInterpolation(0);
|
||||
R_UpdateMobjInterpolators();
|
||||
}
|
||||
|
||||
@@ -2485,7 +2485,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
||||
case 422: // Cut away to another view
|
||||
{
|
||||
mobj_t *altview;
|
||||
INT32 i;
|
||||
|
||||
if (!mo || !mo->player) // only players have views
|
||||
return;
|
||||
@@ -2500,14 +2499,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
||||
P_SetTarget(&mo->player->awayviewmobj, altview);
|
||||
mo->player->awayviewtics = P_AproxDistance(line->dx, line->dy)>>FRACBITS;
|
||||
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (displayplayers[i] == (mo->player - players))
|
||||
{
|
||||
R_ResetViewInterpolation(i + 1);
|
||||
}
|
||||
}
|
||||
|
||||
if (line->flags & ML_NOCLIMB) // lets you specify a vertical angle
|
||||
{
|
||||
INT32 aim;
|
||||
|
||||
+2
-8
@@ -181,9 +181,6 @@ void Command_CountMobjs_f(void)
|
||||
void P_InitThinkers(void)
|
||||
{
|
||||
thinkercap.prev = thinkercap.next = &thinkercap;
|
||||
|
||||
iquehead = iquetail = 0;
|
||||
|
||||
waypointcap = NULL;
|
||||
}
|
||||
|
||||
@@ -290,12 +287,8 @@ mobj_t *P_SetTarget(mobj_t **mop, mobj_t *targ)
|
||||
{
|
||||
if (*mop) // If there was a target already, decrease its refcount
|
||||
(*mop)->thinker.references--;
|
||||
|
||||
if (targ != NULL) // Set new target and if non-NULL, increase its counter
|
||||
if ((*mop = targ) != NULL) // Set new target and if non-NULL, increase its counter
|
||||
targ->thinker.references++;
|
||||
|
||||
*mop = targ;
|
||||
|
||||
return targ;
|
||||
}
|
||||
|
||||
@@ -662,6 +655,7 @@ void P_Ticker(boolean run)
|
||||
if (run)
|
||||
{
|
||||
R_UpdateLevelInterpolators();
|
||||
R_UpdateViewInterpolation();
|
||||
|
||||
// Hack: ensure newview is assigned every tic.
|
||||
// Ensures view interpolation is T-1 to T in poor network conditions
|
||||
|
||||
+5
-5
@@ -2470,7 +2470,6 @@ static void P_MovePlayer(player_t *player)
|
||||
S_StartSound(player->mo, sfx_floush);
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////
|
||||
//SPINNING AND SPINDASHING//
|
||||
////////////////////////////
|
||||
@@ -4001,6 +4000,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
|
||||
{
|
||||
P_MoveChaseCamera(player, thiscam, false);
|
||||
R_ResetViewInterpolation(num + 1);
|
||||
R_ResetViewInterpolation(num + 1);
|
||||
}
|
||||
|
||||
return (x == thiscam->x && y == thiscam->y && z == thiscam->z && angle == thiscam->aiming);
|
||||
@@ -4031,7 +4031,7 @@ boolean P_SpectatorJoinGame(player_t *player)
|
||||
// Pressing fire assigns you to a team that needs players if allowed.
|
||||
// Partial code reproduction from p_tick.c autobalance code.
|
||||
else if (G_GametypeHasTeams())
|
||||
{
|
||||
{
|
||||
INT32 changeto = 0;
|
||||
INT32 z, numplayersred = 0, numplayersblue = 0;
|
||||
|
||||
@@ -4060,7 +4060,7 @@ boolean P_SpectatorJoinGame(player_t *player)
|
||||
if (player->mo)
|
||||
{
|
||||
P_RemoveMobj(player->mo);
|
||||
P_SetTarget(&player->mo, NULL);
|
||||
player->mo = NULL;
|
||||
}
|
||||
player->spectator = false;
|
||||
player->pflags &= ~PF_WANTSTOJOIN;
|
||||
@@ -4084,11 +4084,11 @@ boolean P_SpectatorJoinGame(player_t *player)
|
||||
}
|
||||
// Joining in game from firing.
|
||||
else
|
||||
{
|
||||
{
|
||||
if (player->mo)
|
||||
{
|
||||
P_RemoveMobj(player->mo);
|
||||
P_SetTarget(&player->mo, NULL);
|
||||
player->mo = NULL;
|
||||
}
|
||||
player->spectator = false;
|
||||
player->pflags &= ~PF_WANTSTOJOIN;
|
||||
|
||||
+2
-2
@@ -379,7 +379,7 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst
|
||||
out->x = mobj->x;
|
||||
out->y = mobj->y;
|
||||
out->z = mobj->z;
|
||||
out->scale = mapobjectscale;
|
||||
out->scale = FRACUNIT;
|
||||
out->subsector = mobj->subsector;
|
||||
out->angle = mobj->angle;
|
||||
out->spritexscale = mobj->spritexscale;
|
||||
@@ -392,7 +392,7 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst
|
||||
out->x = R_LerpFixed(mobj->old_x, mobj->x, frac);
|
||||
out->y = R_LerpFixed(mobj->old_y, mobj->y, frac);
|
||||
out->z = R_LerpFixed(mobj->old_z, mobj->z, frac);
|
||||
out->scale = mapobjectscale;
|
||||
out->scale = FRACUNIT;
|
||||
out->spritexscale = mobj->spritexscale;
|
||||
out->spriteyscale = mobj->spriteyscale;
|
||||
out->spritexoffset = mobj->spritexoffset;
|
||||
|
||||
+13
-16
@@ -679,7 +679,10 @@ static void R_DrawFlippedMaskedColumn(column_t *column)
|
||||
for (s = (UINT8 *)column+2+column->length, d = dc_source; d < dc_source+column->length; --s)
|
||||
*d++ = *s;
|
||||
dc_texturemid = basetexturemid - (topdelta<<FRACBITS);
|
||||
colfunc();
|
||||
|
||||
// Still drawn by R_DrawColumn.
|
||||
if (ylookup[dc_yl])
|
||||
colfunc();
|
||||
Z_Free(dc_source);
|
||||
}
|
||||
column = (column_t *)((UINT8 *)column + column->length + 4);
|
||||
@@ -897,7 +900,6 @@ static void R_DrawPrecipitationVisSprite(vissprite_t *vis)
|
||||
INT32 texturecolumn;
|
||||
fixed_t frac;
|
||||
patch_t *patch;
|
||||
fixed_t this_scale = vis->thingscale;
|
||||
INT64 overflow_test;
|
||||
|
||||
//Fab : R_InitSprites now sets a wad lump number
|
||||
@@ -921,7 +923,7 @@ static void R_DrawPrecipitationVisSprite(vissprite_t *vis)
|
||||
dc_colormap += COLORMAP_REMAPOFFSET;
|
||||
|
||||
dc_iscale = FixedDiv(FRACUNIT, vis->scale);
|
||||
dc_texturemid = FixedDiv(vis->texturemid, this_scale);
|
||||
dc_texturemid = vis->texturemid;
|
||||
dc_texheight = 0;
|
||||
|
||||
frac = vis->startfrac;
|
||||
@@ -1741,8 +1743,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
|
||||
fixed_t iscale;
|
||||
|
||||
//SoM: 3/17/2000
|
||||
fixed_t gz, gzt;
|
||||
fixed_t this_scale;
|
||||
fixed_t gz ,gzt;
|
||||
|
||||
INT32 dist = 1;
|
||||
|
||||
@@ -1768,8 +1769,6 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
|
||||
R_InterpolatePrecipMobjState(thing, FRACUNIT, &interp);
|
||||
}
|
||||
|
||||
this_scale = interp.scale;
|
||||
|
||||
// transform the origin point
|
||||
tr_x = interp.x - viewx;
|
||||
tr_y = interp.y - viewy;
|
||||
@@ -1780,7 +1779,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
|
||||
tz = gxt - gyt;
|
||||
|
||||
// thing is behind view plane?
|
||||
if (tz < FixedMul(MINZ, this_scale))
|
||||
if (tz < MINZ)
|
||||
return;
|
||||
|
||||
gxt = -FixedMul(tr_x, viewsin);
|
||||
@@ -1821,14 +1820,14 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
|
||||
lump = sprframe->lumpid[0]; //Fab: see note above
|
||||
|
||||
// calculate edges of the shape
|
||||
tx -= FixedMul(spritecachedinfo[lump].offset, this_scale);
|
||||
tx -= spritecachedinfo[lump].offset;
|
||||
x1 = (centerxfrac + FixedMul (tx,xscale)) >>FRACBITS;
|
||||
|
||||
// off the right side?
|
||||
if (x1 > viewwidth)
|
||||
return;
|
||||
|
||||
tx += FixedMul(spritecachedinfo[lump].width, this_scale);
|
||||
tx += spritecachedinfo[lump].width;
|
||||
x2 = ((centerxfrac + FixedMul (tx,xscale)) >>FRACBITS) - 1;
|
||||
|
||||
// off the left side
|
||||
@@ -1846,8 +1845,8 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
|
||||
}
|
||||
|
||||
//SoM: 3/17/2000: Disregard sprites that are out of view..
|
||||
gzt = interp.z + FixedMul(spritecachedinfo[lump].topoffset, this_scale);
|
||||
gz = gzt - FixedMul(spritecachedinfo[lump].height, this_scale);
|
||||
gzt = interp.z + spritecachedinfo[lump].topoffset;
|
||||
gz = gzt - spritecachedinfo[lump].height;
|
||||
|
||||
if (thing->subsector->sector->cullheight)
|
||||
{
|
||||
@@ -1857,9 +1856,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
|
||||
|
||||
// store information in a vissprite
|
||||
vis = R_NewVisSprite();
|
||||
vis->scale = FixedMul(yscale, this_scale);
|
||||
vis->sortscale = yscale; //<<detailshift;
|
||||
vis->thingscale = interp.scale;
|
||||
vis->scale = vis->sortscale = yscale; //<<detailshift;
|
||||
vis->dispoffset = 0; // Monster Iestyn: 23/11/15
|
||||
vis->gx = interp.x;
|
||||
vis->gy = interp.y;
|
||||
@@ -1892,7 +1889,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
|
||||
iscale = FixedDiv(FRACUNIT, xscale);
|
||||
|
||||
vis->startfrac = 0;
|
||||
vis->xiscale = FixedDiv(iscale, this_scale);
|
||||
vis->xiscale = iscale;
|
||||
|
||||
vis->thingscale = interp.scale;
|
||||
|
||||
|
||||
@@ -729,9 +729,7 @@ void Y_Ticker(void)
|
||||
}
|
||||
|
||||
if (intertic < TICRATE || intertic & 1 || endtic != -1)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (intertype == int_race || intertype == int_match)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user