stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 02:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity
SRB2/src/p_map.c

5101 lines
146 KiB
C
Raw Normal View History

SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
Update source copyrights to 2018
2018-11-25 12:35:38 +00:00
// Copyright (C) 1999-2018 by Sonic Team Junior.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
// See the 'LICENSE' file for more details.
//-----------------------------------------------------------------------------
/// \file p_map.c
/// \brief Movement, collision handling
///
/// Shooting and aiming
#include "doomdef.h"
#include "g_game.h"
#include "m_bbox.h"
#include "m_random.h"
#include "p_local.h"
#include "p_setup.h" // NiGHTS stuff
#include "r_state.h"
#include "r_main.h"
#include "r_sky.h"
#include "s_sound.h"
#include "w_wad.h"
#include "r_splats.h"
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
#include "p_slopes.h"
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#include "z_zone.h"
#include "lua_hook.h"
fixed_t tmbbox[4];
mobj_t *tmthing;
static INT32 tmflags;
Slope collision fixes
2015-04-29 05:29:51 +00:00
fixed_t tmx;
fixed_t tmy;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static precipmobj_t *tmprecipthing;
static fixed_t preciptmbbox[4];
// If "floatok" true, move would be ok
// if within "tmfloorz - tmceilingz".
boolean floatok;
fixed_t tmfloorz, tmceilingz;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
static fixed_t tmdropoffz, tmdrpoffceilz; // drop-off floor/ceiling heights
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
mobj_t *tmfloorthing; // the thing corresponding to tmfloorz or NULL if tmfloorz is from a sector
tmfloorthing and tmhitthing are set to NULL at the start of P_MobjThinker, preventing any weird cases of carrying over the previous mobj's floor object or such. This fixes the issue with upside-down springs shooting downwards if you touch another of its kind. Also fixes one of the issues with monitors in Icicle Falls (after you phase inside the East-most float-bob FOF's monitor via the other bug and jump up to break it while there, the NEXT monitor moves upwards too)
2015-05-31 12:57:27 +00:00
mobj_t *tmhitthing; // the solid thing you bumped into (for collisions)
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
ffloor_t *tmfloorrover, *tmceilingrover;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
pslope_t *tmfloorslope, *tmceilingslope;
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// keep track of the line that lowers the ceiling,
// so missiles don't explode against sky hack walls
line_t *ceilingline;
// set by PIT_CheckLine() for any line that stopped the PIT_CheckLine()
// that is, for any line which is 'solid'
line_t *blockingline;
msecnode_t *sector_list = NULL;
mprecipsecnode_t *precipsector_list = NULL;
camera_t *mapcampointer;
//
// TELEPORT MOVE
//
//
// P_TeleportMove
//
boolean P_TeleportMove(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z)
{
// the move is ok,
// so link the thing into its new position
P_UnsetThingPosition(thing);
// Remove touching_sectorlist from mobj.
if (sector_list)
{
P_DelSeclist(sector_list);
sector_list = NULL;
}
thing->x = x;
thing->y = y;
thing->z = z;
P_SetThingPosition(thing);
P_CheckPosition(thing, thing->x, thing->y);
if (P_MobjWasRemoved(thing))
return true;
thing->floorz = tmfloorz;
thing->ceilingz = tmceilingz;
Set mobj->floorrover and ceilingrover in appropriate places
2018-09-10 04:35:40 +00:00
thing->floorrover = tmfloorrover;
thing->ceilingrover = tmceilingrover;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
// =========================================================================
// MOVEMENT ITERATOR FUNCTIONS
// =========================================================================
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
// P_DoSpring
//
// MF_SPRING does some weird, mildly hacky stuff sometimes.
// mass = vertical speed
// damage = horizontal speed
// raisestate = state to change spring to on collision
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
// reactiontime = number of times it can give 10 points (0 is standard)
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
// painchance = spring mode:
// 0 = standard vanilla spring behaviour
// Positive spring modes are minor variants of vanilla spring behaviour.
// 1 = launch players in jump
// 2 = don't modify player at all, just add momentum
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
// 3 = speed-booster mode (force onto ground, MF_AMBUSH causes auto-spin)
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
// Negative spring modes are mildly-related gimmicks with customisation.
// -1 = pinball bumper
// Any other spring mode defaults to standard vanilla spring behaviour,
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
// ****** but forward compatibility is not guaranteed for these. ******
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
//
Fixed the issue where diagonal springs couldn't teleport you to their centers anymore (guess whose fault that was! =D ). Basically I just made P_DoSpring boolean, which probably could be useful to Lua peeps as well. (it returns true if you were sprung, false if not)
2015-07-28 18:28:51 +00:00
boolean P_DoSpring(mobj_t *spring, mobj_t *object)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
fixed_t vertispeed = spring->info->mass;
fixed_t horizspeed = spring->info->damage;
build errors
2018-11-21 01:23:48 +00:00
boolean final = false;
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
UINT8 strong = 0;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 19:03:18 +00:00
// Object was already sprung this tic
if (object->eflags & MFE_SPRUNG)
Fixed the issue where diagonal springs couldn't teleport you to their centers anymore (guess whose fault that was! =D ). Basically I just made P_DoSpring boolean, which probably could be useful to Lua peeps as well. (it returns true if you were sprung, false if not)
2015-07-28 18:28:51 +00:00
return false;
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-11 20:54:11 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Spectators don't trigger springs.
if (object->player && object->player->spectator)
Fixed the issue where diagonal springs couldn't teleport you to their centers anymore (guess whose fault that was! =D ). Basically I just made P_DoSpring boolean, which probably could be useful to Lua peeps as well. (it returns true if you were sprung, false if not)
2015-07-28 18:28:51 +00:00
return false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
// "Even in Death" is a song from Volume 8, not a command.
if (!spring->health || !object->health)
return false;
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
if (object->player)
{
Prevent CA2_MELEE, CA_TWINSPIN and CA_BOUNCE from fucking up boosters.
2019-10-19 13:46:14 +00:00
if (spring->info->painchance == 3)
;
else if (object->player->charability == CA_TWINSPIN && object->player->panim == PA_ABILITY)
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
strong = 1;
else if (object->player->charability2 == CA2_MELEE && object->player->panim == PA_ABILITY2)
strong = 2;
}
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
if (spring->info->painchance == -1) // Pinball bumper mode.
{
// The first of the entirely different spring modes!
// Some of the attributes mean different things here.
// mass = default strength (can be controlled by mapthing's spawnangle)
// damage = unused
angle_t horizangle, vertiangle;
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
if (!vertispeed)
return false;
if (object->player && object->player->homing) // Sonic Heroes and Shadow the Hedgehog are the only games to contain homing-attackable bumpers!
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
{
horizangle = 0;
vertiangle = ((object->eflags & MFE_VERTICALFLIP) ? ANGLE_270 : ANGLE_90) >> ANGLETOFINESHIFT;
object->player->pflags &= ~PF_THOKKED;
if (spring->eflags & MFE_VERTICALFLIP)
object->z = spring->z - object->height - 1;
else
object->z = spring->z + spring->height + 1;
}
else
{
horizangle = R_PointToAngle2(spring->x, spring->y, object->x, object->y);
vertiangle = (R_PointToAngle2(
0,
spring->z + spring->height/2,
FixedHypot(object->x - spring->x, object->y - spring->y),
object->z + object->height/2)
>> ANGLETOFINESHIFT) & FINEMASK;
}
if (spring->spawnpoint && spring->spawnpoint->angle > 0)
vertispeed = (spring->spawnpoint->angle<<(FRACBITS-1))/5;
vertispeed = FixedMul(vertispeed, FixedMul(object->scale, spring->scale));
if (object->player)
{
fixed_t playervelocity;
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
if (strong)
vertispeed <<= 1;
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
if (!(object->player->pflags & PF_THOKKED) && !(object->player->homing)
&& ((playervelocity = FixedDiv(9*FixedHypot(object->player->speed, object->momz), 10<<FRACBITS)) > vertispeed))
vertispeed = playervelocity;
if (object->player->powers[pw_carry] == CR_NIGHTSMODE) // THIS has NiGHTS support, at least...
{
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
angle_t nightsangle = 0;
Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.
2019-10-07 12:08:49 +00:00
if (object->player->bumpertime > (TICRATE/2)-5)
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
return false;
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
if ((object->player->pflags & PF_TRANSFERTOCLOSEST) && object->player->axis1 && object->player->axis2)
{
nightsangle = R_PointToAngle2(object->player->axis1->x, object->player->axis1->y, object->player->axis2->x, object->player->axis2->y);
nightsangle += ANGLE_90;
}
else if (object->target)
{
if (object->target->flags2 & MF2_AMBUSH)
nightsangle = R_PointToAngle2(object->target->x, object->target->y, object->x, object->y);
else
nightsangle = R_PointToAngle2(object->x, object->y, object->target->x, object->target->y);
}
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
object->player->flyangle = AngleFixed(R_PointToAngle2(
0,
spring->z + spring->height/2,
FixedMul(
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
FINESINE(((nightsangle - horizangle) >> ANGLETOFINESHIFT) & FINEMASK),
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
FixedHypot(object->x - spring->x, object->y - spring->y)),
object->z + object->height/2))>>FRACBITS;
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
object->player->bumpertime = TICRATE/2;
}
else
{
INT32 pflags = object->player->pflags & (PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_THOKKED|PF_BOUNCING); // Not identical to below...
UINT8 secondjump = object->player->secondjump;
if (object->player->pflags & PF_GLIDING)
P_SetPlayerMobjState(object, S_PLAY_FALL);
P_ResetPlayer(object->player);
object->player->pflags |= pflags;
object->player->secondjump = secondjump;
}
}
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
if (!P_IsObjectOnGround(object)) // prevents uncurling when spinning due to "landing"
object->momz = FixedMul(vertispeed, FINESINE(vertiangle));
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
P_InstaThrust(object, horizangle, FixedMul(vertispeed, FINECOSINE(vertiangle)));
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
object->eflags |= MFE_SPRUNG; // apply this flag asap!
goto springstate;
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
}
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
// Does nothing?
if (!vertispeed && !horizspeed)
Fixed the issue where diagonal springs couldn't teleport you to their centers anymore (guess whose fault that was! =D ). Basically I just made P_DoSpring boolean, which probably could be useful to Lua peeps as well. (it returns true if you were sprung, false if not)
2015-07-28 18:28:51 +00:00
return false;
Add PF_SHIELDABILITY This flag is used as a distinction between the character ability CA_HOMINGTHOK and the attract shield's active ability.
2015-05-27 09:59:42 +00:00
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 19:03:18 +00:00
#ifdef ESLOPE
object->standingslope = NULL; // Okay, now we know it's not going to be relevant - no launching off at silly angles for you.
#endif
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
if (spring->eflags & MFE_VERTICALFLIP)
vertispeed *= -1;
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
if (object->player && (object->player->powers[pw_carry] == CR_NIGHTSMODE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
/*Someone want to make these work like bumpers?*/
Fixed the issue where diagonal springs couldn't teleport you to their centers anymore (guess whose fault that was! =D ). Basically I just made P_DoSpring boolean, which probably could be useful to Lua peeps as well. (it returns true if you were sprung, false if not)
2015-07-28 18:28:51 +00:00
return false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Add PF_SHIELDABILITY This flag is used as a distinction between the character ability CA_HOMINGTHOK and the attract shield's active ability.
2015-05-27 09:59:42 +00:00
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
if (strong)
* Changed how CA2_MELEE handles nocontrol to not tweak pw_nocontrol. * Added CA_TWINSPIN/CA2_MELEE spring boosts. * Made it so you can't land with CA2_MELEE twice. * Fixed stray #endif from NiGHTS fixes.
2017-03-20 19:04:33 +00:00
{
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 19:03:18 +00:00
if (horizspeed)
horizspeed = FixedMul(horizspeed, (4*FRACUNIT)/3);
if (vertispeed)
vertispeed = FixedMul(vertispeed, (6*FRACUNIT)/5); // aprox square root of above
* Changed how CA2_MELEE handles nocontrol to not tweak pw_nocontrol. * Added CA_TWINSPIN/CA2_MELEE spring boosts. * Made it so you can't land with CA2_MELEE twice. * Fixed stray #endif from NiGHTS fixes.
2017-03-20 19:04:33 +00:00
}
Minor change to fans and gas jets that makes them work on slopes. - Now checks whether the player's top is below the bottom of the fan/gas jet, instead of its bottom. zdist calculation not affected. - mo->standingslope is NULL'd so the player isn't launched off at a wacky angle. (I also did this for springs, since Prime mentioned it was a problem for them too.)
2016-06-30 22:23:50 +00:00
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-11 20:54:11 +00:00
object->eflags |= MFE_SPRUNG; // apply this flag asap!
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 19:03:18 +00:00
spring->flags &= ~(MF_SPRING|MF_SPECIAL); // De-solidify
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
if (spring->info->painchance != 2)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Autobrake polish! * Make it actually look like a brake, so people can tell it's on instead of just having high friction. * Fix it fucking with spring chains (caused by being unwittingly active for the first tic of spring collision).
2019-08-22 15:13:00 +00:00
if (object->player)
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
{
Autobrake polish! * Make it actually look like a brake, so people can tell it's on instead of just having high friction. * Fix it fucking with spring chains (caused by being unwittingly active for the first tic of spring collision).
2019-08-22 15:13:00 +00:00
object->player->pflags &= ~PF_APPLYAUTOBRAKE;
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
#ifndef SPRINGSPIN
object->player->powers[pw_justsprung] = 5;
if (horizspeed)
object->player->powers[pw_noautobrake] = ((horizspeed*TICRATE)>>(FRACBITS+3))/9; // TICRATE at 72*FRACUNIT
else if (P_MobjFlip(object) == P_MobjFlip(spring))
object->player->powers[pw_justsprung] |= (1<<15);
#else
object->player->powers[pw_justsprung] = 15;
if (horizspeed)
object->player->powers[pw_noautobrake] = ((horizspeed*TICRATE)>>(FRACBITS+3))/9; // TICRATE at 72*FRACUNIT
else
{
if (abs(object->player->rmomx) > object->scale || abs(object->player->rmomy) > object->scale)
object->player->drawangle = R_PointToAngle2(0, 0, object->player->rmomx, object->player->rmomy);
if (P_MobjFlip(object) == P_MobjFlip(spring))
object->player->powers[pw_justsprung] |= (1<<15);
}
#endif
}
Autobrake polish! * Make it actually look like a brake, so people can tell it's on instead of just having high friction. * Fix it fucking with spring chains (caused by being unwittingly active for the first tic of spring collision).
2019-08-22 15:13:00 +00:00
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
if ((horizspeed && vertispeed) || (object->player && object->player->homing)) // Mimic SA
{
object->momx = object->momy = 0;
P_TryMove(object, spring->x, spring->y, true);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
if (vertispeed > 0)
object->z = spring->z + spring->height + 1;
else if (vertispeed < 0)
object->z = spring->z - object->height - 1;
else
{
fixed_t offx, offy;
// Horizontal springs teleport you in FRONT of them.
object->momx = object->momy = 0;
// Overestimate the distance to position you at
offx = P_ReturnThrustX(spring, spring->angle, (spring->radius + object->radius + 1) * 2);
offy = P_ReturnThrustY(spring, spring->angle, (spring->radius + object->radius + 1) * 2);
// Make it square by clipping
if (offx > (spring->radius + object->radius + 1))
offx = spring->radius + object->radius + 1;
else if (offx < -(spring->radius + object->radius + 1))
offx = -(spring->radius + object->radius + 1);
if (offy > (spring->radius + object->radius + 1))
offy = spring->radius + object->radius + 1;
else if (offy < -(spring->radius + object->radius + 1))
offy = -(spring->radius + object->radius + 1);
// Set position!
P_TryMove(object, spring->x + offx, spring->y + offy, true);
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
if ((spring->info->painchance == 3))
{
object->z = spring->z;
if (spring->eflags & MFE_VERTICALFLIP)
object->z -= object->height;
object->momz = 0;
}
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (vertispeed)
object->momz = FixedMul(vertispeed,FixedSqrt(FixedMul(object->scale, spring->scale)));
if (horizspeed)
P_InstaThrustEvenIn2D(object, spring->angle, FixedMul(horizspeed,FixedSqrt(FixedMul(object->scale, spring->scale))));
// Re-solidify
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 19:03:18 +00:00
spring->flags |= (spring->info->flags & (MF_SPRING|MF_SPECIAL));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (object->player)
{
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
INT32 pflags;
UINT8 secondjump;
boolean washoming;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (spring->flags & MF_ENEMY) // Spring shells
P_SetTarget(&spring->target, object);
* Handle more missing cases where it should've been forced - namely analog mode, shield abilities, and waterslides * Have special handling for carrying. * Use rmom* instead of mom* - so conveyors are handled properly
2017-02-06 17:31:48 +00:00
if (horizspeed)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
object->angle = object->player->drawangle = spring->angle;
* Handle more missing cases where it should've been forced - namely analog mode, shield abilities, and waterslides * Have special handling for carrying. * Use rmom* instead of mom* - so conveyors are handled properly
2017-02-06 17:31:48 +00:00
Always force player camera direction for springs with horizontal thrust component.
2019-09-15 15:43:19 +00:00
if (!demoplayback || P_AnalogMove(object->player))
{
if (object->player == &players[consoleplayer])
localangle = spring->angle;
else if (object->player == &players[secondarydisplayplayer])
localangle2 = spring->angle;
Fix replay camera not being turnable when climbing, sliding ...and several other things. If in analog mode, this does not apply (also analog mode replay camera no longer borks)
2016-04-05 19:56:48 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
if (object->player->pflags & PF_GLIDING)
P_SetPlayerMobjState(object, S_PLAY_FALL);
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
if ((spring->info->painchance == 3))
{
if (!(pflags = (object->player->pflags & PF_SPINNING)) &&
(((object->player->charability2 == CA2_SPINDASH) && (object->player->cmd.buttons & BT_USE))
|| (spring->flags2 & MF2_AMBUSH)))
{
pflags = PF_SPINNING;
P_SetPlayerMobjState(object, S_PLAY_ROLL);
S_StartSound(object, sfx_spin);
}
else
P_SetPlayerMobjState(object, S_PLAY_ROLL);
}
else
pflags = object->player->pflags & (PF_STARTJUMP|PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_THOKKED|PF_BOUNCING); // I still need these.
secondjump = object->player->secondjump;
washoming = object->player->homing;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_ResetPlayer(object->player);
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
if (spring->info->painchance == 1) // For all those ancient, SOC'd abilities.
Fixed various issues arising from collision with exclusively horizontal springs. Of note: * If you hold down your jump button whilst jumping into it, you no longer immediately use your ability. * Characters with CA_DOUBLEJUMP and CA2_MULTIABILITY no longer lose track of their jump count.
2016-09-28 15:26:29 +00:00
{
Bugfixes and code cleanup. * Getting hit whilst on a swinging mace doesn't send you off in roll/jump state. * P_GetJumpFlags replaces a bunch of copypasted code. * Homing attacking a spring sends you directly on its path, rather than rocketing off in the direction you were preiously hurtling in.
2017-04-03 17:28:02 +00:00
object->player->pflags |= P_GetJumpFlags(object->player);
Fixed various issues arising from collision with exclusively horizontal springs. Of note: * If you hold down your jump button whilst jumping into it, you no longer immediately use your ability. * Characters with CA_DOUBLEJUMP and CA2_MULTIABILITY no longer lose track of their jump count.
2016-09-28 15:26:29 +00:00
P_SetPlayerMobjState(object, S_PLAY_JUMP);
}
Prevent CA2_MELEE, CA_TWINSPIN and CA_BOUNCE from fucking up boosters.
2019-10-19 13:46:14 +00:00
else if ((spring->info->painchance == 2) || ((spring->info->painchance != 3) && (pflags & PF_BOUNCING))) // Adding momentum only.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
object->player->pflags |= (pflags &~ PF_STARTJUMP);
object->player->secondjump = secondjump;
if (washoming)
object->player->pflags &= ~PF_THOKKED;
}
else if (!vertispeed)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
The start of implementing FuriousFox's bumpers/balloons! No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!
2018-05-15 15:10:42 +00:00
if (pflags & (PF_JUMPED|PF_SPINNING))
Fixed various issues arising from collision with exclusively horizontal springs. Of note: * If you hold down your jump button whilst jumping into it, you no longer immediately use your ability. * Characters with CA_DOUBLEJUMP and CA2_MULTIABILITY no longer lose track of their jump count.
2016-09-28 15:26:29 +00:00
{
object->player->pflags |= pflags;
object->player->secondjump = secondjump;
}
* New object types! * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-17 20:50:26 +00:00
else if (object->player->dashmode >= 3*TICRATE)
P_SetPlayerMobjState(object, S_PLAY_DASH);
else if (P_IsObjectOnGround(object) && horizspeed >= FixedMul(object->player->runspeed, object->scale))
P_SetPlayerMobjState(object, S_PLAY_RUN);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
P_SetPlayerMobjState(object, S_PLAY_WALK);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
* You can now bounce off of springs without unbouncing. * You can now bounce off the bottom of goop areas. * Fixed that long-standing bug where you could accelerate whilst rolling.
2017-02-09 23:24:47 +00:00
else if (P_MobjFlip(object)*vertispeed > 0)
P_SetPlayerMobjState(object, S_PLAY_SPRING);
else
P_SetPlayerMobjState(object, S_PLAY_FALL);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Modified melee/twinspin springboost.
2017-03-27 13:37:40 +00:00
#ifdef ESLOPE
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 19:03:18 +00:00
object->standingslope = NULL; // And again.
Modified melee/twinspin springboost.
2017-03-27 13:37:40 +00:00
#endif
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
final = true;
springstate:
if ((statenum_t)(spring->state-states) < spring->info->raisestate)
{
P_SetMobjState(spring, spring->info->raisestate);
if (object->player && spring->reactiontime && !(spring->info->flags & MF_ENEMY))
{
Disable bumper score icon in NiGHTS to match enemies.
2018-06-09 18:22:28 +00:00
if (object->player->powers[pw_carry] != CR_NIGHTSMODE) // don't make graphic in NiGHTS
P_SetMobjState(P_SpawnMobj(spring->x, spring->y, spring->z + (spring->height/2), MT_SCORE), mobjinfo[MT_SCORE].spawnstate+11);
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
P_AddPlayerScore(object->player, 10);
spring->reactiontime--;
}
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
if (strong)
{
P_TwinSpinRejuvenate(object->player, (strong == 1 ? object->player->thokitem : object->player->revitem));
S_StartSound(object, sfx_sprong); // strong spring. sprong.
}
* Bumpers and Balloons in a more final state. * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)
2018-05-19 23:04:39 +00:00
}
return final;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object)
{
player_t *p = object->player; // will be NULL if not a player
fixed_t zdist; // distance between bottoms
fixed_t speed = spring->info->mass; // conveniently, both fans and gas jets use this for the vertical thrust
SINT8 flipval = P_MobjFlip(spring); // virtually everything here centers around the thruster's gravity, not the object's!
if (p && object->state == &states[object->info->painstate]) // can't use fans and gas jets when player is in pain!
return;
Minor change to fans and gas jets that makes them work on slopes. - Now checks whether the player's top is below the bottom of the fan/gas jet, instead of its bottom. zdist calculation not affected. - mo->standingslope is NULL'd so the player isn't launched off at a wacky angle. (I also did this for springs, since Prime mentioned it was a problem for them too.)
2016-06-30 22:23:50 +00:00
// is object's top below thruster's position? if not, calculate distance between their bottoms
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (spring->eflags & MFE_VERTICALFLIP)
{
Minor change to fans and gas jets that makes them work on slopes. - Now checks whether the player's top is below the bottom of the fan/gas jet, instead of its bottom. zdist calculation not affected. - mo->standingslope is NULL'd so the player isn't launched off at a wacky angle. (I also did this for springs, since Prime mentioned it was a problem for them too.)
2016-06-30 22:23:50 +00:00
if (object->z > spring->z + spring->height)
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
return;
zdist = (spring->z + spring->height) - (object->z + object->height);
}
else
{
Minor change to fans and gas jets that makes them work on slopes. - Now checks whether the player's top is below the bottom of the fan/gas jet, instead of its bottom. zdist calculation not affected. - mo->standingslope is NULL'd so the player isn't launched off at a wacky angle. (I also did this for springs, since Prime mentioned it was a problem for them too.)
2016-06-30 22:23:50 +00:00
if (object->z + object->height < spring->z)
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
return;
zdist = object->z - spring->z;
}
Minor change to fans and gas jets that makes them work on slopes. - Now checks whether the player's top is below the bottom of the fan/gas jet, instead of its bottom. zdist calculation not affected. - mo->standingslope is NULL'd so the player isn't launched off at a wacky angle. (I also did this for springs, since Prime mentioned it was a problem for them too.)
2016-06-30 22:23:50 +00:00
#ifdef ESLOPE
object->standingslope = NULL; // No launching off at silly angles for you.
#endif
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
switch (spring->type)
{
case MT_FAN: // fan
if (zdist > (spring->health << FRACBITS)) // max z distance determined by health (set by map thing angle)
break;
if (flipval*object->momz >= FixedMul(speed, spring->scale)) // if object's already moving faster than your best, don't bother
break;
if (p && (p->climbing || p->pflags & PF_GLIDING)) // doesn't affect Knux when he's using his abilities!
break;
object->momz += flipval*FixedMul(speed/4, spring->scale);
// limit the speed if too high
if (flipval*object->momz > FixedMul(speed, spring->scale))
object->momz = flipval*FixedMul(speed, spring->scale);
if (p && !p->powers[pw_tailsfly]) // doesn't reset anim for Tails' flight
{
P_ResetPlayer(p);
if (p->panim != PA_FALL)
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
P_SetPlayerMobjState(object, S_PLAY_FALL);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
break;
case MT_STEAM: // Steam
if (zdist > FixedMul(16*FRACUNIT, spring->scale))
break;
if (spring->state != &states[S_STEAM1]) // Only when it bursts
break;
object->momz = flipval*FixedMul(speed, FixedSqrt(FixedMul(spring->scale, object->scale))); // scale the speed with both objects' scales, just like with springs!
if (p)
{
P_ResetPlayer(p);
if (p->panim != PA_FALL)
Merge branch 'player-animations' SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible. git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-22 15:23:45 +00:00
P_SetPlayerMobjState(object, S_PLAY_FALL);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
break;
default:
break;
}
}
Implemented the Pterabyte grabbing mechanic
2019-09-29 16:42:17 +00:00
static void P_DoPterabyteCarry(player_t *player, mobj_t *ptera)
{
Fix silly typo :P
2019-11-09 14:46:34 +00:00
if (player->powers[pw_carry] && player->powers[pw_carry] != CR_ROLLOUT)
Implemented the Pterabyte grabbing mechanic
2019-09-29 16:42:17 +00:00
return;
if (ptera->extravalue1 != 1)
return; // Not swooping
if (ptera->target != player->mo)
return; // Not swooping for you!
if (player->spectator)
return;
if ((player->mo->eflags & MFE_VERTICALFLIP) != (ptera->eflags & MFE_VERTICALFLIP))
return; // Both should be in same gravity
if (ptera->eflags & MFE_VERTICALFLIP)
{
if (ptera->ceilingz - (ptera->z + ptera->height) < player->mo->height - FixedMul(2*FRACUNIT, player->mo->scale))
return;
}
else if (ptera->z - ptera->floorz < player->mo->height - FixedMul(2*FRACUNIT, player->mo->scale))
return; // No room to pick up this guy!
P_ResetPlayer(player);
P_SetTarget(&player->mo->tracer, ptera);
Don't apply autobrake to Pterabyte-carried players
2019-10-07 20:33:06 +00:00
player->pflags &= ~PF_APPLYAUTOBRAKE;
Implemented the Pterabyte grabbing mechanic
2019-09-29 16:42:17 +00:00
player->powers[pw_carry] = CR_PTERABYTE;
S_StartSound(player->mo, sfx_s3k4a);
P_UnsetThingPosition(player->mo);
player->mo->x = ptera->x;
player->mo->y = ptera->y;
P_SetThingPosition(player->mo);
ptera->movefactor = 3*TICRATE;
Players can jostle free from Pterabytes
2019-10-07 22:00:41 +00:00
ptera->watertop = ptera->waterbottom = ptera->cusval = 0;
Implemented the Pterabyte grabbing mechanic
2019-09-29 16:42:17 +00:00
}
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
static void P_DoTailsCarry(player_t *sonic, player_t *tails)
{
INT32 p;
fixed_t zdist; // z distance between the two players' bottoms
Let's simplify a lot of stuff. PF_CANCARRY instead of a horrible assortment of checks.
2016-09-24 12:18:08 +00:00
if (tails->powers[pw_carry])
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
return;
Tightened some restrictions on Tails carry because right now the looseness leads to edge case noise spam when trying to pick up a player off a rope hang, for example.
2016-09-24 11:38:37 +00:00
if (sonic->powers[pw_carry])
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
return;
Let's simplify a lot of stuff. PF_CANCARRY instead of a horrible assortment of checks.
2016-09-24 12:18:08 +00:00
if (tails->spectator)
return;
if (sonic->spectator)
Corrected multiple oversights with swimming players dropping their friends when they shouldn't.
2016-09-08 13:38:57 +00:00
return;
Let's simplify a lot of stuff. PF_CANCARRY instead of a horrible assortment of checks.
2016-09-24 12:18:08 +00:00
if (!(tails->pflags & PF_CANCARRY))
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
return;
Disable Tails carrying for players who completed the level To avoid trolls...
2019-11-17 22:46:34 +00:00
if (sonic->pflags & PF_FINISHED)
return;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if ((sonic->mo->eflags & MFE_VERTICALFLIP) != (tails->mo->eflags & MFE_VERTICALFLIP))
return; // Both should be in same gravity
if (tails->mo->eflags & MFE_VERTICALFLIP)
{
if (tails->mo->ceilingz - (tails->mo->z + tails->mo->height) < sonic->mo->height-FixedMul(2*FRACUNIT, sonic->mo->scale))
return;
}
else if (tails->mo->z - tails->mo->floorz < sonic->mo->height-FixedMul(2*FRACUNIT, sonic->mo->scale))
return; // No room to pick up this guy!
// Search in case another player is already being carried by this fox.
for (p = 0; p < MAXPLAYERS; p++)
if (playeringame[p] && players[p].mo
Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. * PF_ITEMHANG -> CR_GENERIC * PF_CARRIED -> CR_PLAYER * (mo->tracer == MT_TUBEWAYPOINT) -> CR_ZOOMTUBE * PF_ROPEHANG -> CR_ROPEHANG * PF_MACESPIN -> CR_MACESPIN
2016-09-23 22:48:48 +00:00
&& players[p].powers[pw_carry] == CR_PLAYER && players[p].mo->tracer == tails->mo)
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
return;
Let's simplify a lot of stuff. PF_CANCARRY instead of a horrible assortment of checks.
2016-09-24 12:18:08 +00:00
// Why block opposing teams from tailsflying each other?
// Sneaking into the hands of a flying tails player in Race might be a viable strategy, who knows.
/*
if (gametype == GT_RACE || gametype == GT_COMPETITION
|| (netgame && (tails->spectator || sonic->spectator))
|| (G_TagGametype() && (!(tails->pflags & PF_TAGIT) != !(sonic->pflags & PF_TAGIT)))
|| (gametype == GT_MATCH)
|| (G_GametypeHasTeams() && tails->ctfteam != sonic->ctfteam))
return; */
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (tails->mo->eflags & MFE_VERTICALFLIP)
zdist = (sonic->mo->z + sonic->mo->height) - (tails->mo->z + tails->mo->height);
else
zdist = tails->mo->z - sonic->mo->z;
Let's simplify a lot of stuff. PF_CANCARRY instead of a horrible assortment of checks.
2016-09-24 12:18:08 +00:00
if (zdist <= sonic->mo->height + sonic->mo->scale // FixedMul(FRACUNIT, sonic->mo->scale), but scale == FRACUNIT by default
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
&& zdist > sonic->mo->height*2/3
&& P_MobjFlip(tails->mo)*sonic->mo->momz <= 0)
{
Let's simplify a lot of stuff. PF_CANCARRY instead of a horrible assortment of checks.
2016-09-24 12:18:08 +00:00
if (sonic-players == consoleplayer && botingame)
CV_SetValue(&cv_analog2, false);
P_ResetPlayer(sonic);
P_SetTarget(&sonic->mo->tracer, tails->mo);
sonic->powers[pw_carry] = CR_PLAYER;
S_StartSound(sonic->mo, sfx_s3k4a);
P_UnsetThingPosition(sonic->mo);
sonic->mo->x = tails->mo->x;
sonic->mo->y = tails->mo->y;
P_SetThingPosition(sonic->mo);
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
else {
if (sonic-players == consoleplayer && botingame)
CV_SetValue(&cv_analog2, true);
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
P_SetTarget(&sonic->mo->tracer, NULL);
Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. * PF_ITEMHANG -> CR_GENERIC * PF_CARRIED -> CR_PLAYER * (mo->tracer == MT_TUBEWAYPOINT) -> CR_ZOOMTUBE * PF_ROPEHANG -> CR_ROPEHANG * PF_MACESPIN -> CR_MACESPIN
2016-09-23 22:48:48 +00:00
sonic->powers[pw_carry] = CR_NONE;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
}
}
Hardcode "slapstick"
2019-05-05 16:36:55 +00:00
// Boss 5 post-defeat comedy
static void P_SlapStick(mobj_t *fang, mobj_t *pole)
{
fixed_t momx1, momx2, momy1, momy2;
#define dist 3
momx1 = pole->momx/dist;
momy1 = pole->momy/dist;
momx2 = fang->momx/dist;
momy2 = fang->momy/dist;
Make ACZ3's slapstick signpost taller (resolves #267).
2019-11-15 14:52:34 +00:00
pole->tracer->tracer->momx = momx1 + (dist-1)*momx2;
pole->tracer->tracer->momy = momy1 + (dist-1)*momy2;
Hardcode "slapstick"
2019-05-05 16:36:55 +00:00
fang->momx = (dist-1)*momx1 + momx2;
fang->momy = (dist-1)*momy1 + momy2;
#undef dist
Make ACZ3's slapstick signpost taller (resolves #267).
2019-11-15 14:52:34 +00:00
P_SetObjectMomZ(pole->tracer->tracer, 6*FRACUNIT, false);
pole->tracer->tracer->flags &= ~(MF_NOGRAVITY|MF_NOCLIP);
pole->tracer->tracer->movedir = ANGLE_67h;
if ((R_PointToAngle(fang->x - pole->tracer->tracer->x, fang->y - pole->tracer->tracer->y) - pole->angle) > ANGLE_180)
pole->tracer->tracer->movedir = InvAngle(pole->tracer->movedir);
Hardcode "slapstick"
2019-05-05 16:36:55 +00:00
P_SetObjectMomZ(fang, 14*FRACUNIT, false);
fang->flags |= MF_NOGRAVITY|MF_NOCLIP;
P_SetMobjState(fang, fang->info->xdeathstate);
Make ACZ3's slapstick signpost taller (resolves #267).
2019-11-15 14:52:34 +00:00
pole->tracer->tracer->tics = pole->tracer->tics = pole->tics = fang->tics;
Hardcode "slapstick"
2019-05-05 16:36:55 +00:00
var1 = var2 = 0;
Make ACZ3's slapstick signpost taller (resolves #267).
2019-11-15 14:52:34 +00:00
A_Scream(pole->tracer->tracer);
Hardcode "slapstick"
2019-05-05 16:36:55 +00:00
S_StartSound(fang, sfx_altdi1);
Make ACZ3's slapstick signpost taller (resolves #267).
2019-11-15 14:52:34 +00:00
P_SetTarget(&pole->tracer->tracer, NULL);
P_SetMobjState(pole->tracer, pole->info->xdeathstate);
Hardcode "slapstick"
2019-05-05 16:36:55 +00:00
P_SetTarget(&pole->tracer, NULL);
Make ACZ3's slapstick signpost taller (resolves #267).
2019-11-15 14:52:34 +00:00
P_SetMobjState(pole, pole->info->deathstate);
Hardcode "slapstick"
2019-05-05 16:36:55 +00:00
}
Used toaster's new P_PlayerCanDamage function for the barrel collision
2019-07-10 07:08:57 +00:00
static void P_PlayerBarrelCollide(mobj_t *toucher, mobj_t *barrel)
Fixed teetering on TNT barrels
2019-07-07 15:02:10 +00:00
{
if (toucher->momz < 0)
{
if (toucher->z + toucher->momz > barrel->z + barrel->height)
return;
}
else
{
if (toucher->z > barrel->z + barrel->height)
return;
}
if (toucher->momz > 0)
{
if (toucher->z + toucher->height + toucher->momz < barrel->z)
return;
}
else
{
if (toucher->z + toucher->height < barrel->z)
return;
}
Used toaster's new P_PlayerCanDamage function for the barrel collision
2019-07-10 07:08:57 +00:00
if (P_PlayerCanDamage(toucher->player, barrel))
Fixed teetering on TNT barrels
2019-07-07 15:02:10 +00:00
P_DamageMobj(barrel, toucher, toucher, 1, 0);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// PIT_CheckThing
//
static boolean PIT_CheckThing(mobj_t *thing)
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
fixed_t blockdist;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// don't clip against self
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-11 20:54:11 +00:00
if (thing == tmthing)
return true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Ignore... things.
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-11 20:54:11 +00:00
if (!tmthing || !thing || P_MobjWasRemoved(thing))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
I_Assert(!P_MobjWasRemoved(tmthing));
I_Assert(!P_MobjWasRemoved(thing));
// Ignore spectators
if ((tmthing->player && tmthing->player->spectator)
|| (thing->player && thing->player->spectator))
return true;
#ifdef SEENAMES
// Do name checks all the way up here
// So that NOTHING ELSE can see MT_NAMECHECK because it is client-side.
if (tmthing->type == MT_NAMECHECK)
{
// Ignore things that aren't players, ignore spectators, ignore yourself.
// (also don't bother to check that tmthing->target->player is non-NULL because we're not actually using it here.)
if (!thing->player || thing->player->spectator || (tmthing->target && thing->player == tmthing->target->player))
return true;
// Now check that you actually hit them.
blockdist = thing->radius + tmthing->radius;
if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
return true; // didn't hit it
// see if it went over / under
if (tmthing->z > thing->z + thing->height)
return true; // overhead
if (tmthing->z + tmthing->height < thing->z)
return true; // underneath
seenplayer = thing->player;
return false;
}
#endif
// Metal Sonic destroys tiny baby objects.
if (tmthing->type == MT_METALSONIC_RACE
* Bustable wallspikes. * Improve the code for busting vertical spikes. * Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta) * Make all spikes consistently do damage with DMG_SPIKE. * (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages
2017-07-18 13:17:10 +00:00
&& (thing->flags & (MF_MISSILE|MF_ENEMY|MF_BOSS)
|| (thing->type == MT_SPIKE
|| thing->type == MT_WALLSPIKE)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Revert "Correction of some other relevant places to the previous commit." This reverts commit a88b21f70301e2dcc652ff4d4ddc9c4a67fe26e2.
2016-11-12 15:39:42 +00:00
if ((thing->flags & (MF_ENEMY|MF_BOSS)) && (thing->health <= 0 || !(thing->flags & MF_SHOOTABLE)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
blockdist = thing->radius + tmthing->radius;
if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
return true; // didn't hit it
// see if it went over / under
if (tmthing->z > thing->z + thing->height)
return true; // overhead
if (tmthing->z + tmthing->height < thing->z)
return true; // underneath
* Bustable wallspikes. * Improve the code for busting vertical spikes. * Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta) * Make all spikes consistently do damage with DMG_SPIKE. * (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages
2017-07-18 13:17:10 +00:00
if (thing->type == MT_SPIKE
|| thing->type == MT_WALLSPIKE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
A bunch of spike tweaks. * Make it possible to break them in reverse gravity (resolves #348) by making the spikes break in a circle around the spike touched, rather than in a circle around the player. * Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj. * Make their breaking sound singular (prevents eardrum destruction).
2019-11-24 22:38:26 +00:00
mobj_t *iter;
Bugfix for spike sound playing when attempting to attack non-solid spikes with CA_DASHMODE/CA_TWINSPIN/CA2_MELEE.
2016-08-06 22:54:38 +00:00
if (thing->flags & MF_SOLID)
S_StartSound(tmthing, thing->info->deathsound);
A bunch of spike tweaks. * Make it possible to break them in reverse gravity (resolves #348) by making the spikes break in a circle around the spike touched, rather than in a circle around the player. * Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj. * Make their breaking sound singular (prevents eardrum destruction).
2019-11-24 22:38:26 +00:00
for (iter = thing->subsector->sector->thinglist; iter; iter = iter->snext)
if (iter->type == thing->type && iter->health > 0 && iter->flags & MF_SOLID && (iter == thing || P_AproxDistance(P_AproxDistance(thing->x - iter->x, thing->y - iter->y), thing->z - iter->z) < 56*thing->scale))//FixedMul(56*FRACUNIT, thing->scale))
P_KillMobj(iter, tmthing, tmthing, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
{
thing->health = 0;
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_KillMobj(thing, tmthing, tmthing, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return true;
}
* Turned CA_DASHMODE into SF_DASHMODE. * SF_DASHMODE users can now dash on water. * Gave CA_HOVER its own states/sprite2s. * Gave Super Sonic's hover his own hover-run state/sprite2.
2016-12-24 00:11:54 +00:00
// SF_DASHMODE users destroy spikes and monitors, CA_TWINSPIN users and CA2_MELEE users destroy spikes.
On Rob's request, the twinspin can break spikes. (woo)
2016-07-16 17:54:22 +00:00
if ((tmthing->player)
* Turned CA_DASHMODE into SF_DASHMODE. * SF_DASHMODE users can now dash on water. * Gave CA_HOVER its own states/sprite2s. * Gave Super Sonic's hover his own hover-run state/sprite2.
2016-12-24 00:11:54 +00:00
&& (((tmthing->player->charflags & SF_DASHMODE) && (tmthing->player->dashmode >= 3*TICRATE)
* Bustable wallspikes. * Improve the code for busting vertical spikes. * Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta) * Make all spikes consistently do damage with DMG_SPIKE. * (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages
2017-07-18 13:17:10 +00:00
&& (thing->flags & (MF_MONITOR)
|| (thing->type == MT_SPIKE
|| thing->type == MT_WALLSPIKE)))
CA_MELEE. Mostly complete. * When moving slowly, P_InstaThrust at S_SKIN's maxdash forward, and set momz to S_SKIN's mindash upwards. Plays a tok noise (not thok). Hurts enemies/bosses, busts spikes/monitors/all types of bustable blocks. * When moving quickly... doesn't do anything yet, but WILL do a slide. Also, P_DoSpinDash is now renamed to P_DoSpinAbility, and CA_TWINSPIN users can bust all bustable blocks on collision too.
2016-07-17 20:31:15 +00:00
|| ((((tmthing->player->charability == CA_TWINSPIN) && (tmthing->player->panim == PA_ABILITY))
|| (tmthing->player->charability2 == CA2_MELEE && tmthing->player->panim == PA_ABILITY2))
* Bustable wallspikes. * Improve the code for busting vertical spikes. * Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta) * Make all spikes consistently do damage with DMG_SPIKE. * (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages
2017-07-18 13:17:10 +00:00
&& (thing->type == MT_SPIKE
|| thing->type == MT_WALLSPIKE))))
Dashmode now destroys spikes and monitors on contact. Enemies? Probably not for now.
2016-07-09 15:53:41 +00:00
{
Revert "Correction of some other relevant places to the previous commit." This reverts commit a88b21f70301e2dcc652ff4d4ddc9c4a67fe26e2.
2016-11-12 15:39:42 +00:00
if ((thing->flags & (MF_MONITOR)) && (thing->health <= 0 || !(thing->flags & MF_SHOOTABLE)))
Dashmode now destroys spikes and monitors on contact. Enemies? Probably not for now.
2016-07-09 15:53:41 +00:00
return true;
blockdist = thing->radius + tmthing->radius;
if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
return true; // didn't hit it
// see if it went over / under
if (tmthing->z > thing->z + thing->height)
return true; // overhead
if (tmthing->z + tmthing->height < thing->z)
return true; // underneath
* Bustable wallspikes. * Improve the code for busting vertical spikes. * Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta) * Make all spikes consistently do damage with DMG_SPIKE. * (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages
2017-07-18 13:17:10 +00:00
if (thing->type == MT_SPIKE
|| thing->type == MT_WALLSPIKE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
A bunch of spike tweaks. * Make it possible to break them in reverse gravity (resolves #348) by making the spikes break in a circle around the spike touched, rather than in a circle around the player. * Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj. * Make their breaking sound singular (prevents eardrum destruction).
2019-11-24 22:38:26 +00:00
mobj_t *iter;
Bugfix for spike sound playing when attempting to attack non-solid spikes with CA_DASHMODE/CA_TWINSPIN/CA2_MELEE.
2016-08-06 22:54:38 +00:00
if (thing->flags & MF_SOLID)
S_StartSound(tmthing, thing->info->deathsound);
A bunch of spike tweaks. * Make it possible to break them in reverse gravity (resolves #348) by making the spikes break in a circle around the spike touched, rather than in a circle around the player. * Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj. * Make their breaking sound singular (prevents eardrum destruction).
2019-11-24 22:38:26 +00:00
for (iter = thing->subsector->sector->thinglist; iter; iter = iter->snext)
if (iter->type == thing->type && iter->health > 0 && iter->flags & MF_SOLID && (iter == thing || P_AproxDistance(P_AproxDistance(thing->x - iter->x, thing->y - iter->y), thing->z - iter->z) < 56*thing->scale))//FixedMul(56*FRACUNIT, thing->scale))
P_KillMobj(iter, tmthing, tmthing, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
{
thing->health = 0;
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_KillMobj(thing, tmthing, tmthing, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return true;
}
Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'"" This reverts commit c04b560e9260ae1f57834cd2e68e3f3bfca19c18.
2019-07-02 23:58:02 +00:00
// vectorise metal - done in a special case as at this point neither has the right flags for touching
if (thing->type == MT_METALSONIC_BATTLE
&& (tmthing->flags & MF_MISSILE)
&& tmthing->target != thing
&& thing->state == &states[thing->info->spawnstate])
{
blockdist = thing->radius + tmthing->radius;
if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
return true; // didn't hit it
if (tmthing->z > thing->z + thing->height)
return true; // overhead
if (tmthing->z + tmthing->height < thing->z)
return true; // underneath
thing->flags2 |= MF2_CLASSICPUSH;
return true;
}
Correctly restrict MF_NOCLIPTHING-objects from being interacted with from both moving and non-moving side.
2019-09-25 14:49:37 +00:00
if ((thing->flags & MF_NOCLIPTHING) || !(thing->flags & (MF_SOLID|MF_SPECIAL|MF_PAIN|MF_SHOOTABLE|MF_SPRING)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
// Don't collide with your buddies while NiGHTS-flying.
if (tmthing->player && thing->player && (maptol & TOL_NIGHTS)
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
&& ((tmthing->player->powers[pw_carry] == CR_NIGHTSMODE) || (thing->player->powers[pw_carry] == CR_NIGHTSMODE)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
blockdist = thing->radius + tmthing->radius;
if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
return true; // didn't hit it
As requested by Nev3r and VAda, seperating MF_PAPER into FF_PAPERSPRITE and MF_PAPERCOLLISION.
2016-08-20 14:15:48 +00:00
if (thing->flags & MF_PAPERCOLLISION) // CAUTION! Very easy to get stuck inside MF_SOLID objects. Giving the player MF_PAPERCOLLISION is a bad idea unless you know what you're doing.
Okay, did a bunch of stuff. Getting ready to create a merge request, but not quite there yet. * MF_AMBUSH is now MF2_AMBUSH, because it's something you turn on in a map editor, not with a SOC definition. * Where MF_AMBUSH was is now MF_PAPER. * MF_PAPER accesses all the stuff I did previously in this branch... * ...as well as turn on paper-thin collision detection between mobjs, which I've gotten working but isn't perfect but it's still good enough for non-solid objects!!
2016-08-18 19:09:35 +00:00
{
fixed_t cosradius, sinradius;
vertex_t v1, v2; // fake vertexes
line_t junk; // fake linedef
cosradius = FixedMul(thing->radius, FINECOSINE(thing->angle>>ANGLETOFINESHIFT));
sinradius = FixedMul(thing->radius, FINESINE(thing->angle>>ANGLETOFINESHIFT));
v1.x = thing->x - cosradius;
v1.y = thing->y - sinradius;
v2.x = thing->x + cosradius;
v2.y = thing->y + sinradius;
junk.v1 = &v1;
junk.v2 = &v2;
Fixed collision for MF_PAPERCOLLISION with respect to diagonals.
2016-11-06 16:46:27 +00:00
junk.dx = 2*cosradius; // v2.x - v1.x;
junk.dy = 2*sinradius; // v2.y - v1.y;
Okay, did a bunch of stuff. Getting ready to create a merge request, but not quite there yet. * MF_AMBUSH is now MF2_AMBUSH, because it's something you turn on in a map editor, not with a SOC definition. * Where MF_AMBUSH was is now MF_PAPER. * MF_PAPER accesses all the stuff I did previously in this branch... * ...as well as turn on paper-thin collision detection between mobjs, which I've gotten working but isn't perfect but it's still good enough for non-solid objects!!
2016-08-18 19:09:35 +00:00
As requested by Nev3r and VAda, seperating MF_PAPER into FF_PAPERSPRITE and MF_PAPERCOLLISION.
2016-08-20 14:15:48 +00:00
if (tmthing->flags & MF_PAPERCOLLISION) // more strenuous checking to prevent clipping issues
Okay, did a bunch of stuff. Getting ready to create a merge request, but not quite there yet. * MF_AMBUSH is now MF2_AMBUSH, because it's something you turn on in a map editor, not with a SOC definition. * Where MF_AMBUSH was is now MF_PAPER. * MF_PAPER accesses all the stuff I did previously in this branch... * ...as well as turn on paper-thin collision detection between mobjs, which I've gotten working but isn't perfect but it's still good enough for non-solid objects!!
2016-08-18 19:09:35 +00:00
{
Added linedef collision and fixed the following clipping bug, shown in gfy form. http://gfycat.com/BiodegradableNaturalHadrosaurus
2016-08-18 19:55:24 +00:00
INT32 check1, check2, check3, check4;
Fixed collision for MF_PAPERCOLLISION with respect to diagonals.
2016-11-06 16:46:27 +00:00
fixed_t tmcosradius = FixedMul(tmthing->radius, FINECOSINE(tmthing->angle>>ANGLETOFINESHIFT));
fixed_t tmsinradius = FixedMul(tmthing->radius, FINESINE(tmthing->angle>>ANGLETOFINESHIFT));
if (abs(thing->x - tmx) >= (abs(tmcosradius) + abs(cosradius)) || abs(thing->y - tmy) >= (abs(tmsinradius) + abs(sinradius)))
return true; // didn't hit it
check1 = P_PointOnLineSide(tmx - tmcosradius, tmy - tmsinradius, &junk);
check2 = P_PointOnLineSide(tmx + tmcosradius, tmy + tmsinradius, &junk);
check3 = P_PointOnLineSide(tmx + tmthing->momx - tmcosradius, tmy + tmthing->momy - tmsinradius, &junk);
check4 = P_PointOnLineSide(tmx + tmthing->momx + tmcosradius, tmy + tmthing->momy + tmsinradius, &junk);
Added linedef collision and fixed the following clipping bug, shown in gfy form. http://gfycat.com/BiodegradableNaturalHadrosaurus
2016-08-18 19:55:24 +00:00
if ((check1 == check2) && (check2 == check3) && (check3 == check4))
Okay, did a bunch of stuff. Getting ready to create a merge request, but not quite there yet. * MF_AMBUSH is now MF2_AMBUSH, because it's something you turn on in a map editor, not with a SOC definition. * Where MF_AMBUSH was is now MF_PAPER. * MF_PAPER accesses all the stuff I did previously in this branch... * ...as well as turn on paper-thin collision detection between mobjs, which I've gotten working but isn't perfect but it's still good enough for non-solid objects!!
2016-08-18 19:09:35 +00:00
return true; // the line doesn't cross between collider's start or end
}
else
{
Fixed collision for MF_PAPERCOLLISION with respect to diagonals.
2016-11-06 16:46:27 +00:00
if (abs(thing->x - tmx) >= (tmthing->radius + abs(cosradius)) || abs(thing->y - tmy) >= (tmthing->radius + abs(sinradius)))
return true; // didn't hit it
Okay, did a bunch of stuff. Getting ready to create a merge request, but not quite there yet. * MF_AMBUSH is now MF2_AMBUSH, because it's something you turn on in a map editor, not with a SOC definition. * Where MF_AMBUSH was is now MF_PAPER. * MF_PAPER accesses all the stuff I did previously in this branch... * ...as well as turn on paper-thin collision detection between mobjs, which I've gotten working but isn't perfect but it's still good enough for non-solid objects!!
2016-08-18 19:09:35 +00:00
if ((P_PointOnLineSide(tmx - tmthing->radius, tmy - tmthing->radius, &junk)
== P_PointOnLineSide(tmx + tmthing->radius, tmy + tmthing->radius, &junk))
&& (P_PointOnLineSide(tmx + tmthing->radius, tmy - tmthing->radius, &junk)
== P_PointOnLineSide(tmx - tmthing->radius, tmy + tmthing->radius, &junk)))
return true; // the line doesn't cross between either pair of opposite corners
}
}
As requested by Nev3r and VAda, seperating MF_PAPER into FF_PAPERSPRITE and MF_PAPERCOLLISION.
2016-08-20 14:15:48 +00:00
else if (tmthing->flags & MF_PAPERCOLLISION)
Okay, did a bunch of stuff. Getting ready to create a merge request, but not quite there yet. * MF_AMBUSH is now MF2_AMBUSH, because it's something you turn on in a map editor, not with a SOC definition. * Where MF_AMBUSH was is now MF_PAPER. * MF_PAPER accesses all the stuff I did previously in this branch... * ...as well as turn on paper-thin collision detection between mobjs, which I've gotten working but isn't perfect but it's still good enough for non-solid objects!!
2016-08-18 19:09:35 +00:00
{
Fixed collision for MF_PAPERCOLLISION with respect to diagonals.
2016-11-06 16:46:27 +00:00
fixed_t tmcosradius, tmsinradius;
Okay, did a bunch of stuff. Getting ready to create a merge request, but not quite there yet. * MF_AMBUSH is now MF2_AMBUSH, because it's something you turn on in a map editor, not with a SOC definition. * Where MF_AMBUSH was is now MF_PAPER. * MF_PAPER accesses all the stuff I did previously in this branch... * ...as well as turn on paper-thin collision detection between mobjs, which I've gotten working but isn't perfect but it's still good enough for non-solid objects!!
2016-08-18 19:09:35 +00:00
vertex_t v1, v2; // fake vertexes
line_t junk; // fake linedef
Fixed collision for MF_PAPERCOLLISION with respect to diagonals.
2016-11-06 16:46:27 +00:00
tmcosradius = FixedMul(tmthing->radius, FINECOSINE(tmthing->angle>>ANGLETOFINESHIFT));
tmsinradius = FixedMul(tmthing->radius, FINESINE(tmthing->angle>>ANGLETOFINESHIFT));
if (abs(thing->x - tmx) >= (thing->radius + abs(tmcosradius)) || abs(thing->y - tmy) >= (thing->radius + abs(tmsinradius)))
return true; // didn't hit it
Okay, did a bunch of stuff. Getting ready to create a merge request, but not quite there yet. * MF_AMBUSH is now MF2_AMBUSH, because it's something you turn on in a map editor, not with a SOC definition. * Where MF_AMBUSH was is now MF_PAPER. * MF_PAPER accesses all the stuff I did previously in this branch... * ...as well as turn on paper-thin collision detection between mobjs, which I've gotten working but isn't perfect but it's still good enough for non-solid objects!!
2016-08-18 19:09:35 +00:00
Fixed collision for MF_PAPERCOLLISION with respect to diagonals.
2016-11-06 16:46:27 +00:00
v1.x = tmx - tmcosradius;
v1.y = tmy - tmsinradius;
v2.x = tmx + tmcosradius;
v2.y = tmy + tmsinradius;
Okay, did a bunch of stuff. Getting ready to create a merge request, but not quite there yet. * MF_AMBUSH is now MF2_AMBUSH, because it's something you turn on in a map editor, not with a SOC definition. * Where MF_AMBUSH was is now MF_PAPER. * MF_PAPER accesses all the stuff I did previously in this branch... * ...as well as turn on paper-thin collision detection between mobjs, which I've gotten working but isn't perfect but it's still good enough for non-solid objects!!
2016-08-18 19:09:35 +00:00
junk.v1 = &v1;
junk.v2 = &v2;
Fixed collision for MF_PAPERCOLLISION with respect to diagonals.
2016-11-06 16:46:27 +00:00
junk.dx = 2*tmcosradius; // v2.x - v1.x;
junk.dy = 2*tmsinradius; // v2.y - v1.y;
Okay, did a bunch of stuff. Getting ready to create a merge request, but not quite there yet. * MF_AMBUSH is now MF2_AMBUSH, because it's something you turn on in a map editor, not with a SOC definition. * Where MF_AMBUSH was is now MF_PAPER. * MF_PAPER accesses all the stuff I did previously in this branch... * ...as well as turn on paper-thin collision detection between mobjs, which I've gotten working but isn't perfect but it's still good enough for non-solid objects!!
2016-08-18 19:09:35 +00:00
Fixed collision for MF_PAPERCOLLISION with respect to diagonals.
2016-11-06 16:46:27 +00:00
// no need to check whether other thing has MF_PAPERCOLLISION, since would fall under other condition
Okay, did a bunch of stuff. Getting ready to create a merge request, but not quite there yet. * MF_AMBUSH is now MF2_AMBUSH, because it's something you turn on in a map editor, not with a SOC definition. * Where MF_AMBUSH was is now MF_PAPER. * MF_PAPER accesses all the stuff I did previously in this branch... * ...as well as turn on paper-thin collision detection between mobjs, which I've gotten working but isn't perfect but it's still good enough for non-solid objects!!
2016-08-18 19:09:35 +00:00
if ((P_PointOnLineSide(thing->x - thing->radius, thing->y - thing->radius, &junk)
== P_PointOnLineSide(thing->x + thing->radius, thing->y + thing->radius, &junk))
&& (P_PointOnLineSide(thing->x + thing->radius, thing->y - thing->radius, &junk)
== P_PointOnLineSide(thing->x - thing->radius, thing->y + thing->radius, &junk)))
return true; // the line doesn't cross between either pair of opposite corners
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifdef HAVE_BLUA
{
UINT8 shouldCollide = LUAh_MobjCollide(thing, tmthing); // checks hook for thing's type
if (P_MobjWasRemoved(tmthing) || P_MobjWasRemoved(thing))
return true; // one of them was removed???
if (shouldCollide == 1)
return false; // force collide
else if (shouldCollide == 2)
return true; // force no collide
}
{
UINT8 shouldCollide = LUAh_MobjMoveCollide(tmthing, thing); // checks hook for tmthing's type
if (P_MobjWasRemoved(tmthing) || P_MobjWasRemoved(thing))
return true; // one of them was removed???
if (shouldCollide == 1)
return false; // force collide
else if (shouldCollide == 2)
return true; // force no collide
}
#endif
Lavafall lava also kills rings
2019-10-05 18:37:48 +00:00
if (tmthing->type == MT_LAVAFALL_LAVA && (thing->type == MT_RING || thing->type == MT_REDTEAMRING || thing->type == MT_BLUETEAMRING || thing->type == MT_FLINGRING))
{
//height check
if (tmthing->z > thing->z + thing->height || thing->z > tmthing->z + tmthing->height || !(thing->health))
return true;
P_KillMobj(thing, tmthing, tmthing, DMG_FIRE);
}
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
if (tmthing->type == MT_MINECART)
{
//height check
if (tmthing->z > thing->z + thing->height || thing->z > tmthing->z + tmthing->height || !(thing->health))
return true;
if (thing->type == MT_TNTBARREL)
P_KillMobj(thing, tmthing, tmthing->target, 0);
else if ((thing->flags & MF_MONITOR) || (thing->flags & MF_ENEMY))
{
P_KillMobj(thing, tmthing, tmthing->target, 0);
if (tmthing->momz*P_MobjFlip(tmthing) < 0)
tmthing->momz = abs(tmthing->momz)*P_MobjFlip(tmthing);
}
}
Hardcoded the saloon door
2019-06-12 19:20:14 +00:00
if (thing->type == MT_SALOONDOOR && tmthing->player)
{
Add solidity back to MT_SALOONDOOR, to work as a backup in case MT_SALOONDOORCENTER doesn't work (which it has issues with in one location in ACZ2 for some reason, and I can't identify why). Fully resolves #209, in any case.
2019-10-06 11:14:18 +00:00
mobj_t *ref = (tmthing->player->powers[pw_carry] == CR_MINECART && tmthing->tracer && !P_MobjWasRemoved(tmthing->tracer)) ? tmthing->tracer : tmthing;
if ((thing->flags & MF2_AMBUSH) || ref != tmthing)
Hardcoded the saloon door
2019-06-12 19:20:14 +00:00
{
Add solidity back to MT_SALOONDOOR, to work as a backup in case MT_SALOONDOORCENTER doesn't work (which it has issues with in one location in ACZ2 for some reason, and I can't identify why). Fully resolves #209, in any case.
2019-10-06 11:14:18 +00:00
fixed_t dm = min(FixedHypot(ref->momx, ref->momy), 16*FRACUNIT);
angle_t ang = R_PointToAngle2(0, 0, ref->momx, ref->momy) - thing->angle;
Hardcoded the saloon door
2019-06-12 19:20:14 +00:00
fixed_t s = FINESINE((ang >> ANGLETOFINESHIFT) & FINEMASK);
S_StartSound(tmthing, thing->info->activesound);
Finetuned the saloon door swinging
2019-06-16 15:57:03 +00:00
thing->extravalue2 += 2*FixedMul(s, dm)/3;
Hardcoded the saloon door
2019-06-12 19:20:14 +00:00
return true;
}
}
Fix Saloon doors. * Make the center be the object stuff collides with, so that if the door is open people can't slip through. * Add an MF_AMBUSH enhancement to allow non-minecart players to travel through. * Make A_SaloonDoorSpawn more customisable. (var1 = object type, var2 = distance sides should be placed apart)
2019-10-05 12:21:35 +00:00
if (thing->type == MT_SALOONDOORCENTER && tmthing->player)
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
{
Fix Saloon doors. * Make the center be the object stuff collides with, so that if the door is open people can't slip through. * Add an MF_AMBUSH enhancement to allow non-minecart players to travel through. * Make A_SaloonDoorSpawn more customisable. (var1 = object type, var2 = distance sides should be placed apart)
2019-10-05 12:21:35 +00:00
if ((thing->flags & MF2_AMBUSH) || (tmthing->player->powers[pw_carry] == CR_MINECART && tmthing->tracer && !P_MobjWasRemoved(tmthing->tracer)))
return true;
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
}
Collision polish
2019-10-07 06:51:32 +00:00
if (thing->type == MT_ROLLOUTROCK && tmthing->player && tmthing->health)
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
{
Readability changes
2019-10-07 05:35:10 +00:00
if (tmthing->player->powers[pw_carry] == CR_ROLLOUT)
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
{
Readability changes
2019-10-07 05:35:10 +00:00
return true;
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
}
Readability changes
2019-10-07 05:35:10 +00:00
if ((thing->flags & MF_PUSHABLE) // not carrying a player
Collision polish
2019-10-07 06:51:32 +00:00
&& (tmthing->player->powers[pw_carry] == CR_NONE) // player is not already riding something
Readability changes
2019-10-07 05:35:10 +00:00
&& ((tmthing->eflags & MFE_VERTICALFLIP) == (thing->eflags & MFE_VERTICALFLIP))
&& (P_MobjFlip(tmthing)*tmthing->momz <= 0)
&& ((!(tmthing->eflags & MFE_VERTICALFLIP) && abs(thing->z + thing->height - tmthing->z) < (thing->height>>2))
|| (tmthing->eflags & MFE_VERTICALFLIP && abs(tmthing->z + tmthing->height - thing->z) < (thing->height>>2))))
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
{
Readability changes
2019-10-07 05:36:36 +00:00
thing->flags &= ~MF_PUSHABLE; // prevent riding player from applying pushable movement logic
Allow rock to disappear if unridden for 12 seconds
2019-10-07 14:22:51 +00:00
thing->flags2 &= ~MF2_DONTDRAW; // don't leave the rock invisible if it was flashing prior to boarding
Collision polish
2019-10-07 06:51:32 +00:00
P_SetTarget(&thing->tracer, tmthing);
Readability changes
2019-10-07 05:35:10 +00:00
P_ResetPlayer(tmthing->player);
P_SetPlayerMobjState(tmthing, S_PLAY_WALK);
tmthing->player->powers[pw_carry] = CR_ROLLOUT;
P_SetTarget(&tmthing->tracer, thing);
Add bump sounds to rollout rock & add Newton's third law to jumping off them
2019-11-20 15:45:34 +00:00
if (!P_IsObjectOnGround(thing))
thing->momz += tmthing->momz;
Readability changes
2019-10-07 05:35:10 +00:00
return true;
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
}
Hardcode pumice ball Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 12:18:40 +00:00
}
else if (tmthing->type == MT_ROLLOUTROCK)
{
if (tmthing->z > thing->z + thing->height || thing->z > tmthing->z + tmthing->height || !thing->health)
return true;
Fix silly typo :P
2019-11-09 14:46:34 +00:00
Collision polish
2019-10-07 06:51:32 +00:00
if (thing == tmthing->tracer) // don't collide with rider
Let ridden rollout rocks collide with other players
2019-10-07 05:14:23 +00:00
return true;
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
Readability changes
2019-10-07 05:36:36 +00:00
if (thing->flags & MF_SPRING) // bounce on springs
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
{
Hardcode pumice ball Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 12:18:40 +00:00
P_DoSpring(thing, tmthing);
return true;
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
}
Collision polish
2019-10-07 06:51:32 +00:00
else if ((thing->flags & (MF_MONITOR|MF_SHOOTABLE)) == (MF_MONITOR|MF_SHOOTABLE) && !(tmthing->flags & MF_PUSHABLE)) // pop monitors while carrying a player
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
{
Collision polish
2019-10-07 06:51:32 +00:00
P_KillMobj(thing, tmthing, tmthing->tracer, 0);
Hardcode pumice ball Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 12:18:40 +00:00
return true;
}
Fix silly typo :P
2019-11-09 14:46:34 +00:00
Collision polish
2019-10-07 06:51:32 +00:00
if (thing->type == tmthing->type // bounce against other rollout rocks
&& (tmthing->momx || tmthing->momy || thing->momx || thing->momy))
Readability changes
2019-10-07 05:36:36 +00:00
{
fixed_t tempmomx = thing->momx, tempmomy = thing->momy;
thing->momx = tmthing->momx;
thing->momy = tmthing->momy;
tmthing->momx = tempmomx;
tmthing->momy = tempmomy;
Add bump sounds to rollout rock & add Newton's third law to jumping off them
2019-11-20 15:45:34 +00:00
S_StartSound(thing, thing->info->painsound);
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
}
}
Implemented the Pterabyte grabbing mechanic
2019-09-29 16:42:17 +00:00
if (thing->type == MT_PTERABYTE && tmthing->player)
P_DoPterabyteCarry(tmthing->player, thing);
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
if (thing->type == MT_TNTBARREL && tmthing->player)
Used toaster's new P_PlayerCanDamage function for the barrel collision
2019-07-10 07:08:57 +00:00
P_PlayerBarrelCollide(tmthing, thing);
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 08:51:33 +00:00
Hardcoded the new BASH behavior (there's still a bug lurking somewhere)
2019-06-10 14:09:15 +00:00
if (thing->type == MT_VULTURE && tmthing->type == MT_VULTURE)
{
fixed_t dx = thing->x - tmthing->x;
fixed_t dy = thing->y - tmthing->y;
fixed_t dz = thing->z - tmthing->z;
fixed_t dm = FixedHypot(dz, FixedHypot(dx, dy));
thing->momx += FixedDiv(dx, dm);
thing->momy += FixedDiv(dy, dm);
thing->momz += FixedDiv(dz, dm);
}
Hardcode "slapstick"
2019-05-05 16:36:55 +00:00
if (tmthing->type == MT_FANG && thing->type == MT_FSGNB)
{
if (thing->z > tmthing->z + tmthing->height)
return true; // overhead
if (thing->z + thing->height < tmthing->z)
return true; // underneath
Make ACZ3's slapstick signpost taller (resolves #267).
2019-11-15 14:52:34 +00:00
if (!thing->tracer || !thing->tracer->tracer)
Hardcode "slapstick"
2019-05-05 16:36:55 +00:00
return true;
P_SlapStick(tmthing, thing);
// no return value was used in the original prototype script at this point,
// so I'm assuming we fall back on the solid code to determine how it all ends?
// -- Monster Iestyn
}
* Billiards mines! With support for both above and below water, replacing both the below-and-above-water old mines at once. * Explosion executors. * Minor refactor of P_KillMobj.
2018-04-26 19:18:51 +00:00
// Billiards mines!
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
if (thing->type == MT_BIGMINE)
* Billiards mines! With support for both above and below water, replacing both the below-and-above-water old mines at once. * Explosion executors. * Minor refactor of P_KillMobj.
2018-04-26 19:18:51 +00:00
{
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
if (tmthing->type == MT_BIGMINE)
{
if (!tmthing->momx && !tmthing->momy)
return true;
if ((statenum_t)(thing->state-states) >= thing->info->meleestate)
return true;
if (thing->z > tmthing->z + tmthing->height)
return true; // overhead
if (thing->z + thing->height < tmthing->z)
return true; // underneath
thing->momx = tmthing->momx/3;
thing->momy = tmthing->momy/3;
thing->momz = tmthing->momz/3;
tmthing->momx /= -8;
tmthing->momy /= -8;
tmthing->momz /= -8;
if (thing->info->activesound)
S_StartSound(thing, thing->info->activesound);
P_SetMobjState(thing, thing->info->meleestate);
P_SetTarget(&thing->tracer, tmthing->tracer);
* Billiards mines! With support for both above and below water, replacing both the below-and-above-water old mines at once. * Explosion executors. * Minor refactor of P_KillMobj.
2018-04-26 19:18:51 +00:00
return true;
* Crushtacean! * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.
2018-05-14 00:19:24 +00:00
}
else if (tmthing->type == MT_CRUSHCLAW)
{
if (tmthing->extravalue1 <= 0)
return true;
if ((statenum_t)(thing->state-states) >= thing->info->meleestate)
return true;
if (thing->z > tmthing->z + tmthing->height)
return true; // overhead
if (thing->z + thing->height < tmthing->z)
return true; // underneath
thing->momx = P_ReturnThrustX(tmthing, tmthing->angle, 2*tmthing->extravalue1*tmthing->scale/3);
thing->momy = P_ReturnThrustY(tmthing, tmthing->angle, 2*tmthing->extravalue1*tmthing->scale/3);
if (thing->info->activesound)
S_StartSound(thing, thing->info->activesound);
P_SetMobjState(thing, thing->info->meleestate);
if (tmthing->tracer)
P_SetTarget(&thing->tracer, tmthing->tracer->target);
return false;
}
* Billiards mines! With support for both above and below water, replacing both the below-and-above-water old mines at once. * Explosion executors. * Minor refactor of P_KillMobj.
2018-04-26 19:18:51 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// When solid spikes move, assume they just popped up and teleport things on top of them to hurt.
if (tmthing->type == MT_SPIKE && tmthing->flags & MF_SOLID)
{
if (thing->z > tmthing->z + tmthing->height)
return true; // overhead
if (thing->z + thing->height < tmthing->z)
return true; // underneath
if (tmthing->eflags & MFE_VERTICALFLIP)
thing->z = tmthing->z - thing->height - FixedMul(FRACUNIT, tmthing->scale);
else
thing->z = tmthing->z + tmthing->height + FixedMul(FRACUNIT, tmthing->scale);
if (thing->flags & MF_SHOOTABLE)
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(thing, tmthing, tmthing, 1, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
if (thing->flags & MF_PAIN && tmthing->player)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{ // Player touches painful thing sitting on the floor
// see if it went over / under
if (thing->z > tmthing->z + tmthing->height)
return true; // overhead
if (thing->z + thing->height < tmthing->z)
return true; // underneath
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
if (tmthing->flags & MF_SHOOTABLE && thing->health > 0)
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
{
* Fix native MF_PAIN sound extension being limited to UINT8 range, which only became evident when the new s1/2/cd/3db/kc sfx were added. * Make the pain-causing cactodes have DMG_SPIKE.
2019-09-18 16:48:41 +00:00
UINT32 damagetype = (thing->info->mass & 0xFF);
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
if (!damagetype && thing->flags & MF_FIRE) // BURN!
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
damagetype = DMG_FIRE;
* DrT's Spincushion hardcoded. * Make the MF_PAIN stuff ONLY depend on mass, using the bottom 8 bits for the type and the custom sound in the upper ones. * A bunch of cleanup of random other stuff, including an unused Deton state and an unused Jetty type's sprite.
2018-05-13 13:09:20 +00:00
if (P_DamageMobj(tmthing, thing, thing, 1, damagetype) && (damagetype = (thing->info->mass>>8)))
S_StartSound(thing, damagetype);
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
else if (tmthing->flags & MF_PAIN && thing->player)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{ // Painful thing splats player in the face
// see if it went over / under
if (tmthing->z > thing->z + thing->height)
return true; // overhead
if (tmthing->z + tmthing->height < thing->z)
return true; // underneath
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
if (thing->flags & MF_SHOOTABLE && tmthing->health > 0)
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
{
* Fix native MF_PAIN sound extension being limited to UINT8 range, which only became evident when the new s1/2/cd/3db/kc sfx were added. * Make the pain-causing cactodes have DMG_SPIKE.
2019-09-18 16:48:41 +00:00
UINT32 damagetype = (tmthing->info->mass & 0xFF);
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
if (!damagetype && tmthing->flags & MF_FIRE) // BURN!
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
damagetype = DMG_FIRE;
* DrT's Spincushion hardcoded. * Make the MF_PAIN stuff ONLY depend on mass, using the bottom 8 bits for the type and the custom sound in the upper ones. * A bunch of cleanup of random other stuff, including an unused Deton state and an unused Jetty type's sprite.
2018-05-13 13:09:20 +00:00
if (P_DamageMobj(thing, tmthing, tmthing, 1, damagetype) && (damagetype = (tmthing->info->mass>>8)))
S_StartSound(tmthing, damagetype);
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
if (thing->type == MT_HOOPCOLLIDE && thing->flags & MF_SPECIAL && tmthing->player)
{
P_TouchSpecialThing(thing, tmthing, true);
return true;
}
// check for skulls slamming into things
if (tmthing->flags2 & MF2_SKULLFLY)
{
if (tmthing->type == MT_EGGMOBILE) // Don't make Eggman stop!
return true; // Let him RUN YOU RIGHT OVER. >:3
else
{
// see if it went over / under
if (tmthing->z > thing->z + thing->height)
return true; // overhead
if (tmthing->z + tmthing->height < thing->z)
return true; // underneath
tmthing->flags2 &= ~MF2_SKULLFLY;
tmthing->momx = tmthing->momy = tmthing->momz = 0;
return false; // stop moving
}
}
if ((thing->type == MT_SPRINGSHELL || thing->type == MT_YELLOWSHELL) && thing->health > 0
&& (tmthing->player || (tmthing->flags & MF_PUSHABLE)) && tmthing->health > 0)
{
// Multiplying by -1 inherently flips "less than" and "greater than"
fixed_t tmz = ((thing->eflags & MFE_VERTICALFLIP) ? -(tmthing->z + tmthing->height) : tmthing->z);
fixed_t tmznext = ((thing->eflags & MFE_VERTICALFLIP) ? -tmthing->momz : tmthing->momz) + tmz;
fixed_t thzh = ((thing->eflags & MFE_VERTICALFLIP) ? -thing->z : thing->z + thing->height);
fixed_t sprarea = FixedMul(8*FRACUNIT, thing->scale) * P_MobjFlip(thing);
if ((tmznext <= thzh && tmz > thzh) || (tmznext > thzh - sprarea && tmznext < thzh))
{
P_DoSpring(thing, tmthing);
return true;
}
else if (tmz > thzh - sprarea && tmz < thzh) // Don't damage people springing up / down
return true;
}
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// missiles can hit other things
if (tmthing->flags & MF_MISSILE || tmthing->type == MT_SHELL)
{
// see if it went over / under
if (tmthing->z > thing->z + thing->height)
return true; // overhead
if (tmthing->z + tmthing->height < thing->z)
return true; // underneath
if (tmthing->type != MT_SHELL && tmthing->target && tmthing->target->type == thing->type)
{
// Don't hit same species as originator.
if (thing == tmthing->target)
return true;
if (thing->type != MT_PLAYER)
{
// Explode, but do no damage.
// Let players missile other players.
return false;
}
}
// Special case for bounce rings so they don't get caught behind solid objects.
if ((tmthing->type == MT_THROWNBOUNCE && tmthing->fuse > 8*TICRATE) && thing->flags & MF_SOLID)
return true;
// Missiles ignore Brak's helper.
if (thing->type == MT_BLACKEGGMAN_HELPER)
return true;
// Hurting Brak
if (tmthing->type == MT_BLACKEGGMAN_MISSILE
&& thing->type == MT_BLACKEGGMAN && tmthing->target != thing)
{
// Not if Brak's already in pain
if (!(thing->state >= &states[S_BLACKEGG_PAIN1] && thing->state <= &states[S_BLACKEGG_PAIN35]))
P_SetMobjState(thing, thing->info->painstate);
return false;
}
if (!(thing->flags & MF_SHOOTABLE) && !(thing->type == MT_EGGSHIELD))
{
// didn't do any damage
return !(thing->flags & MF_SOLID);
}
if (tmthing->flags & MF_MISSILE && thing->player && tmthing->target && tmthing->target->player
&& thing->player->ctfteam == tmthing->target->player->ctfteam
Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. * PF_ITEMHANG -> CR_GENERIC * PF_CARRIED -> CR_PLAYER * (mo->tracer == MT_TUBEWAYPOINT) -> CR_ZOOMTUBE * PF_ROPEHANG -> CR_ROPEHANG * PF_MACESPIN -> CR_MACESPIN
2016-09-23 22:48:48 +00:00
&& thing->player->powers[pw_carry] == CR_PLAYER && thing->tracer == tmthing->target)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true; // Don't give rings to your carry player by accident.
if (thing->type == MT_EGGSHIELD)
{
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
angle_t angle = (R_PointToAngle2(thing->x, thing->y, tmthing->x - tmthing->momx, tmthing->y - tmthing->momy) - thing->angle) - ANGLE_90;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
if (angle < ANGLE_180) // hit shield from behind, shield is destroyed!
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_KillMobj(thing, tmthing, tmthing, 0);
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
return false;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// damage / explode
if (tmthing->flags & MF_ENEMY) // An actual ENEMY! (Like the deton, for example)
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(thing, tmthing, tmthing, 1, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else if (tmthing->type == MT_BLACKEGGMAN_MISSILE && thing->player
&& (thing->player->pflags & PF_JUMPED)
&& !thing->player->powers[pw_flashing]
&& thing->tracer != tmthing
&& tmthing->target != thing)
{
// Hop on the missile for a ride!
Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. * PF_ITEMHANG -> CR_GENERIC * PF_CARRIED -> CR_PLAYER * (mo->tracer == MT_TUBEWAYPOINT) -> CR_ZOOMTUBE * PF_ROPEHANG -> CR_ROPEHANG * PF_MACESPIN -> CR_MACESPIN
2016-09-23 22:48:48 +00:00
thing->player->powers[pw_carry] = CR_GENERIC;
Made jump damage flag application less hacky.
2017-03-18 21:06:06 +00:00
thing->player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
P_SetTarget(&thing->tracer, tmthing);
P_SetTarget(&tmthing->target, thing); // Set owner to the player
P_SetTarget(&tmthing->tracer, NULL); // Disable homing-ness
tmthing->momz = 0;
thing->angle = tmthing->angle;
Fix replay camera not being turnable when climbing, sliding ...and several other things. If in analog mode, this does not apply (also analog mode replay camera no longer borks)
2016-04-05 19:56:48 +00:00
if (!demoplayback || P_AnalogMove(thing->player))
{
if (thing->player == &players[consoleplayer])
localangle = thing->angle;
else if (thing->player == &players[secondarydisplayplayer])
localangle2 = thing->angle;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. * PF_ITEMHANG -> CR_GENERIC * PF_CARRIED -> CR_PLAYER * (mo->tracer == MT_TUBEWAYPOINT) -> CR_ZOOMTUBE * PF_ROPEHANG -> CR_ROPEHANG * PF_MACESPIN -> CR_MACESPIN
2016-09-23 22:48:48 +00:00
else if (tmthing->type == MT_BLACKEGGMAN_MISSILE && thing->player && ((thing->player->powers[pw_carry] == CR_GENERIC) || (thing->player->pflags & PF_JUMPED)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// Ignore
}
else if (tmthing->type == MT_BLACKEGGMAN_GOOPFIRE)
{
P_UnsetThingPosition(tmthing);
tmthing->x = thing->x;
tmthing->y = thing->y;
P_SetThingPosition(tmthing);
}
PITY IN PINK! * Smoothen Pity Shield animation to go with sphere's updates to Nev3r's sprites. * Added LHRT object, designed to be summoned with CA2_MELEE. * Gives a pink Pity Shield (SH_PINK) on same-team player contact. * Deals damage to non-player enemies. * Harmlessly fades into nothing when touching an enemy player, players with SH_PINK already, and players capable of applying SH_PINK to others (through non-Lua methods). * Basically, you-know-who is the Healer of the party whenever they're around. Fun consequences for the Co-op and CTF metas.
2019-06-19 22:20:24 +00:00
else if (!(tmthing->type == MT_SHELL && thing->player)) // player collision handled in touchspecial for shell
* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.
2018-04-28 14:13:44 +00:00
{
UINT8 damagetype = tmthing->info->mass;
if (!damagetype && tmthing->flags & MF_FIRE) // BURN!
damagetype = DMG_FIRE;
P_DamageMobj(thing, tmthing, tmthing->target, 1, damagetype);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Move the fireball despawn to later so its target/tracer isn't nulled until AFTER the enemy it touches is killed, allowing for correct point delivery (resolves #373).
2019-11-26 17:56:42 +00:00
// Fireball touched an enemy
// Don't bounce though, just despawn right there
if ((tmthing->type == MT_FIREBALL) && (thing->flags & MF_ENEMY))
P_KillMobj(tmthing, NULL, NULL, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// don't traverse any more
if (tmthing->type == MT_SHELL)
return true;
else
return false;
}
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (thing->flags & MF_PUSHABLE && (tmthing->player || tmthing->flags & MF_PUSHABLE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& tmthing->z + tmthing->height > thing->z && tmthing->z < thing->z + thing->height
&& !(netgame && tmthing->player && tmthing->player->spectator)) // Push thing!
{
if (thing->flags2 & MF2_SLIDEPUSH) // Make it slide
{
if (tmthing->momy > 0 && tmthing->momy > FixedMul(4*FRACUNIT, thing->scale) && tmthing->momy > thing->momy)
{
thing->momy += FixedMul(PUSHACCEL, thing->scale);
tmthing->momy -= FixedMul(PUSHACCEL, thing->scale);
}
else if (tmthing->momy < 0 && tmthing->momy < FixedMul(-4*FRACUNIT, thing->scale)
&& tmthing->momy < thing->momy)
{
thing->momy -= FixedMul(PUSHACCEL, thing->scale);
tmthing->momy += FixedMul(PUSHACCEL, thing->scale);
}
if (tmthing->momx > 0 && tmthing->momx > FixedMul(4*FRACUNIT, thing->scale)
&& tmthing->momx > thing->momx)
{
thing->momx += FixedMul(PUSHACCEL, thing->scale);
tmthing->momx -= FixedMul(PUSHACCEL, thing->scale);
}
else if (tmthing->momx < 0 && tmthing->momx < FixedMul(-4*FRACUNIT, thing->scale)
&& tmthing->momx < thing->momx)
{
thing->momx -= FixedMul(PUSHACCEL, thing->scale);
tmthing->momx += FixedMul(PUSHACCEL, thing->scale);
}
if (thing->momx > FixedMul(thing->info->speed, thing->scale))
thing->momx = FixedMul(thing->info->speed, thing->scale);
else if (thing->momx < -FixedMul(thing->info->speed, thing->scale))
thing->momx = -FixedMul(thing->info->speed, thing->scale);
if (thing->momy > FixedMul(thing->info->speed, thing->scale))
thing->momy = FixedMul(thing->info->speed, thing->scale);
else if (thing->momy < -FixedMul(thing->info->speed, thing->scale))
thing->momy = -FixedMul(thing->info->speed, thing->scale);
}
else
{
if (tmthing->momx > FixedMul(4*FRACUNIT, thing->scale))
tmthing->momx = FixedMul(4*FRACUNIT, thing->scale);
else if (tmthing->momx < FixedMul(-4*FRACUNIT, thing->scale))
tmthing->momx = FixedMul(-4*FRACUNIT, thing->scale);
if (tmthing->momy > FixedMul(4*FRACUNIT, thing->scale))
tmthing->momy = FixedMul(4*FRACUNIT, thing->scale);
else if (tmthing->momy < FixedMul(-4*FRACUNIT, thing->scale))
tmthing->momy = FixedMul(-4*FRACUNIT, thing->scale);
thing->momx = tmthing->momx;
thing->momy = tmthing->momy;
}
if (thing->type != MT_GARGOYLE || P_IsObjectOnGround(thing))
S_StartSound(thing, thing->info->activesound);
P_SetTarget(&thing->target, tmthing);
}
Nights LE checkpoint
2018-03-30 18:22:59 +00:00
// NiGHTS lap logic
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if ((tmthing->type == MT_NIGHTSDRONE || thing->type == MT_NIGHTSDRONE)
&& (tmthing->player || thing->player))
{
mobj_t *droneobj = (tmthing->type == MT_NIGHTSDRONE) ? tmthing : thing;
player_t *pl = (droneobj == thing) ? tmthing->player : thing->player;
Add player_t marelap and marebonuslap, with logic
2018-03-30 18:36:49 +00:00
// Must be NiGHTS, must wait about a second
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// must be flying in the SAME DIRECTION as the last time you came through.
// not (your direction) xor (stored direction)
// In other words, you can't u-turn and respawn rings near the drone.
Add player_t marelap and marebonuslap, with logic
2018-03-30 18:36:49 +00:00
if ((pl->powers[pw_carry] == CR_NIGHTSMODE) && (INT32)leveltime > droneobj->extravalue2 && (
NiGHTS drone loop: Change flyangle comparison to fix detection from vertical angles Use > 90 && < 270 instead of >= 90 && <= 270. Fixes a bug where if you fly directly up (flyangle 90) or directly down (flyangle 270), that registers as a backwards direction, so you trigger the loop detection by flying BACKWARDS, not FORWARDS. This edge case (only possible via JUMPTOAXIS) should default to FORWARDS looping.
2018-03-26 05:04:02 +00:00
!(pl->flyangle > 90 && pl->flyangle < 270)
^ (droneobj->extravalue1 > 90 && droneobj->extravalue1 < 270)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
))
{
Add player_t marelap and marebonuslap, with logic
2018-03-30 18:36:49 +00:00
pl->marelap++;
totalmarelap and totalmarebonuslap player variables
2018-08-12 23:57:33 +00:00
pl->totalmarelap++;
Add lapbegunat and lapstartedtime player variables There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
2018-08-10 21:12:26 +00:00
pl->lapbegunat = leveltime;
pl->lapstartedtime = pl->nightstime;
Add player_t marelap and marebonuslap, with logic
2018-03-30 18:36:49 +00:00
totalmarelap and totalmarebonuslap player variables
2018-08-12 23:57:33 +00:00
if (pl->bonustime)
Add player_t marelap and marebonuslap, with logic
2018-03-30 18:36:49 +00:00
{
pl->marebonuslap++;
totalmarelap and totalmarebonuslap player variables
2018-08-12 23:57:33 +00:00
pl->totalmarebonuslap++;
Add player_t marelap and marebonuslap, with logic
2018-03-30 18:36:49 +00:00
// Respawn rings and items
P_ReloadRings();
}
Nights LE checkpoint
2018-03-30 18:22:59 +00:00
P_RunNightsLapExecutors(pl->mo);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Fix NiGHTS drone loop detection by using pl->flyangle
2018-03-26 04:33:17 +00:00
droneobj->extravalue1 = pl->flyangle;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
droneobj->extravalue2 = (INT32)leveltime + TICRATE;
}
// check for special pickup
if (thing->flags & MF_SPECIAL && tmthing->player)
{
P_TouchSpecialThing(thing, tmthing, true); // can remove thing
return true;
}
// check again for special pickup
if (tmthing->flags & MF_SPECIAL && thing->player)
{
P_TouchSpecialThing(tmthing, thing, true); // can remove thing
return true;
}
// Sprite Spikes!
// Do not return because solidity code comes below.
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (tmthing->type == MT_SPIKE && tmthing->flags & MF_SOLID && thing->player) // moving spike rams into player?!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (tmthing->eflags & MFE_VERTICALFLIP)
{
if (thing->z + thing->height <= tmthing->z + FixedMul(FRACUNIT, tmthing->scale)
Introducing CA2_GUNSLINGER. * Mildly hacky proof of concept! Will de-hack later. * Charge up your ability! * You can only damage others if it's at full power. * Fires directly at enemies/bosses when at full power. Does NOT aim at players.
2017-03-21 00:54:47 +00:00
&& thing->z + thing->height + thing->momz >= tmthing->z + FixedMul(FRACUNIT, tmthing->scale) + tmthing->momz
&& !(thing->player->charability == CA_BOUNCE && thing->player->panim == PA_ABILITY && thing->eflags & MFE_VERTICALFLIP))
* Bustable wallspikes. * Improve the code for busting vertical spikes. * Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta) * Make all spikes consistently do damage with DMG_SPIKE. * (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages
2017-07-18 13:17:10 +00:00
P_DamageMobj(thing, tmthing, tmthing, 1, DMG_SPIKE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else if (thing->z >= tmthing->z + tmthing->height - FixedMul(FRACUNIT, tmthing->scale)
Introducing CA2_GUNSLINGER. * Mildly hacky proof of concept! Will de-hack later. * Charge up your ability! * You can only damage others if it's at full power. * Fires directly at enemies/bosses when at full power. Does NOT aim at players.
2017-03-21 00:54:47 +00:00
&& thing->z + thing->momz <= tmthing->z + tmthing->height - FixedMul(FRACUNIT, tmthing->scale) + tmthing->momz
&& !(thing->player->charability == CA_BOUNCE && thing->player->panim == PA_ABILITY && !(thing->eflags & MFE_VERTICALFLIP)))
* Bustable wallspikes. * Improve the code for busting vertical spikes. * Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta) * Make all spikes consistently do damage with DMG_SPIKE. * (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages
2017-07-18 13:17:10 +00:00
P_DamageMobj(thing, tmthing, tmthing, 1, DMG_SPIKE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
else if (thing->type == MT_SPIKE && thing->flags & MF_SOLID && tmthing->player) // unfortunate player falls into spike?!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (thing->eflags & MFE_VERTICALFLIP)
{
if (tmthing->z + tmthing->height <= thing->z - FixedMul(FRACUNIT, thing->scale)
Introducing CA2_GUNSLINGER. * Mildly hacky proof of concept! Will de-hack later. * Charge up your ability! * You can only damage others if it's at full power. * Fires directly at enemies/bosses when at full power. Does NOT aim at players.
2017-03-21 00:54:47 +00:00
&& tmthing->z + tmthing->height + tmthing->momz >= thing->z - FixedMul(FRACUNIT, thing->scale)
&& !(tmthing->player->charability == CA_BOUNCE && tmthing->player->panim == PA_ABILITY && tmthing->eflags & MFE_VERTICALFLIP))
* Bustable wallspikes. * Improve the code for busting vertical spikes. * Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta) * Make all spikes consistently do damage with DMG_SPIKE. * (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages
2017-07-18 13:17:10 +00:00
P_DamageMobj(tmthing, thing, thing, 1, DMG_SPIKE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else if (tmthing->z >= thing->z + thing->height + FixedMul(FRACUNIT, thing->scale)
Introducing CA2_GUNSLINGER. * Mildly hacky proof of concept! Will de-hack later. * Charge up your ability! * You can only damage others if it's at full power. * Fires directly at enemies/bosses when at full power. Does NOT aim at players.
2017-03-21 00:54:47 +00:00
&& tmthing->z + tmthing->momz <= thing->z + thing->height + FixedMul(FRACUNIT, thing->scale)
&& !(tmthing->player->charability == CA_BOUNCE && tmthing->player->panim == PA_ABILITY && !(tmthing->eflags & MFE_VERTICALFLIP)))
* Bustable wallspikes. * Improve the code for busting vertical spikes. * Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta) * Make all spikes consistently do damage with DMG_SPIKE. * (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages
2017-07-18 13:17:10 +00:00
P_DamageMobj(tmthing, thing, thing, 1, DMG_SPIKE);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
Add the remaining code from the Lua script to get wall spikes actually working so far
2017-07-13 22:00:45 +00:00
if (tmthing->type == MT_WALLSPIKE && tmthing->flags & MF_SOLID && thing->player) // wall spike impales player
{
fixed_t bottomz, topz;
bottomz = tmthing->z;
topz = tmthing->z + tmthing->height;
if (tmthing->eflags & MFE_VERTICALFLIP)
bottomz -= FixedMul(FRACUNIT, tmthing->scale);
else
topz += FixedMul(FRACUNIT, tmthing->scale);
Fix wall spikes being harmful from below, set initial destscale of base too just in case
2017-07-14 16:01:13 +00:00
if (thing->z + thing->height > bottomz // above bottom
Add the remaining code from the Lua script to get wall spikes actually working so far
2017-07-13 22:00:45 +00:00
&& thing->z < topz) // below top
Whooh boy. Probably requires re-review. * Support for MF_PAPERCOLLISION tmhitthing in P_SlideMove. * Knockback for wallspikes is much more consistent. * Optimised away a FixedDiv call when determining the slopetype of a line. * Changed the position of the wallspike base slightly. * Made it so NOTHING can step up onto the player outside of other players, essentially killing a bunch of springs-launch-with-players style bugs. (I was able to recreate that issue with the wallspikes until I added this, which is why I did it in this branch.)
2017-07-18 13:17:10 +00:00
// don't check angle, the player was clearly in the way in this case
Add the remaining code from the Lua script to get wall spikes actually working so far
2017-07-13 22:00:45 +00:00
P_DamageMobj(thing, tmthing, tmthing, 1, DMG_SPIKE);
}
else if (thing->type == MT_WALLSPIKE && thing->flags & MF_SOLID && tmthing->player)
{
fixed_t bottomz, topz;
Make it so you can't even STAND on spikes if you're flashing and moving away from them.
2017-07-30 15:52:39 +00:00
angle_t touchangle = R_PointToAngle2(thing->tracer->x, thing->tracer->y, tmthing->x, tmthing->y);
Okay, actually fixed. Thanks, MI, for understanding the maths a little better than I :p
2017-07-30 16:45:27 +00:00
if (P_PlayerInPain(tmthing->player) && (tmthing->momx || tmthing->momy))
{
angle_t playerangle = R_PointToAngle2(0, 0, tmthing->momx, tmthing->momy) - touchangle;
if (playerangle > ANGLE_180)
playerangle = InvAngle(playerangle);
if (playerangle < ANGLE_90)
return true; // Yes, this is intentionally outside the z-height check. No standing on spikes whilst moving away from them.
}
Make it so you can't even STAND on spikes if you're flashing and moving away from them.
2017-07-30 15:52:39 +00:00
Add the remaining code from the Lua script to get wall spikes actually working so far
2017-07-13 22:00:45 +00:00
bottomz = thing->z;
topz = thing->z + thing->height;
Whooh boy. Probably requires re-review. * Support for MF_PAPERCOLLISION tmhitthing in P_SlideMove. * Knockback for wallspikes is much more consistent. * Optimised away a FixedDiv call when determining the slopetype of a line. * Changed the position of the wallspike base slightly. * Made it so NOTHING can step up onto the player outside of other players, essentially killing a bunch of springs-launch-with-players style bugs. (I was able to recreate that issue with the wallspikes until I added this, which is why I did it in this branch.)
2017-07-18 13:17:10 +00:00
Add the remaining code from the Lua script to get wall spikes actually working so far
2017-07-13 22:00:45 +00:00
if (thing->eflags & MFE_VERTICALFLIP)
bottomz -= FixedMul(FRACUNIT, thing->scale);
else
topz += FixedMul(FRACUNIT, thing->scale);
Fix wall spikes being harmful from below, set initial destscale of base too just in case
2017-07-14 16:01:13 +00:00
if (tmthing->z + tmthing->height > bottomz // above bottom
Add the remaining code from the Lua script to get wall spikes actually working so far
2017-07-13 22:00:45 +00:00
&& tmthing->z < topz // below top
&& !P_MobjWasRemoved(thing->tracer)) // this probably wouldn't work if we didn't have a tracer
{ // use base as a reference point to determine what angle you touched the spike at
* Scope tweakin's to prevent having to make some stuff static. * Make wallspikes intangible if you're being thrust away from them in pain.
2017-07-18 13:17:10 +00:00
touchangle = thing->angle - touchangle;
if (touchangle > ANGLE_180)
touchangle = InvAngle(touchangle);
if (touchangle <= ANGLE_22h) // if you touched it at this close an angle, you get poked!
Add the remaining code from the Lua script to get wall spikes actually working so far
2017-07-13 22:00:45 +00:00
P_DamageMobj(tmthing, thing, thing, 1, DMG_SPIKE);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (thing->flags & MF_PUSHABLE)
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (tmthing->type == MT_FAN || tmthing->type == MT_STEAM)
P_DoFanAndGasJet(tmthing, thing);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (tmthing->flags & MF_PUSHABLE)
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (thing->type == MT_FAN || thing->type == MT_STEAM)
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 19:03:18 +00:00
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
P_DoFanAndGasJet(thing, tmthing);
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 19:03:18 +00:00
return true;
}
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-11 20:54:11 +00:00
else if (thing->flags & MF_SPRING)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-11 20:54:11 +00:00
if ( thing->z <= tmthing->z + tmthing->height
&& tmthing->z <= thing->z + thing->height)
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 19:03:18 +00:00
if (P_DoSpring(thing, tmthing))
return false;
return true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
// thanks to sal for solidenemies dot lua
if (thing->flags & (MF_ENEMY|MF_BOSS) && tmthing->flags & (MF_ENEMY|MF_BOSS))
{
if ((thing->z + thing->height >= tmthing->z)
&& (tmthing->z + tmthing->height >= thing->z))
return false;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Damage other players when invincible
if (tmthing->player && thing->player
// Make sure they aren't able to damage you ANYWHERE along the Z axis, you have to be TOUCHING the person.
&& !(thing->z + thing->height < tmthing->z || thing->z > tmthing->z + tmthing->height))
{
if (G_RingSlingerGametype() && (!G_GametypeHasTeams() || tmthing->player->ctfteam != thing->player->ctfteam))
{
Elemental shield ability now coded. REQUIRES NEW PATCH.DTA FROM THE FTP. - Press spin in midair to stomp directly downwards (losing horizontal momentum), creating a flickering fireball around you. - No bouncing on enemies, item boxes, etc - just go straight through. - Hurts other players on touch whilst you're stomping. - Spawns a bunch of flames around you when you hit the ground. Also: - Electric shield's ability now uses different sounds, because I'm picky.
2016-07-08 20:55:17 +00:00
if ((tmthing->player->powers[pw_invulnerability] || tmthing->player->powers[pw_super] || (((tmthing->player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL) && (tmthing->player->pflags & PF_SHIELDABILITY)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& !thing->player->powers[pw_super])
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(thing, tmthing, tmthing, 1, 0);
Elemental shield ability now coded. REQUIRES NEW PATCH.DTA FROM THE FTP. - Press spin in midair to stomp directly downwards (losing horizontal momentum), creating a flickering fireball around you. - No bouncing on enemies, item boxes, etc - just go straight through. - Hurts other players on touch whilst you're stomping. - Spawns a bunch of flames around you when you hit the ground. Also: - Electric shield's ability now uses different sounds, because I'm picky.
2016-07-08 20:55:17 +00:00
else if ((thing->player->powers[pw_invulnerability] || thing->player->powers[pw_super] || (((thing->player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL) && (thing->player->pflags & PF_SHIELDABILITY)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& !tmthing->player->powers[pw_super])
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(tmthing, thing, thing, 1, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// If players are using touch tag, seekers damage hiders.
if (G_TagGametype() && cv_touchtag.value &&
((thing->player->pflags & PF_TAGIT) != (tmthing->player->pflags & PF_TAGIT)))
{
if ((tmthing->player->pflags & PF_TAGIT) && !(thing->player->pflags & PF_TAGIT))
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(thing, tmthing, tmthing, 1, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else if ((thing->player->pflags & PF_TAGIT) && !(tmthing->player->pflags & PF_TAGIT))
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(tmthing, thing, tmthing, 1, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
// Force solid players in hide and seek to avoid corner stacking.
if (cv_tailspickup.value && gametype != GT_HIDEANDSEEK)
{
if (tmthing->player && thing->player)
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
P_DoTailsCarry(thing->player, tmthing->player);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
}
else if (thing->player) {
if (thing->player-players == consoleplayer && botingame)
CV_SetValue(&cv_analog2, true);
Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. * PF_ITEMHANG -> CR_GENERIC * PF_CARRIED -> CR_PLAYER * (mo->tracer == MT_TUBEWAYPOINT) -> CR_ZOOMTUBE * PF_ROPEHANG -> CR_ROPEHANG * PF_MACESPIN -> CR_MACESPIN
2016-09-23 22:48:48 +00:00
if (thing->player->powers[pw_carry] == CR_PLAYER)
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
{
P_SetTarget(&thing->tracer, NULL);
Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. * PF_ITEMHANG -> CR_GENERIC * PF_CARRIED -> CR_PLAYER * (mo->tracer == MT_TUBEWAYPOINT) -> CR_ZOOMTUBE * PF_ROPEHANG -> CR_ROPEHANG * PF_MACESPIN -> CR_MACESPIN
2016-09-23 22:48:48 +00:00
thing->player->powers[pw_carry] = CR_NONE;
Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. * PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type. * PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (thing->player)
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
// Doesn't matter what gravity player's following! Just do your stuff in YOUR direction only
if (tmthing->eflags & MFE_VERTICALFLIP
Correcting a most minor math mistake git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8992 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-01-20 19:42:10 +00:00
&& (tmthing->z + tmthing->height + tmthing->momz < thing->z
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
|| tmthing->z + tmthing->height + tmthing->momz >= thing->z + thing->height))
;
else if (!(tmthing->eflags & MFE_VERTICALFLIP)
&& (tmthing->z + tmthing->momz > thing->z + thing->height
|| tmthing->z + tmthing->momz <= thing->z))
;
else if (P_IsObjectOnGround(thing)
&& !P_IsObjectOnGround(tmthing) // Don't crush if the monitor is on the ground...
&& (tmthing->flags & MF_SOLID))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (tmthing->flags & (MF_MONITOR|MF_PUSHABLE))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
// Objects kill you if it falls from above.
if (thing != tmthing->target)
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
P_DamageMobj(thing, tmthing, tmthing->target, 1, DMG_CRUSHED);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
tmthing->momz = -tmthing->momz/2; // Bounce, just for fun!
// The tmthing->target allows the pusher of the object
// to get the point if he topples it on an opponent.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (tmthing->type == MT_FAN || tmthing->type == MT_STEAM)
P_DoFanAndGasJet(tmthing, thing);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (tmthing->player) // Is the moving/interacting object the player?
{
if (!tmthing->health)
return true;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
if (thing->type == MT_FAN || thing->type == MT_STEAM)
P_DoFanAndGasJet(thing, tmthing);
More incomplete minecart hardcoding
2019-06-13 19:45:30 +00:00
else if (thing->flags & MF_SPRING && tmthing->player->powers[pw_carry] != CR_MINECART)
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-11 20:54:11 +00:00
{
if ( thing->z <= tmthing->z + tmthing->height
&& tmthing->z <= thing->z + thing->height)
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 19:03:18 +00:00
if (P_DoSpring(thing, tmthing))
return false;
return true;
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse) git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-11 20:54:11 +00:00
}
Remove the ugly double-hack for monitors! Doesn't QUITE do it via the return value of P_DamageMobj like MI and I theorised it should do, but it's functionally identical whilst being less code to maintain.
2018-05-02 19:55:07 +00:00
// Monitor?
else if (thing->flags & MF_MONITOR
P_PlayerCanDamage(player_t*, mobj_t*), ported from the abandoned project_birthday because GOD the code looks awful with those huge monolith conditions in it. Available to Lua. (Also, minor fixes to lib_pSpawnLockOn, and removing the SH_OP fuckery.)
2019-06-19 11:09:02 +00:00
&& !((thing->type == MT_RING_REDBOX && tmthing->player->ctfteam != 1) || (thing->type == MT_RING_BLUEBOX && tmthing->player->ctfteam != 2))
&& (!(thing->flags & MF_SOLID) || P_PlayerCanDamage(tmthing->player, thing)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
P_PlayerCanDamage(player_t*, mobj_t*), ported from the abandoned project_birthday because GOD the code looks awful with those huge monolith conditions in it. Available to Lua. (Also, minor fixes to lib_pSpawnLockOn, and removing the SH_OP fuckery.)
2019-06-19 11:09:02 +00:00
if (thing->z - thing->scale <= tmthing->z + tmthing->height
&& thing->z + thing->height + thing->scale >= tmthing->z)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
P_PlayerCanDamage(player_t*, mobj_t*), ported from the abandoned project_birthday because GOD the code looks awful with those huge monolith conditions in it. Available to Lua. (Also, minor fixes to lib_pSpawnLockOn, and removing the SH_OP fuckery.)
2019-06-19 11:09:02 +00:00
player_t *player = tmthing->player;
// 0 = none, 1 = elemental pierce, 2 = bubble bounce
UINT8 elementalpierce = (((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL || (player->powers[pw_shield] & SH_NOSTACK) == SH_BUBBLEWRAP) && (player->pflags & PF_SHIELDABILITY)
? (((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL) ? 1 : 2)
: 0);
SINT8 flipval = P_MobjFlip(thing); // Save this value in case monitor gets removed.
fixed_t *momz = &tmthing->momz; // tmthing gets changed by P_DamageMobj, so we need a new pointer?! X_x;;
fixed_t *z = &tmthing->z; // aau.
// Going down? Then bounce back up.
if (P_DamageMobj(thing, tmthing, tmthing, 1, 0) // break the monitor
&& (flipval*(*momz) < 0) // monitor is on the floor and you're going down, or on the ceiling and you're going up
&& (elementalpierce != 1)) // you're not piercing through the monitor...
Bubblewrap shield now bounces on enemies and monitors instead of piercing through them.
2016-10-24 12:33:10 +00:00
{
P_PlayerCanDamage(player_t*, mobj_t*), ported from the abandoned project_birthday because GOD the code looks awful with those huge monolith conditions in it. Available to Lua. (Also, minor fixes to lib_pSpawnLockOn, and removing the SH_OP fuckery.)
2019-06-19 11:09:02 +00:00
if (elementalpierce == 2)
P_DoBubbleBounce(player);
else if (!(player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2))
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
{
P_PlayerCanDamage(player_t*, mobj_t*), ported from the abandoned project_birthday because GOD the code looks awful with those huge monolith conditions in it. Available to Lua. (Also, minor fixes to lib_pSpawnLockOn, and removing the SH_OP fuckery.)
2019-06-19 11:09:02 +00:00
*momz = -*momz; // Therefore, you should be thrust in the opposite direction, vertically.
Now it's CA_TWINSPIN's turn to get the improvements! * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.
2019-06-26 22:26:05 +00:00
if (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY)
P_TwinSpinRejuvenate(player, player->thokitem);
}
* CA_BOUNCE users now play animation/sound when bouncing on enemies, monitors. * CA_BOUNCE users harmlessly bounce off Sharps.
2016-12-24 00:11:54 +00:00
}
P_PlayerCanDamage(player_t*, mobj_t*), ported from the abandoned project_birthday because GOD the code looks awful with those huge monolith conditions in it. Available to Lua. (Also, minor fixes to lib_pSpawnLockOn, and removing the SH_OP fuckery.)
2019-06-19 11:09:02 +00:00
if (!(elementalpierce == 1 && thing->flags & MF_GRENADEBOUNCE)) // prevent gold monitor clipthrough.
{
if (player->pflags & PF_BOUNCING)
P_DoAbilityBounce(player, false);
return false;
}
else
*z -= *momz; // to ensure proper collision.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
P_PlayerCanDamage(player_t*, mobj_t*), ported from the abandoned project_birthday because GOD the code looks awful with those huge monolith conditions in it. Available to Lua. (Also, minor fixes to lib_pSpawnLockOn, and removing the SH_OP fuckery.)
2019-06-19 11:09:02 +00:00
return true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
-Fix player being able to push up spikes -Minor tweaks to make paper collision slightly more reliable
2019-11-25 21:35:40 +00:00
if ((tmthing->flags & MF_SPRING || tmthing->type == MT_STEAM || tmthing->type == MT_SPIKE || tmthing->type == MT_WALLSPIKE) && (thing->player))
; // springs, gas jets and springs should never be able to step up onto a player
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// z checking at last
// Treat noclip things as non-solid!
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
else if ((thing->flags & (MF_SOLID|MF_NOCLIP)) == MF_SOLID
&& (tmthing->flags & (MF_SOLID|MF_NOCLIP)) == MF_SOLID)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
fixed_t topz, tmtopz;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (tmthing->eflags & MFE_VERTICALFLIP)
{
// pass under
tmtopz = tmthing->z;
if (tmtopz > thing->z + thing->height)
{
if (thing->z + thing->height > tmfloorz)
{
tmfloorz = thing->z + thing->height;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmfloorrover = NULL;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
tmfloorslope = NULL;
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return true;
}
Helpful explanatory comments to assauge MI's fears.
2016-09-22 20:15:12 +00:00
topz = thing->z - thing->scale; // FixedMul(FRACUNIT, thing->scale), but thing->scale == FRACUNIT in base scale anyways
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// block only when jumping not high enough,
// (dont climb max. 24units while already in air)
Fixed the thing where if you thok into a solid object you spin really fast in the air without moving OR losing your momentum.
2016-09-22 10:15:08 +00:00
// since return false doesn't handle momentum properly,
// we lie to P_TryMove() so it's always too high
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 19:03:18 +00:00
if (tmthing->player && tmthing->z + tmthing->height > topz
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& tmthing->z + tmthing->height < tmthing->ceilingz)
Fixed the thing where if you thok into a solid object you spin really fast in the air without moving OR losing your momentum.
2016-09-22 10:15:08 +00:00
{
Kill MF2_STANDONME (mechanically; still occupies the slot... will change that next time I have to handle the DEHACKED lists.)
2018-05-02 19:35:20 +00:00
if (thing->flags & MF_GRENADEBOUNCE && (thing->flags & MF_MONITOR || thing->info->flags & MF_MONITOR)) // Gold monitor hack...
Fixed gold monitor collision (which relied upon the shitty old collision blocking in order to not destroy your momentum) to work with my slopes_n_objects fixes from public next.
2016-10-30 14:09:51 +00:00
return false;
Fixed a stupid bug involving jumping at spikes on FOFs in reverse gravity caused by my own incompetence/assumptions.
2017-01-16 17:52:06 +00:00
tmfloorz = tmceilingz = topz; // block while in air
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmceilingrover = NULL;
Fixed the thing where if you thok into a solid object you spin really fast in the air without moving OR losing your momentum.
2016-09-22 10:15:08 +00:00
#ifdef ESLOPE
tmceilingslope = NULL;
#endif
tmfloorthing = thing; // needed for side collision
}
Solid objects are now no longer selectively intangible on slopes. HOWEVER, since these changes to PIT_CheckThing do raise questions about whether there may be unintended side effects here. As a result, I may remake this for internal only if necessary.
2016-09-21 23:13:34 +00:00
else if (topz < tmceilingz && tmthing->z <= thing->z+thing->height)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
tmceilingz = topz;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmceilingrover = NULL;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
tmceilingslope = NULL;
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tmfloorthing = thing; // thing we may stand on
}
}
else
{
// pass under
tmtopz = tmthing->z + tmthing->height;
if (tmtopz < thing->z)
{
if (thing->z < tmceilingz)
{
tmceilingz = thing->z;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmceilingrover = NULL;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
tmceilingslope = NULL;
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return true;
}
Helpful explanatory comments to assauge MI's fears.
2016-09-22 20:15:12 +00:00
topz = thing->z + thing->height + thing->scale; // FixedMul(FRACUNIT, thing->scale), but thing->scale == FRACUNIT in base scale anyways
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// block only when jumping not high enough,
// (dont climb max. 24units while already in air)
Fixed the thing where if you thok into a solid object you spin really fast in the air without moving OR losing your momentum.
2016-09-22 10:15:08 +00:00
// since return false doesn't handle momentum properly,
// we lie to P_TryMove() so it's always too high
* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)
2018-05-02 19:03:18 +00:00
if (tmthing->player && tmthing->z < topz
Fixed the thing where if you thok into a solid object you spin really fast in the air without moving OR losing your momentum.
2016-09-22 10:15:08 +00:00
&& tmthing->z > tmthing->floorz)
{
Kill MF2_STANDONME (mechanically; still occupies the slot... will change that next time I have to handle the DEHACKED lists.)
2018-05-02 19:35:20 +00:00
if (thing->flags & MF_GRENADEBOUNCE && (thing->flags & MF_MONITOR || thing->info->flags & MF_MONITOR)) // Gold monitor hack...
Fixed gold monitor collision (which relied upon the shitty old collision blocking in order to not destroy your momentum) to work with my slopes_n_objects fixes from public next.
2016-10-30 14:09:51 +00:00
return false;
Fixed a stupid bug involving jumping at spikes on FOFs in reverse gravity caused by my own incompetence/assumptions.
2017-01-16 17:52:06 +00:00
tmfloorz = tmceilingz = topz; // block while in air
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmfloorrover = NULL;
Fixed the thing where if you thok into a solid object you spin really fast in the air without moving OR losing your momentum.
2016-09-22 10:15:08 +00:00
#ifdef ESLOPE
tmfloorslope = NULL;
#endif
tmfloorthing = thing; // needed for side collision
}
Solid objects are now no longer selectively intangible on slopes. HOWEVER, since these changes to PIT_CheckThing do raise questions about whether there may be unintended side effects here. As a result, I may remake this for internal only if necessary.
2016-09-21 23:13:34 +00:00
else if (topz > tmfloorz && tmthing->z+tmthing->height >= thing->z)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
tmfloorz = topz;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmfloorrover = NULL;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
tmfloorslope = NULL;
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tmfloorthing = thing; // thing we may stand on
}
}
}
// not solid not blocked
return true;
}
// PIT_CheckCameraLine
// Adjusts tmfloorz and tmceilingz as lines are contacted - FOR CAMERA ONLY
static boolean PIT_CheckCameraLine(line_t *ld)
{
if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID))
return true;
if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
|| tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
{
return true;
}
if (P_BoxOnLineSide(tmbbox, ld) != -1)
return true;
// A line has been hit
// The moving thing's destination position will cross
// the given line.
// If this should not be allowed, return false.
// If the line is special, keep track of it
// to process later if the move is proven ok.
// NOTE: specials are NOT sorted by order,
// so two special lines that are only 8 pixels apart
// could be crossed in either order.
// this line is out of the if so upper and lower textures can be hit by a splat
blockingline = ld;
if (!ld->backsector) // one sided line
{
if (P_PointOnLineSide(mapcampointer->x, mapcampointer->y, ld))
return true; // don't hit the back side
return false;
}
// set openrange, opentop, openbottom
P_CameraLineOpening(ld);
// adjust floor / ceiling heights
if (opentop < tmceilingz)
{
tmceilingz = opentop;
ceilingline = ld;
}
if (openbottom > tmfloorz)
{
tmfloorz = openbottom;
}
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (highceiling > tmdrpoffceilz)
tmdrpoffceilz = highceiling;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (lowfloor < tmdropoffz)
tmdropoffz = lowfloor;
return true;
}
//
// PIT_CheckLine
// Adjusts tmfloorz and tmceilingz as lines are contacted
//
static boolean PIT_CheckLine(line_t *ld)
{
if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID))
return true;
if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
|| tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
return true;
if (P_BoxOnLineSide(tmbbox, ld) != -1)
return true;
As requested by Nev3r and VAda, seperating MF_PAPER into FF_PAPERSPRITE and MF_PAPERCOLLISION.
2016-08-20 14:15:48 +00:00
if (tmthing->flags & MF_PAPERCOLLISION) // Caution! Turning whilst up against a wall will get you stuck. You probably shouldn't give the player this flag.
Added linedef collision and fixed the following clipping bug, shown in gfy form. http://gfycat.com/BiodegradableNaturalHadrosaurus
2016-08-18 19:55:24 +00:00
{
An experimental attempt at collision correction, put behind a #define because it's buggy as SHIT.
2016-08-18 21:20:42 +00:00
fixed_t cosradius, sinradius;
cosradius = FixedMul(tmthing->radius, FINECOSINE(tmthing->angle>>ANGLETOFINESHIFT));
sinradius = FixedMul(tmthing->radius, FINESINE(tmthing->angle>>ANGLETOFINESHIFT));
Added linedef collision and fixed the following clipping bug, shown in gfy form. http://gfycat.com/BiodegradableNaturalHadrosaurus
2016-08-18 19:55:24 +00:00
if (P_PointOnLineSide(tmx - cosradius, tmy - sinradius, ld)
== P_PointOnLineSide(tmx + cosradius, tmy + sinradius, ld))
return true; // the line doesn't cross between collider's start or end
An experimental attempt at collision correction, put behind a #define because it's buggy as SHIT.
2016-08-18 21:20:42 +00:00
#ifdef PAPER_COLLISIONCORRECTION
{
fixed_t dist;
vertex_t result;
angle_t langle;
P_ClosestPointOnLine(tmx, tmy, ld, &result);
langle = R_PointToAngle2(ld->v1->x, ld->v1->y, ld->v2->x, ld->v2->y);
langle += ANGLE_90*(P_PointOnLineSide(tmx, tmy, ld) ? -1 : 1);
dist = abs(FixedMul(tmthing->radius, FINECOSINE((tmthing->angle - langle)>>ANGLETOFINESHIFT)));
cosradius = FixedMul(dist, FINECOSINE(langle>>ANGLETOFINESHIFT));
sinradius = FixedMul(dist, FINESINE(langle>>ANGLETOFINESHIFT));
tmthing->flags |= MF_NOCLIP;
P_TeleportMove(tmthing, result.x + cosradius - tmthing->momx, result.y + sinradius - tmthing->momy, tmthing->z);
tmthing->flags &= ~MF_NOCLIP;
}
#endif
Added linedef collision and fixed the following clipping bug, shown in gfy form. http://gfycat.com/BiodegradableNaturalHadrosaurus
2016-08-18 19:55:24 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// A line has been hit
// The moving thing's destination position will cross
// the given line.
// If this should not be allowed, return false.
// If the line is special, keep track of it
// to process later if the move is proven ok.
// NOTE: specials are NOT sorted by order,
// so two special lines that are only 8 pixels apart
// could be crossed in either order.
// this line is out of the if so upper and lower textures can be hit by a splat
blockingline = ld;
if (!ld->backsector) // one sided line
{
if (P_PointOnLineSide(tmthing->x, tmthing->y, ld))
return true; // don't hit the back side
return false;
}
// missiles can cross uncrossable lines
if (!(tmthing->flags & MF_MISSILE))
{
if (ld->flags & ML_IMPASSIBLE) // block objects from moving through this linedef.
return false;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if ((tmthing->flags & (MF_ENEMY|MF_BOSS)) && ld->flags & ML_BLOCKMONSTERS)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false; // block monsters only
}
// set openrange, opentop, openbottom
P_LineOpening now takes a mobj_t argument, instead of relying on tmthing . tmthing can be NULL if called from PTR_SlideTraverse, so we should use slidemo instead This fixes a crash that occurs in yet ANOTHER SUGOI map, involving bouncy walls next to sloped floors/ceilings
2016-08-13 20:41:18 +00:00
P_LineOpening(ld, tmthing);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// adjust floor / ceiling heights
if (opentop < tmceilingz)
{
tmceilingz = opentop;
ceilingline = ld;
Whoops, forgot this part
2019-08-01 19:17:15 +00:00
tmceilingrover = openceilingrover;
fixed all compiling errors relating to ESLOPE being undefined
2016-04-06 21:19:39 +00:00
#ifdef ESLOPE
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
tmceilingslope = opentopslope;
fixed all compiling errors relating to ESLOPE being undefined
2016-04-06 21:19:39 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (openbottom > tmfloorz)
{
tmfloorz = openbottom;
Whoops, forgot this part
2019-08-01 19:17:15 +00:00
tmfloorrover = openfloorrover;
fixed all compiling errors relating to ESLOPE being undefined
2016-04-06 21:19:39 +00:00
#ifdef ESLOPE
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
tmfloorslope = openbottomslope;
fixed all compiling errors relating to ESLOPE being undefined
2016-04-06 21:19:39 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (highceiling > tmdrpoffceilz)
tmdrpoffceilz = highceiling;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (lowfloor < tmdropoffz)
tmdropoffz = lowfloor;
return true;
}
// =========================================================================
// MOVEMENT CLIPPING
// =========================================================================
//
// P_CheckPosition
// This is purely informative, nothing is modified
// (except things picked up).
//
// in:
// a mobj_t (can be valid or invalid)
// a position to be checked
// (doesn't need to be related to the mobj_t->x,y)
//
// during:
// special things are touched if MF_PICKUP
// early out on solid lines?
//
// out:
// newsubsec
// tmfloorz
// tmceilingz
// tmdropoffz
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
// tmdrpoffceilz
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// the lowest point contacted
// (monsters won't move to a dropoff)
// speciallines[]
// numspeciallines
//
// tmfloorz
// the nearest floor or thing's top under tmthing
// tmceilingz
// the nearest ceiling or thing's bottom over tmthing
//
boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
{
INT32 xl, xh, yl, yh, bx, by;
subsector_t *newsubsec;
boolean blockval = true;
I_Assert(thing != NULL);
#ifdef PARANOIA
if (P_MobjWasRemoved(thing))
I_Error("Previously-removed Thing of type %u crashes P_CheckPosition!", thing->type);
#endif
P_SetTarget(&tmthing, thing);
tmflags = thing->flags;
tmx = x;
tmy = y;
tmbbox[BOXTOP] = y + tmthing->radius;
tmbbox[BOXBOTTOM] = y - tmthing->radius;
tmbbox[BOXRIGHT] = x + tmthing->radius;
tmbbox[BOXLEFT] = x - tmthing->radius;
newsubsec = R_PointInSubsector(x, y);
ceilingline = blockingline = NULL;
// The base floor / ceiling is from the subsector
// that contains the point.
// Any contacted lines the step closer together
// will adjust them.
Slope collision fixes
2015-04-29 05:29:51 +00:00
tmfloorz = tmdropoffz = P_GetFloorZ(thing, newsubsec->sector, x, y, NULL); //newsubsec->sector->floorheight;
tmceilingz = P_GetCeilingZ(thing, newsubsec->sector, x, y, NULL); //newsubsec->sector->ceilingheight;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmfloorrover = NULL;
tmceilingrover = NULL;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
tmfloorslope = newsubsec->sector->f_slope;
tmceilingslope = newsubsec->sector->c_slope;
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Check list of fake floors and see if tmfloorz/tmceilingz need to be altered.
if (newsubsec->sector->ffloors)
{
ffloor_t *rover;
fixed_t delta1, delta2;
INT32 thingtop = thing->z + thing->height;
for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
{
We can compile the slopes code now, yay! My brain hurts. Compiling errors fixed in this commit: * Various cases of mixed declaration and statement code * Implicit declaration of slope functions (read: you forgot to put "include "p_slopes.h" in MORE than a few places) * an odd case of a bad fixed_t to float typecase, cause by using P_GetZAt directly inside FIXED_TO_FLOAT * a few minor cases of bad unsigned-signed comparisons * no prototypes for some of the new slope functions. For goodness sake Red, this is basic stuff!
2015-10-10 16:57:35 +00:00
fixed_t topheight, bottomheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!(rover->flags & FF_EXISTS))
continue;
We can compile the slopes code now, yay! My brain hurts. Compiling errors fixed in this commit: * Various cases of mixed declaration and statement code * Implicit declaration of slope functions (read: you forgot to put "include "p_slopes.h" in MORE than a few places) * an odd case of a bad fixed_t to float typecase, cause by using P_GetZAt directly inside FIXED_TO_FLOAT * a few minor cases of bad unsigned-signed comparisons * no prototypes for some of the new slope functions. For goodness sake Red, this is basic stuff!
2015-10-10 16:57:35 +00:00
topheight = P_GetFOFTopZ(thing, newsubsec->sector, rover, x, y, NULL);
bottomheight = P_GetFOFBottomZ(thing, newsubsec->sector, rover, x, y, NULL);
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
BONUS UNRELATED FIX: Fix FF_SHATTERBOTTOM FOFs acting like THZ goop when stood on
2016-09-02 21:53:55 +00:00
if ((rover->flags & (FF_SWIMMABLE|FF_GOOWATER)) == (FF_SWIMMABLE|FF_GOOWATER) && !(thing->flags & MF_NOGRAVITY))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// If you're inside goowater and slowing down
fixed_t sinklevel = FixedMul(thing->info->height/6, thing->scale);
Adjusted platform-creating velocity of goo water. Now it will only bounce ONCE when you jump on it, and Knuckles just barely gets enough velocity out of his jump for even that. This will leave players vulnerable and annoyed for a lot less time while they wait to finish bouncing.
2015-04-04 22:38:20 +00:00
fixed_t minspeed = FixedMul(thing->info->height/9, thing->scale);
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (thing->z < topheight && bottomheight < thingtop
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& abs(thing->momz) < minspeed)
{
// Oh no! The object is stick in between the surface of the goo and sinklevel! help them out!
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (!(thing->eflags & MFE_VERTICALFLIP) && thing->z > topheight - sinklevel
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& thing->momz >= 0 && thing->momz < (minspeed>>2))
thing->momz += minspeed>>2;
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
else if (thing->eflags & MFE_VERTICALFLIP && thingtop < bottomheight + sinklevel
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& thing->momz <= 0 && thing->momz > -(minspeed>>2))
thing->momz -= minspeed>>2;
// Land on the top or the bottom, depending on gravity flip.
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (!(thing->eflags & MFE_VERTICALFLIP) && thing->z >= topheight - sinklevel && thing->momz <= 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
if (tmfloorz < topheight - sinklevel) {
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
tmfloorz = topheight - sinklevel;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmfloorrover = rover;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
Collision with FOF slopes (might be unfinished, idk)
2015-05-17 16:53:28 +00:00
tmfloorslope = *rover->t_slope;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#endif
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
else if (thing->eflags & MFE_VERTICALFLIP && thingtop <= bottomheight + sinklevel && thing->momz >= 0)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
if (tmceilingz > bottomheight + sinklevel) {
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
tmceilingz = bottomheight + sinklevel;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmceilingrover = rover;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
Collision with FOF slopes (might be unfinished, idk)
2015-05-17 16:53:28 +00:00
tmceilingslope = *rover->b_slope;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#endif
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
continue;
}
Lava is now either completely solid or completely intangible. No more half-assing
2019-10-01 19:58:18 +00:00
if (thing->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(thing->player, rover)))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
;
else if (thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE))
;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
else if (!((rover->flags & FF_BLOCKPLAYER && thing->player)
* CA_BOUNCE can now break downwards.
2016-12-23 23:58:12 +00:00
|| (rover->flags & FF_BLOCKOTHERS && !thing->player)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
|| rover->flags & FF_QUICKSAND))
continue;
if (rover->flags & FF_QUICKSAND)
{
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (thing->z < topheight && bottomheight < thingtop)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
if (tmfloorz < thing->z) {
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tmfloorz = thing->z;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmfloorrover = rover;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
tmfloorslope = NULL;
#endif
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Quicksand blocks never change heights otherwise.
continue;
}
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
delta1 = thing->z - (bottomheight
+ ((topheight - bottomheight)/2));
delta2 = thingtop - (bottomheight
+ ((topheight - bottomheight)/2));
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (topheight > tmfloorz && abs(delta1) < abs(delta2)
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
&& !(rover->flags & FF_REVERSEPLATFORM))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
tmfloorz = tmdropoffz = topheight;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmfloorrover = rover;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
Collision with FOF slopes (might be unfinished, idk)
2015-05-17 16:53:28 +00:00
tmfloorslope = *rover->t_slope;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (bottomheight < tmceilingz && abs(delta1) >= abs(delta2)
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
&& !(rover->flags & FF_PLATFORM)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE)))
{
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
tmceilingz = tmdrpoffceilz = bottomheight;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmceilingrover = rover;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
Collision with FOF slopes (might be unfinished, idk)
2015-05-17 16:53:28 +00:00
tmceilingslope = *rover->b_slope;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
}
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
// The bounding box is extended by MAXRADIUS
// because mobj_ts are grouped into mapblocks
// based on their origin point, and can overlap
// into adjacent blocks by up to MAXRADIUS units.
Revert "Guess what major breaking-news bug I just fixed B)" This reverts commit 9e306394ddff993a5e5bb32bf9b3835203eea1ce. Sorry MI, but this completely breaks large maps like AGZ.
2015-04-09 01:50:49 +00:00
xl = (unsigned)(tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
xh = (unsigned)(tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
yl = (unsigned)(tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
yh = (unsigned)(tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
Fix the west/south blockmap issue without fucking up huge maps
2015-04-09 02:32:07 +00:00
BMBOUNDFIX(xl, xh, yl, yh);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifdef POLYOBJECTS
// Check polyobjects and see if tmfloorz/tmceilingz need to be altered
{
validcount++;
for (by = yl; by <= yh; by++)
for (bx = xl; bx <= xh; bx++)
{
INT32 offset;
polymaplink_t *plink; // haleyjd 02/22/06
if (bx < 0 || by < 0 || bx >= bmapwidth || by >= bmapheight)
continue;
offset = by*bmapwidth + bx;
// haleyjd 02/22/06: consider polyobject lines
plink = polyblocklinks[offset];
while (plink)
{
polyobj_t *po = plink->po;
if (po->validcount != validcount) // if polyobj hasn't been checked
{
sector_t *polysec;
fixed_t delta1, delta2, thingtop;
fixed_t polytop, polybottom;
po->validcount = validcount;
if (!P_BBoxInsidePolyobj(po, tmbbox)
|| !(po->flags & POF_SOLID))
{
plink = (polymaplink_t *)(plink->link.next);
continue;
}
// We're inside it! Yess...
polysec = po->lines[0]->backsector;
if (po->flags & POF_CLIPPLANES)
{
polytop = polysec->ceilingheight;
polybottom = polysec->floorheight;
}
else
{
polytop = INT32_MAX;
polybottom = INT32_MIN;
}
thingtop = thing->z + thing->height;
delta1 = thing->z - (polybottom + ((polytop - polybottom)/2));
delta2 = thingtop - (polybottom + ((polytop - polybottom)/2));
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
if (polytop > tmfloorz && abs(delta1) < abs(delta2)) {
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tmfloorz = tmdropoffz = polytop;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
tmfloorslope = NULL;
#endif
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
2019-08-02 15:51:44 +00:00
tmfloorrover = NULL;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
if (polybottom < tmceilingz && abs(delta1) >= abs(delta2)) {
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
tmceilingz = tmdrpoffceilz = polybottom;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
tmceilingslope = NULL;
#endif
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
2019-08-02 15:51:44 +00:00
tmceilingrover = NULL;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
plink = (polymaplink_t *)(plink->link.next);
}
}
}
#endif
// tmfloorthing is set when tmfloorz comes from a thing's top
tmfloorthing = NULL;
tmhitthing = NULL;
validcount++;
if (tmflags & MF_NOCLIP)
return true;
// Check things first, possibly picking things up.
// MF_NOCLIPTHING: used by camera to not be blocked by things
if (!(thing->flags & MF_NOCLIPTHING))
{
for (bx = xl; bx <= xh; bx++)
for (by = yl; by <= yh; by++)
{
if (!P_BlockThingsIterator(bx, by, PIT_CheckThing))
blockval = false;
if (P_MobjWasRemoved(tmthing))
return false;
}
}
validcount++;
// check lines
for (bx = xl; bx <= xh; bx++)
for (by = yl; by <= yh; by++)
if (!P_BlockLinesIterator(bx, by, PIT_CheckLine))
blockval = false;
return blockval;
}
static const fixed_t hoopblockdist = 16*FRACUNIT + 8*FRACUNIT;
static const fixed_t hoophalfheight = (56*FRACUNIT)/2;
// P_CheckPosition optimized for the MT_HOOPCOLLIDE object. This needs to be as fast as possible!
void P_CheckHoopPosition(mobj_t *hoopthing, fixed_t x, fixed_t y, fixed_t z, fixed_t radius)
{
INT32 i;
(void)radius; //unused
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i] || !players[i].mo || players[i].spectator)
continue;
if (abs(players[i].mo->x - x) >= hoopblockdist ||
abs(players[i].mo->y - y) >= hoopblockdist ||
abs((players[i].mo->z+hoophalfheight) - z) >= hoopblockdist)
continue; // didn't hit it
// can remove thing
P_TouchSpecialThing(hoopthing, players[i].mo, false);
break;
}
return;
}
//
// P_CheckCameraPosition
//
boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
{
INT32 xl, xh, yl, yh, bx, by;
subsector_t *newsubsec;
tmx = x;
tmy = y;
tmbbox[BOXTOP] = y + thiscam->radius;
tmbbox[BOXBOTTOM] = y - thiscam->radius;
tmbbox[BOXRIGHT] = x + thiscam->radius;
tmbbox[BOXLEFT] = x - thiscam->radius;
newsubsec = R_PointInSubsector(x, y);
ceilingline = blockingline = NULL;
mapcampointer = thiscam;
if (GETSECSPECIAL(newsubsec->sector->special, 4) == 12)
{ // Camera noclip on entire sector.
tmfloorz = tmdropoffz = thiscam->z;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
tmceilingz = tmdrpoffceilz = thiscam->z + thiscam->height;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
// The base floor / ceiling is from the subsector
// that contains the point.
// Any contacted lines the step closer together
// will adjust them.
Make cameras properly collide with slopes
2015-05-21 14:36:20 +00:00
tmfloorz = tmdropoffz = P_CameraGetFloorZ(thiscam, newsubsec->sector, x, y, NULL);
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
Make cameras properly collide with slopes
2015-05-21 14:36:20 +00:00
tmceilingz = P_CameraGetCeilingZ(thiscam, newsubsec->sector, x, y, NULL);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Cameras use the heightsec's heights rather then the actual sector heights.
// If you can see through it, why not move the camera through it too?
if (newsubsec->sector->heightsec >= 0)
{
tmfloorz = tmdropoffz = sectors[newsubsec->sector->heightsec].floorheight;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
tmceilingz = tmdrpoffceilz = sectors[newsubsec->sector->heightsec].ceilingheight;
}
// Use preset camera clipping heights if set with Sector Special Parameters whose control sector has Camera Intangible special -Red
if (newsubsec->sector->camsec >= 0)
{
tmfloorz = tmdropoffz = sectors[newsubsec->sector->camsec].floorheight;
tmceilingz = tmdrpoffceilz = sectors[newsubsec->sector->camsec].ceilingheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Check list of fake floors and see if tmfloorz/tmceilingz need to be altered.
if (newsubsec->sector->ffloors)
{
ffloor_t *rover;
fixed_t delta1, delta2;
INT32 thingtop = thiscam->z + thiscam->height;
for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
{
We can compile the slopes code now, yay! My brain hurts. Compiling errors fixed in this commit: * Various cases of mixed declaration and statement code * Implicit declaration of slope functions (read: you forgot to put "include "p_slopes.h" in MORE than a few places) * an odd case of a bad fixed_t to float typecase, cause by using P_GetZAt directly inside FIXED_TO_FLOAT * a few minor cases of bad unsigned-signed comparisons * no prototypes for some of the new slope functions. For goodness sake Red, this is basic stuff!
2015-10-10 16:57:35 +00:00
fixed_t topheight, bottomheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)
continue;
We can compile the slopes code now, yay! My brain hurts. Compiling errors fixed in this commit: * Various cases of mixed declaration and statement code * Implicit declaration of slope functions (read: you forgot to put "include "p_slopes.h" in MORE than a few places) * an odd case of a bad fixed_t to float typecase, cause by using P_GetZAt directly inside FIXED_TO_FLOAT * a few minor cases of bad unsigned-signed comparisons * no prototypes for some of the new slope functions. For goodness sake Red, this is basic stuff!
2015-10-10 16:57:35 +00:00
topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, x, y, NULL);
bottomheight = P_CameraGetFOFBottomZ(thiscam, newsubsec->sector, rover, x, y, NULL);
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
delta1 = thiscam->z - (bottomheight
+ ((topheight - bottomheight)/2));
delta2 = thingtop - (bottomheight
+ ((topheight - bottomheight)/2));
if (topheight > tmfloorz && abs(delta1) < abs(delta2))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
tmfloorz = tmdropoffz = topheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (bottomheight < tmceilingz && abs(delta1) >= abs(delta2))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
tmceilingz = tmdrpoffceilz = bottomheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
}
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
// The bounding box is extended by MAXRADIUS
// because mobj_ts are grouped into mapblocks
// based on their origin point, and can overlap
// into adjacent blocks by up to MAXRADIUS units.
Revert "Guess what major breaking-news bug I just fixed B)" This reverts commit 9e306394ddff993a5e5bb32bf9b3835203eea1ce. Sorry MI, but this completely breaks large maps like AGZ.
2015-04-09 01:50:49 +00:00
xl = (unsigned)(tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
xh = (unsigned)(tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
yl = (unsigned)(tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
yh = (unsigned)(tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
SRB2 2.1.12 release
2014-11-12 00:55:07 +00:00
Fix the west/south blockmap issue without fucking up huge maps
2015-04-09 02:32:07 +00:00
BMBOUNDFIX(xl, xh, yl, yh);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
#ifdef POLYOBJECTS
// Check polyobjects and see if tmfloorz/tmceilingz need to be altered
{
validcount++;
for (by = yl; by <= yh; by++)
for (bx = xl; bx <= xh; bx++)
{
INT32 offset;
polymaplink_t *plink; // haleyjd 02/22/06
if (bx < 0 || by < 0 || bx >= bmapwidth || by >= bmapheight)
continue;
offset = by*bmapwidth + bx;
// haleyjd 02/22/06: consider polyobject lines
plink = polyblocklinks[offset];
while (plink)
{
polyobj_t *po = plink->po;
if (po->validcount != validcount) // if polyobj hasn't been checked
{
sector_t *polysec;
fixed_t delta1, delta2, thingtop;
fixed_t polytop, polybottom;
po->validcount = validcount;
Fix camera going nuts around intangible polyobjects
2016-03-10 20:50:54 +00:00
if (!P_PointInsidePolyobj(po, x, y) || !(po->flags & POF_SOLID))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
plink = (polymaplink_t *)(plink->link.next);
continue;
}
// We're inside it! Yess...
polysec = po->lines[0]->backsector;
if (GETSECSPECIAL(polysec->special, 4) == 12)
{ // Camera noclip polyobj.
plink = (polymaplink_t *)(plink->link.next);
continue;
}
if (po->flags & POF_CLIPPLANES)
{
polytop = polysec->ceilingheight;
polybottom = polysec->floorheight;
}
else
{
polytop = INT32_MAX;
polybottom = INT32_MIN;
}
thingtop = thiscam->z + thiscam->height;
delta1 = thiscam->z - (polybottom + ((polytop - polybottom)/2));
delta2 = thingtop - (polybottom + ((polytop - polybottom)/2));
if (polytop > tmfloorz && abs(delta1) < abs(delta2))
tmfloorz = tmdropoffz = polytop;
if (polybottom < tmceilingz && abs(delta1) >= abs(delta2))
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
tmceilingz = tmdrpoffceilz = polybottom;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
plink = (polymaplink_t *)(plink->link.next);
}
}
}
#endif
// check lines
for (bx = xl; bx <= xh; bx++)
for (by = yl; by <= yh; by++)
if (!P_BlockLinesIterator(bx, by, PIT_CheckCameraLine))
return false;
return true;
}
// The highest the camera will "step up" onto another floor.
#define MAXCAMERASTEPMOVE MAXSTEPMOVE
//
// P_TryCameraMove
//
// Attempt to move the camera to a new position
//
// Return true if the move succeeded and no sliding should be done.
//
boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
{
subsector_t *s = R_PointInSubsector(x, y);
boolean retval = true;
boolean itsatwodlevel = false;
floatok = false;
if (twodlevel
|| (thiscam == &camera && players[displayplayer].mo && (players[displayplayer].mo->flags2 & MF2_TWOD))
|| (thiscam == &camera2 && players[secondarydisplayplayer].mo && (players[secondarydisplayplayer].mo->flags2 & MF2_TWOD)))
itsatwodlevel = true;
if (!itsatwodlevel && players[displayplayer].mo)
{
fixed_t tryx = thiscam->x;
fixed_t tryy = thiscam->y;
if ((thiscam == &camera && (players[displayplayer].pflags & PF_NOCLIP))
|| (thiscam == &camera2 && (players[secondarydisplayplayer].pflags & PF_NOCLIP)))
{ // Noclipping player camera noclips too!!
floatok = true;
thiscam->floorz = thiscam->z;
thiscam->ceilingz = thiscam->z + thiscam->height;
thiscam->x = x;
thiscam->y = y;
thiscam->subsector = s;
return true;
}
do {
if (x-tryx > MAXRADIUS)
tryx += MAXRADIUS;
else if (x-tryx < -MAXRADIUS)
tryx -= MAXRADIUS;
else
tryx = x;
if (y-tryy > MAXRADIUS)
tryy += MAXRADIUS;
else if (y-tryy < -MAXRADIUS)
tryy -= MAXRADIUS;
else
tryy = y;
if (!P_CheckCameraPosition(tryx, tryy, thiscam))
return false; // solid wall or thing
if (tmceilingz - tmfloorz < thiscam->height)
return false; // doesn't fit
floatok = true;
if (tmceilingz - thiscam->z < thiscam->height)
{
if (s == thiscam->subsector && tmceilingz >= thiscam->z)
{
floatok = true;
thiscam->floorz = tmfloorz;
thiscam->ceilingz = tmfloorz + thiscam->height;
thiscam->x = x;
thiscam->y = y;
thiscam->subsector = s;
return true;
}
else
return false; // mobj must lower itself to fit
}
if ((tmfloorz - thiscam->z > MAXCAMERASTEPMOVE))
return false; // too big a step up
} while(tryx != x || tryy != y);
}
else
{
Revert/remove unused/broken junk from original slopes port m_vector removal to come later. The little thing commented out in it is so I could revert the weird tables.c change.
2015-05-23 01:57:58 +00:00
tmfloorz = P_CameraGetFloorZ(thiscam, thiscam->subsector->sector, x, y, NULL);
tmceilingz = P_CameraGetCeilingZ(thiscam, thiscam->subsector->sector, x, y, NULL);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// the move is ok,
// so link the thing into its new position
thiscam->floorz = tmfloorz;
thiscam->ceilingz = tmceilingz;
thiscam->x = x;
thiscam->y = y;
thiscam->subsector = s;
return retval;
}
//
// PIT_PushableMoved
//
// Move things standing on top
// of pushable things being pushed.
//
static mobj_t *stand;
static fixed_t standx, standy;
boolean PIT_PushableMoved(mobj_t *thing)
{
fixed_t blockdist;
if (!(thing->flags & MF_SOLID)
|| (thing->flags & MF_NOGRAVITY))
return true; // Don't move something non-solid!
// Only pushables are supported... in 2.0. Now players can be moved too!
if (!(thing->flags & MF_PUSHABLE || thing->player))
return true;
if (thing == stand)
return true;
blockdist = stand->radius + thing->radius;
if (abs(thing->x - stand->x) >= blockdist || abs(thing->y - stand->y) >= blockdist)
return true; // didn't hit it
if ((!(stand->eflags & MFE_VERTICALFLIP) && thing->z != stand->z + stand->height + FixedMul(FRACUNIT, stand->scale))
|| ((stand->eflags & MFE_VERTICALFLIP) && thing->z + thing->height != stand->z - FixedMul(FRACUNIT, stand->scale)))
return true; // Not standing on top
if (!stand->momx && !stand->momy)
return true;
// Move this guy!
if (thing->player)
{
// Monster Iestyn - 29/11/13
// Ridiculous amount of newly declared stuff so players can't get stuck in walls AND so gargoyles don't break themselves at the same time either
// These are all non-static map variables that are changed for each and every single mobj
// See, changing player's momx/y would possibly trigger stuff as if the player were running somehow, so this must be done to keep the player standing
// All this so players can ride gargoyles!
boolean oldfltok = floatok;
fixed_t oldflrz = tmfloorz;
fixed_t oldceilz = tmceilingz;
mobj_t *oldflrthing = tmfloorthing;
mobj_t *oldthing = tmthing;
line_t *oldceilline = ceilingline;
line_t *oldblockline = blockingline;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
ffloor_t *oldflrrover = tmfloorrover;
ffloor_t *oldceilrover = tmceilingrover;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
pslope_t *oldfslope = tmfloorslope;
pslope_t *oldcslope = tmceilingslope;
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Move the player
P_TryMove(thing, thing->x+stand->momx, thing->y+stand->momy, true);
// Now restore EVERYTHING so the gargoyle doesn't keep the player's tmstuff and break
floatok = oldfltok;
tmfloorz = oldflrz;
tmceilingz = oldceilz;
tmfloorthing = oldflrthing;
P_SetTarget(&tmthing, oldthing);
ceilingline = oldceilline;
blockingline = oldblockline;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
tmfloorrover = oldflrrover;
tmceilingrover = oldceilrover;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
tmfloorslope = oldfslope;
tmceilingslope = oldcslope;
#endif
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
thing->momz = stand->momz;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
{
thing->momx = stand->momx;
thing->momy = stand->momy;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
thing->momz = stand->momz;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return true;
}
//
// P_TryMove
// Attempt to move to a new position.
//
boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
{
fixed_t tryx = thing->x;
fixed_t tryy = thing->y;
fixed_t radius = thing->radius;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
fixed_t thingtop = thing->z + thing->height;
Improvements related to slope collision, and quantize momentum properly for landing
2015-05-13 21:15:32 +00:00
#ifdef ESLOPE
fixed_t startingonground = P_IsObjectOnGround(thing);
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
floatok = false;
if (radius < MAXRADIUS/2)
radius = MAXRADIUS/2;
do {
if (thing->flags & MF_NOCLIP) {
tryx = x;
tryy = y;
} else {
if (x-tryx > radius)
tryx += radius;
else if (x-tryx < -radius)
tryx -= radius;
else
tryx = x;
if (y-tryy > radius)
tryy += radius;
else if (y-tryy < -radius)
tryy -= radius;
else
tryy = y;
}
if (!P_CheckPosition(thing, tryx, tryy))
return false; // solid wall or thing
if (!(thing->flags & MF_NOCLIP))
{
//All things are affected by their scale.
fixed_t maxstep = FixedMul(MAXSTEPMOVE, thing->scale);
if (thing->player)
{
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
// If using type Section1:13, double the maxstep.
if (P_PlayerTouchingSectorSpecial(thing->player, 1, 13)
|| GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 13)
maxstep <<= 1;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Don't 'step up' while springing,
// Only step up "if needed".
Revert the revert because it turns out Rob is a doofus player.dta was in a sort of mishmashed half designed for one SPR2 layout and half the other. This reverts commit cc0fbf1c1b3feec271e1be08b1ca5c343f701e0e.
2016-01-14 14:35:10 +00:00
if (thing->player->panim == PA_SPRING
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& P_MobjFlip(thing)*thing->momz > FixedMul(FRACUNIT, thing->scale))
maxstep = 0;
}
if (thing->type == MT_SKIM)
maxstep = 0;
if (tmceilingz - tmfloorz < thing->height)
{
if (tmfloorthing)
tmhitthing = tmfloorthing;
return false; // doesn't fit
}
floatok = true;
if (thing->eflags & MFE_VERTICALFLIP)
{
if (thing->z < tmfloorz)
return false; // mobj must raise itself to fit
}
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
else if (tmceilingz < thingtop)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false; // mobj must lower itself to fit
// Ramp test
Fixed non-players having fucked slope stepup/down
2016-08-13 22:43:22 +00:00
if (maxstep > 0 && !(
thing->player && (
P_PlayerTouchingSectorSpecial(thing->player, 1, 14)
|| GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 14)
)
)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// If the floor difference is MAXSTEPMOVE or less, and the sector isn't Section1:14, ALWAYS
// step down! Formerly required a Section1:13 sector for the full MAXSTEPMOVE, but no more.
if (thing->eflags & MFE_VERTICALFLIP)
{
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (thingtop == thing->ceilingz && tmceilingz > thingtop && tmceilingz - thingtop <= maxstep)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Slope collision fixes
2015-04-29 05:29:51 +00:00
thing->z = (thing->ceilingz = thingtop = tmceilingz) - thing->height;
Set mobj->floorrover and ceilingrover in appropriate places
2018-09-10 04:35:40 +00:00
thing->ceilingrover = tmceilingrover;
Slope collision fixes
2015-04-29 05:29:51 +00:00
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
Hack to fix DSZ2 left route waterslide: apply Red's step up changes only to slopes that is, I believe slopes are why he added this code anyway *shrugs*
2016-05-02 16:04:28 +00:00
#ifdef ESLOPE
Revert stupid 2.1-compat fuckup I did in slopes code.
2019-10-13 10:55:50 +00:00
else if (tmceilingz < thingtop && thingtop - tmceilingz <= maxstep)
Slope collision fixes
2015-04-29 05:29:51 +00:00
{
thing->z = (thing->ceilingz = thingtop = tmceilingz) - thing->height;
Set mobj->floorrover and ceilingrover in appropriate places
2018-09-10 04:35:40 +00:00
thing->ceilingrover = tmceilingrover;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
Hack to fix DSZ2 left route waterslide: apply Red's step up changes only to slopes that is, I believe slopes are why he added this code anyway *shrugs*
2016-05-02 16:04:28 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else if (thing->z == thing->floorz && tmfloorz < thing->z && thing->z - tmfloorz <= maxstep)
{
Slope collision fixes
2015-04-29 05:29:51 +00:00
thing->z = thing->floorz = tmfloorz;
Set mobj->floorrover and ceilingrover in appropriate places
2018-09-10 04:35:40 +00:00
thing->floorrover = tmfloorrover;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
Hack to fix DSZ2 left route waterslide: apply Red's step up changes only to slopes that is, I believe slopes are why he added this code anyway *shrugs*
2016-05-02 16:04:28 +00:00
#ifdef ESLOPE
Revert stupid 2.1-compat fuckup I did in slopes code.
2019-10-13 10:55:50 +00:00
else if (tmfloorz > thing->z && tmfloorz - thing->z <= maxstep)
Slope collision fixes
2015-04-29 05:29:51 +00:00
{
thing->z = thing->floorz = tmfloorz;
Set mobj->floorrover and ceilingrover in appropriate places
2018-09-10 04:35:40 +00:00
thing->floorrover = tmfloorrover;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
Hack to fix DSZ2 left route waterslide: apply Red's step up changes only to slopes that is, I believe slopes are why he added this code anyway *shrugs*
2016-05-02 16:04:28 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
if (thing->eflags & MFE_VERTICALFLIP)
{
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (thingtop - tmceilingz > maxstep)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (tmfloorthing)
tmhitthing = tmfloorthing;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false; // too big a step up
}
}
else if (tmfloorz - thing->z > maxstep)
{
if (tmfloorthing)
tmhitthing = tmfloorthing;
return false; // too big a step up
}
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (!allowdropoff && !(thing->flags & MF_FLOAT) && thing->type != MT_SKIM && !tmfloorthing)
{
if (thing->eflags & MFE_VERTICALFLIP)
{
if (tmdrpoffceilz - tmceilingz > maxstep)
return false;
}
else if (tmfloorz - tmdropoffz > maxstep)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return false; // don't stand over a dropoff
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
} while (tryx != x || tryy != y);
// The move is ok!
// If it's a pushable object, check if anything is
// standing on top and move it, too.
if (thing->flags & MF_PUSHABLE)
{
INT32 bx, by, xl, xh, yl, yh;
Revert "Guess what major breaking-news bug I just fixed B)" This reverts commit 9e306394ddff993a5e5bb32bf9b3835203eea1ce. Sorry MI, but this completely breaks large maps like AGZ.
2015-04-09 01:50:49 +00:00
yh = (unsigned)(thing->y + MAXRADIUS - bmaporgy)>>MAPBLOCKSHIFT;
yl = (unsigned)(thing->y - MAXRADIUS - bmaporgy)>>MAPBLOCKSHIFT;
xh = (unsigned)(thing->x + MAXRADIUS - bmaporgx)>>MAPBLOCKSHIFT;
xl = (unsigned)(thing->x - MAXRADIUS - bmaporgx)>>MAPBLOCKSHIFT;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix the west/south blockmap issue without fucking up huge maps
2015-04-09 02:32:07 +00:00
BMBOUNDFIX(xl, xh, yl, yh);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
stand = thing;
standx = x;
standy = y;
for (by = yl; by <= yh; by++)
for (bx = xl; bx <= xh; bx++)
P_BlockThingsIterator(bx, by, PIT_PushableMoved);
}
// Link the thing into its new position
P_UnsetThingPosition(thing);
thing->floorz = tmfloorz;
thing->ceilingz = tmceilingz;
Set mobj->floorrover and ceilingrover in appropriate places
2018-09-10 04:35:40 +00:00
thing->floorrover = tmfloorrover;
thing->ceilingrover = tmceilingrover;
Overhaul slope collision (NOT PHYSICS) to work almost perfectly
2015-04-27 18:20:50 +00:00
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#ifdef ESLOPE
Fixed how dying players who were standing on slopes just jump off to the side
2016-02-23 22:53:24 +00:00
if (!(thing->flags & MF_NOCLIPHEIGHT))
{
// Assign thing's standingslope if needed
if (thing->z <= tmfloorz && !(thing->eflags & MFE_VERTICALFLIP)) {
if (!startingonground && tmfloorslope)
P_HandleSlopeLanding(thing, tmfloorslope);
Improvements related to slope collision, and quantize momentum properly for landing
2015-05-13 21:15:32 +00:00
Fixed how dying players who were standing on slopes just jump off to the side
2016-02-23 22:53:24 +00:00
if (thing->momz <= 0)
thing->standingslope = tmfloorslope;
}
else if (thing->z+thing->height >= tmceilingz && (thing->eflags & MFE_VERTICALFLIP)) {
if (!startingonground && tmceilingslope)
P_HandleSlopeLanding(thing, tmceilingslope);
Improvements related to slope collision, and quantize momentum properly for landing
2015-05-13 21:15:32 +00:00
Fixed how dying players who were standing on slopes just jump off to the side
2016-02-23 22:53:24 +00:00
if (thing->momz >= 0)
thing->standingslope = tmceilingslope;
}
Improvements related to slope collision, and quantize momentum properly for landing
2015-05-13 21:15:32 +00:00
}
Fixed how dying players who were standing on slopes just jump off to the side
2016-02-23 22:53:24 +00:00
else // don't set standingslope if you're not going to clip against it
thing->standingslope = NULL;
Store the slope an object is resting on (if applicable)
2015-04-29 05:33:04 +00:00
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
thing->x = x;
thing->y = y;
if (tmfloorthing)
thing->eflags &= ~MFE_ONGROUND; // not on real floor
else
thing->eflags |= MFE_ONGROUND;
P_SetThingPosition(thing);
return true;
}
boolean P_SceneryTryMove(mobj_t *thing, fixed_t x, fixed_t y)
{
fixed_t tryx, tryy;
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
tryx = thing->x;
tryy = thing->y;
do {
if (x-tryx > MAXRADIUS)
tryx += MAXRADIUS;
else if (x-tryx < -MAXRADIUS)
tryx -= MAXRADIUS;
else
tryx = x;
if (y-tryy > MAXRADIUS)
tryy += MAXRADIUS;
else if (y-tryy < -MAXRADIUS)
tryy -= MAXRADIUS;
else
tryy = y;
if (!P_CheckPosition(thing, tryx, tryy))
return false; // solid wall or thing
if (!(thing->flags & MF_NOCLIP))
{
const fixed_t maxstep = MAXSTEPMOVE;
if (tmceilingz - tmfloorz < thing->height)
return false; // doesn't fit
if (tmceilingz - thing->z < thing->height)
return false; // mobj must lower itself to fit
if (tmfloorz - thing->z > maxstep)
return false; // too big a step up
}
} while(tryx != x || tryy != y);
// the move is ok,
// so link the thing into its new position
P_UnsetThingPosition(thing);
thing->floorz = tmfloorz;
thing->ceilingz = tmceilingz;
Set mobj->floorrover and ceilingrover in appropriate places
2018-09-10 04:35:40 +00:00
thing->floorrover = tmfloorrover;
thing->ceilingrover = tmceilingrover;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
thing->x = x;
thing->y = y;
if (tmfloorthing)
thing->eflags &= ~MFE_ONGROUND; // not on real floor
else
thing->eflags |= MFE_ONGROUND;
P_SetThingPosition(thing);
return true;
}
//
// P_ThingHeightClip
// Takes a valid thing and adjusts the thing->floorz,
// thing->ceilingz, and possibly thing->z.
// This is called for all nearby monsters
// whenever a sector changes height.
// If the thing doesn't fit,
// the z will be set to the lowest value
// and false will be returned.
//
static boolean P_ThingHeightClip(mobj_t *thing)
{
Hotfix for platform movement being dropped on players. Now players will apply platform movement when jumping, but only if the platform is moving the same direction as their jump is, and all other objects will have an appropriate pmomz in reverse gravity FOF situations.
2015-05-29 08:34:53 +00:00
boolean floormoved;
Successfully cause landing events when the ground moves up to hit you, as opposed to just when you move down to the ground.
2019-07-17 22:25:49 +00:00
fixed_t oldfloorz = thing->floorz, oldz = thing->z;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
ffloor_t *oldfloorrover = thing->floorrover;
ffloor_t *oldceilingrover = thing->ceilingrover;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean onfloor = P_IsObjectOnGround(thing);//(thing->z <= thing->floorz);
Fix player Z snap to floor on moving platform ~FF_EXISTS * Track player's old floorz by mo->floor_sectornum and floor_ffloornum * Track tmfloorz by tmfloorrover, tmfloor_sectornum, tmfloor_rovernum * Ceiling variants of the above
2018-09-08 04:34:56 +00:00
ffloor_t *rover = NULL;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (thing->flags & MF_NOCLIPHEIGHT)
return true;
P_CheckPosition(thing, thing->x, thing->y);
if (P_MobjWasRemoved(thing))
return true;
Hotfix for platform movement being dropped on players. Now players will apply platform movement when jumping, but only if the platform is moving the same direction as their jump is, and all other objects will have an appropriate pmomz in reverse gravity FOF situations.
2015-05-29 08:34:53 +00:00
floormoved = (thing->eflags & MFE_VERTICALFLIP && tmceilingz != thing->ceilingz)
|| (!(thing->eflags & MFE_VERTICALFLIP) && tmfloorz != thing->floorz);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
thing->floorz = tmfloorz;
thing->ceilingz = tmceilingz;
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
thing->floorrover = tmfloorrover;
thing->ceilingrover = tmceilingrover;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Ugly hack?!?! As long as just ceilingz is the lowest,
// you'll still get crushed, right?
if (tmfloorz > oldfloorz+thing->height)
return true;
Hotfix for platform movement being dropped on players. Now players will apply platform movement when jumping, but only if the platform is moving the same direction as their jump is, and all other objects will have an appropriate pmomz in reverse gravity FOF situations.
2015-05-29 08:34:53 +00:00
if (onfloor && !(thing->flags & MF_NOGRAVITY) && floormoved)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Replace sectornum/rovernum index vars with ffloor pointers
2018-09-10 03:12:37 +00:00
rover = (thing->eflags & MFE_VERTICALFLIP) ? oldceilingrover : oldfloorrover;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix player Z snap to floor on moving platform ~FF_EXISTS * Track player's old floorz by mo->floor_sectornum and floor_ffloornum * Track tmfloorz by tmfloorrover, tmfloor_sectornum, tmfloor_rovernum * Ceiling variants of the above
2018-09-08 04:34:56 +00:00
// Match the Thing's old floorz to an FOF and check for FF_EXISTS
// If ~FF_EXISTS, don't set mobj Z.
Also check for FF_SOLID
2018-09-08 05:02:17 +00:00
if (!rover || ((rover->flags & FF_EXISTS) && (rover->flags & FF_SOLID)))
Fix player Z snap to floor on moving platform ~FF_EXISTS * Track player's old floorz by mo->floor_sectornum and floor_ffloornum * Track tmfloorz by tmfloorrover, tmfloor_sectornum, tmfloor_rovernum * Ceiling variants of the above
2018-09-08 04:34:56 +00:00
{
if (thing->eflags & MFE_VERTICALFLIP)
thing->pmomz = thing->ceilingz - (thing->z + thing->height);
else
thing->pmomz = thing->floorz - thing->z;
thing->eflags |= MFE_APPLYPMOMZ;
if (thing->eflags & MFE_VERTICALFLIP)
thing->z = thing->ceilingz - thing->height;
else
thing->z = thing->floorz;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else if (!tmfloorthing)
{
// don't adjust a floating monster unless forced to
if (thing->eflags & MFE_VERTICALFLIP)
{
if (!onfloor && thing->z < tmfloorz)
thing->z = thing->floorz;
}
else if (!onfloor && thing->z + thing->height > tmceilingz)
thing->z = thing->ceilingz - thing->height;
}
* Resolve #224 (landing frames on ceiling contact). * Fix some other landing weirdness with CA_BOUNCE.
2019-09-19 12:20:05 +00:00
if (P_MobjFlip(thing)*(thing->z - oldz) > 0 && thing->player)
P_PlayerHitFloor(thing->player, !onfloor);
Successfully cause landing events when the ground moves up to hit you, as opposed to just when you move down to the ground.
2019-07-17 22:25:49 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// debug: be sure it falls to the floor
thing->eflags &= ~MFE_ONGROUND;
if (thing->ceilingz - thing->floorz < thing->height && thing->z >= thing->floorz)
// BP: i know that this code cause many trouble but this also fixes
// a lot of problems, mainly this is implementation of the stepping
// for mobj (walk on solid corpse without jumping or fake 3d bridge)
// problem is imp into imp at map01 and monster going at top of others
return false;
return true;
}
//
// SLIDE MOVE
// Allows the player to slide along any angled walls.
//
static fixed_t bestslidefrac, secondslidefrac;
static line_t *bestslideline;
static line_t *secondslideline;
static mobj_t *slidemo;
static fixed_t tmxmove, tmymove;
//
// P_HitCameraSlideLine
//
static void P_HitCameraSlideLine(line_t *ld, camera_t *thiscam)
{
INT32 side;
angle_t lineangle, moveangle, deltaangle;
fixed_t movelen, newlen;
if (ld->slopetype == ST_HORIZONTAL)
{
tmymove = 0;
return;
}
if (ld->slopetype == ST_VERTICAL)
{
tmxmove = 0;
return;
}
side = P_PointOnLineSide(thiscam->x, thiscam->y, ld);
lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy);
if (side == 1)
lineangle += ANGLE_180;
moveangle = R_PointToAngle2(0, 0, tmxmove, tmymove);
deltaangle = moveangle-lineangle;
if (deltaangle > ANGLE_180)
deltaangle += ANGLE_180;
lineangle >>= ANGLETOFINESHIFT;
deltaangle >>= ANGLETOFINESHIFT;
movelen = P_AproxDistance(tmxmove, tmymove);
newlen = FixedMul(movelen, FINECOSINE(deltaangle));
tmxmove = FixedMul(newlen, FINECOSINE(lineangle));
tmymove = FixedMul(newlen, FINESINE(lineangle));
}
//
// P_HitSlideLine
// Adjusts the xmove / ymove
// so that the next move will slide along the wall.
//
static void P_HitSlideLine(line_t *ld)
{
INT32 side;
angle_t lineangle, moveangle, deltaangle;
fixed_t movelen, newlen;
if (ld->slopetype == ST_HORIZONTAL)
{
tmymove = 0;
return;
}
if (ld->slopetype == ST_VERTICAL)
{
tmxmove = 0;
return;
}
side = P_PointOnLineSide(slidemo->x, slidemo->y, ld);
lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy);
if (side == 1)
lineangle += ANGLE_180;
moveangle = R_PointToAngle2(0, 0, tmxmove, tmymove);
deltaangle = moveangle-lineangle;
if (deltaangle > ANGLE_180)
deltaangle += ANGLE_180;
lineangle >>= ANGLETOFINESHIFT;
deltaangle >>= ANGLETOFINESHIFT;
movelen = P_AproxDistance(tmxmove, tmymove);
newlen = FixedMul(movelen, FINECOSINE(deltaangle));
tmxmove = FixedMul(newlen, FINECOSINE(lineangle));
tmymove = FixedMul(newlen, FINESINE(lineangle));
}
//
// P_HitBounceLine
//
// Adjusts the xmove / ymove so that the next move will bounce off the wall.
//
static void P_HitBounceLine(line_t *ld)
{
angle_t lineangle, moveangle, deltaangle;
fixed_t movelen;
if (ld->slopetype == ST_HORIZONTAL)
{
tmymove = -tmymove;
return;
}
if (ld->slopetype == ST_VERTICAL)
{
tmxmove = -tmxmove;
return;
}
lineangle = R_PointToAngle2(0, 0, ld->dx, ld->dy);
if (lineangle >= ANGLE_180)
lineangle -= ANGLE_180;
moveangle = R_PointToAngle2(0, 0, tmxmove, tmymove);
deltaangle = moveangle + 2*(lineangle - moveangle);
lineangle >>= ANGLETOFINESHIFT;
deltaangle >>= ANGLETOFINESHIFT;
movelen = P_AproxDistance(tmxmove, tmymove);
tmxmove = FixedMul(movelen, FINECOSINE(deltaangle));
tmymove = FixedMul(movelen, FINESINE(deltaangle));
deltaangle = R_PointToAngle2(0, 0, tmxmove, tmymove);
}
//
// PTR_SlideCameraTraverse
//
static boolean PTR_SlideCameraTraverse(intercept_t *in)
{
line_t *li;
I_Assert(in->isaline);
li = in->d.line;
// one-sided linedef
if (!li->backsector)
{
if (P_PointOnLineSide(mapcampointer->x, mapcampointer->y, li))
return true; // don't hit the back side
goto isblocking;
}
// set openrange, opentop, openbottom
P_CameraLineOpening(li);
if (openrange < mapcampointer->height)
goto isblocking; // doesn't fit
if (opentop - mapcampointer->z < mapcampointer->height)
goto isblocking; // mobj is too high
if (openbottom - mapcampointer->z > 0) // We don't want to make the camera step up.
goto isblocking; // too big a step up
// this line doesn't block movement
return true;
// the line does block movement,
// see if it is closer than best so far
isblocking:
{
if (in->frac < bestslidefrac)
{
secondslidefrac = bestslidefrac;
secondslideline = bestslideline;
bestslidefrac = in->frac;
bestslideline = li;
}
}
return false; // stop
}
//
// P_IsClimbingValid
//
Climbing now supports one-sided linedefs. The whole thing needs a refactor in general, but it's almost 2am here, I need my sleeb, and this fix would probably break something with 2.1 climbing if I made it any more/less (depending on viewpoint) complicated.
2016-06-20 00:50:47 +00:00
// Unlike P_DoClimbing, don't use when up against a one-sided linedef.
//
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
static boolean P_IsClimbingValid(player_t *player, angle_t angle)
{
fixed_t platx, platy;
subsector_t *glidesector;
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
fixed_t floorz, ceilingz;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
platx = P_ReturnThrustX(player->mo, angle, player->mo->radius + FixedMul(8*FRACUNIT, player->mo->scale));
platy = P_ReturnThrustY(player->mo, angle, player->mo->radius + FixedMul(8*FRACUNIT, player->mo->scale));
glidesector = R_PointInSubsector(player->mo->x + platx, player->mo->y + platy);
2-in-1! Fixed slide movement AND climbing when around slopes
2015-05-21 00:08:49 +00:00
#ifdef ESLOPE
floorz = glidesector->sector->f_slope ? P_GetZAt(glidesector->sector->f_slope, player->mo->x, player->mo->y) : glidesector->sector->floorheight;
ceilingz = glidesector->sector->c_slope ? P_GetZAt(glidesector->sector->c_slope, player->mo->x, player->mo->y) : glidesector->sector->ceilingheight;
#else
floorz = glidesector->sector->floorheight;
ceilingz = glidesector->sector->ceilingheight;
#endif
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (glidesector->sector != player->mo->subsector->sector)
{
boolean floorclimb = false;
Revert/remove unused/broken junk from original slopes port m_vector removal to come later. The little thing commented out in it is so I could revert the weird tables.c change.
2015-05-23 01:57:58 +00:00
fixed_t topheight, bottomheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (glidesector->sector->ffloors)
{
ffloor_t *rover;
for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
{
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER))
continue;
Revert/remove unused/broken junk from original slopes port m_vector removal to come later. The little thing commented out in it is so I could revert the weird tables.c change.
2015-05-23 01:57:58 +00:00
topheight = *rover->topheight;
bottomheight = *rover->bottomheight;
Overhaul slope collision (NOT PHYSICS) to work almost perfectly
2015-04-27 18:20:50 +00:00
2-in-1! Fixed slide movement AND climbing when around slopes
2015-05-21 00:08:49 +00:00
#ifdef ESLOPE
if (*rover->t_slope)
topheight = P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y);
if (*rover->b_slope)
bottomheight = P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y);
#endif
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
floorclimb = true;
if (player->mo->eflags & MFE_VERTICALFLIP)
{
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if ((topheight < player->mo->z + player->mo->height) && ((player->mo->z + player->mo->height + player->mo->momz) < topheight))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
floorclimb = true;
}
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (topheight < player->mo->z) // Waaaay below the ledge.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
floorclimb = false;
}
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (bottomheight > player->mo->z + player->mo->height - FixedMul(16*FRACUNIT,player->mo->scale))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
floorclimb = false;
}
}
else
{
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if ((bottomheight > player->mo->z) && ((player->mo->z - player->mo->momz) > bottomheight))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
floorclimb = true;
}
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (bottomheight > player->mo->z + player->mo->height) // Waaaay below the ledge.
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
floorclimb = false;
}
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (topheight < player->mo->z + FixedMul(16*FRACUNIT,player->mo->scale))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
floorclimb = false;
}
}
if (floorclimb)
break;
}
}
if (player->mo->eflags & MFE_VERTICALFLIP)
{
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if ((floorz <= player->mo->z + player->mo->height)
&& ((player->mo->z + player->mo->height - player->mo->momz) <= floorz))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
floorclimb = true;
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if ((floorz > player->mo->z)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& glidesector->sector->floorpic == skyflatnum)
return false;
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if ((player->mo->z + player->mo->height - FixedMul(16*FRACUNIT,player->mo->scale) > ceilingz)
|| (player->mo->z + player->mo->height <= floorz))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
floorclimb = true;
}
else
{
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if ((ceilingz >= player->mo->z)
&& ((player->mo->z - player->mo->momz) >= ceilingz))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
floorclimb = true;
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if ((ceilingz < player->mo->z+player->mo->height)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
&& glidesector->sector->ceilingpic == skyflatnum)
return false;
Fix Knuckles being able to climb up solid midtextures by repeatedly gliding at them. (addresses #174 checkbox 2)
2019-09-18 14:26:21 +00:00
if ((player->mo->z + FixedMul(16*FRACUNIT,player->mo->scale) < floorz)
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
|| (player->mo->z >= ceilingz))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
floorclimb = true;
}
if (!floorclimb)
return false;
return true;
}
return false;
}
//
// PTR_SlideTraverse
//
static boolean PTR_SlideTraverse(intercept_t *in)
{
line_t *li;
I_Assert(in->isaline);
li = in->d.line;
// one-sided linedefs are always solid to sliding movement.
// one-sided linedef
if (!li->backsector)
{
SRB2 2.1.4 release
2014-03-21 18:42:55 +00:00
if (P_PointOnLineSide(slidemo->x, slidemo->y, li))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true; // don't hit the back side
goto isblocking;
}
if (!(slidemo->flags & MF_MISSILE))
{
if (li->flags & ML_IMPASSIBLE)
goto isblocking;
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if ((slidemo->flags & (MF_ENEMY|MF_BOSS)) && li->flags & ML_BLOCKMONSTERS)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
goto isblocking;
}
// set openrange, opentop, openbottom
P_LineOpening now takes a mobj_t argument, instead of relying on tmthing . tmthing can be NULL if called from PTR_SlideTraverse, so we should use slidemo instead This fixes a crash that occurs in yet ANOTHER SUGOI map, involving bouncy walls next to sloped floors/ceilings
2016-08-13 20:41:18 +00:00
P_LineOpening(li, slidemo);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (openrange < slidemo->height)
goto isblocking; // doesn't fit
if (opentop - slidemo->z < slidemo->height)
goto isblocking; // mobj is too high
if (openbottom - slidemo->z > FixedMul(MAXSTEPMOVE, slidemo->scale))
goto isblocking; // too big a step up
// this line doesn't block movement
return true;
// the line does block movement,
// see if it is closer than best so far
isblocking:
if (li->polyobj && slidemo->player)
{
if ((li->polyobj->lines[0]->backsector->flags & SF_TRIGGERSPECIAL_TOUCH) && !(li->polyobj->flags & POF_NOSPECIALS))
P_ProcessSpecialSector(slidemo->player, slidemo->subsector->sector, li->polyobj->lines[0]->backsector);
}
if (slidemo->player && (slidemo->player->pflags & PF_GLIDING || slidemo->player->climbing)
&& slidemo->player->charability == CA_GLIDEANDCLIMB)
{
line_t *checkline = li;
sector_t *checksector;
ffloor_t *rover;
Revert/remove unused/broken junk from original slopes port m_vector removal to come later. The little thing commented out in it is so I could revert the weird tables.c change.
2015-05-23 01:57:58 +00:00
fixed_t topheight, bottomheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
boolean fofline = false;
INT32 side = P_PointOnLineSide(slidemo->x, slidemo->y, li);
if (!side && li->backsector)
checksector = li->backsector;
else
checksector = li->frontsector;
if (checksector->ffloors)
{
for (rover = checksector->ffloors; rover; rover = rover->next)
{
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || (rover->flags & FF_BUSTUP))
continue;
Revert/remove unused/broken junk from original slopes port m_vector removal to come later. The little thing commented out in it is so I could revert the weird tables.c change.
2015-05-23 01:57:58 +00:00
topheight = *rover->topheight;
bottomheight = *rover->bottomheight;
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
2-in-1! Fixed slide movement AND climbing when around slopes
2015-05-21 00:08:49 +00:00
#ifdef ESLOPE
if (*rover->t_slope)
topheight = P_GetZAt(*rover->t_slope, slidemo->x, slidemo->y);
if (*rover->b_slope)
bottomheight = P_GetZAt(*rover->b_slope, slidemo->x, slidemo->y);
#endif
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (topheight < slidemo->z)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (bottomheight > slidemo->z + slidemo->height)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
continue;
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
// Got this far, so I guess it's climbable. // TODO: Climbing check, also, better method to do this?
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (rover->master->flags & ML_TFERLINE)
{
size_t linenum = li-checksector->lines[0];
checkline = rover->master->frontsector->lines[0] + linenum;
fofline = true;
}
break;
}
}
// see about climbing on the wall
Prevent Knuckles latching onto horizon special linedefs. Also, update all references to the horizon special to use a #defined constant instead of a magic number.
2019-11-23 14:20:41 +00:00
if (!(checkline->flags & ML_NOCLIMB) && checkline->special != HORIZONSPECIAL)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Solved the climbing-on-one-sided-lines problem another way, using the last touched line's attributes. (After talking to Alam, we can't have floats anywhere near P_ functions, so.)
2016-08-13 13:16:06 +00:00
boolean canclimb;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
angle_t climbangle, climbline;
INT32 whichside = P_PointOnLineSide(slidemo->x, slidemo->y, li);
climbangle = climbline = R_PointToAngle2(li->v1->x, li->v1->y, li->v2->x, li->v2->y);
if (whichside) // on second side?
climbline += ANGLE_180;
climbangle += (ANGLE_90 * (whichside ? -1 : 1));
FUCK C90
2016-06-20 01:08:07 +00:00
canclimb = (li->backsector ? P_IsClimbingValid(slidemo->player, climbangle) : true);
Climbing now supports one-sided linedefs. The whole thing needs a refactor in general, but it's almost 2am here, I need my sleeb, and this fix would probably break something with 2.1 climbing if I made it any more/less (depending on viewpoint) complicated.
2016-06-20 00:50:47 +00:00
switich to do the angle math in signed, then run it thur abs()
2016-03-30 15:47:27 +00:00
if (((!slidemo->player->climbing && abs((signed)(slidemo->angle - ANGLE_90 - climbline)) < ANGLE_45)
|| (slidemo->player->climbing == 1 && abs((signed)(slidemo->angle - climbline)) < ANGLE_135))
Climbing now supports one-sided linedefs. The whole thing needs a refactor in general, but it's almost 2am here, I need my sleeb, and this fix would probably break something with 2.1 climbing if I made it any more/less (depending on viewpoint) complicated.
2016-06-20 00:50:47 +00:00
&& canclimb)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
slidemo->angle = climbangle;
Allow camera movement while climbing; allow sliding while landing from a glide
2019-09-30 06:38:58 +00:00
/*if (!demoplayback || P_AnalogMove(slidemo->player))
Fix replay camera not being turnable when climbing, sliding ...and several other things. If in analog mode, this does not apply (also analog mode replay camera no longer borks)
2016-04-05 19:56:48 +00:00
{
if (slidemo->player == &players[consoleplayer])
localangle = slidemo->angle;
else if (slidemo->player == &players[secondarydisplayplayer])
localangle2 = slidemo->angle;
Allow camera movement while climbing; allow sliding while landing from a glide
2019-09-30 06:38:58 +00:00
}*/
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!slidemo->player->climbing)
{
S_StartSound(slidemo->player->mo, sfx_s3k4a);
slidemo->player->climbing = 5;
}
Made jump damage flag application less hacky.
2017-03-18 21:06:06 +00:00
slidemo->player->pflags &= ~(PF_GLIDING|PF_SPINNING|PF_JUMPED|PF_NOJUMPDAMAGE|PF_THOKKED);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
slidemo->player->glidetime = 0;
slidemo->player->secondjump = 0;
if (slidemo->player->climbing > 1)
slidemo->momz = slidemo->momx = slidemo->momy = 0;
if (fofline)
whichside = 0;
if (!whichside)
{
slidemo->player->lastsidehit = checkline->sidenum[whichside];
slidemo->player->lastlinehit = (INT16)(checkline - lines);
}
P_Thrust(slidemo, slidemo->angle, FixedMul(5*FRACUNIT, slidemo->scale));
}
}
}
if (in->frac < bestslidefrac && (!slidemo->player || !slidemo->player->climbing))
{
secondslidefrac = bestslidefrac;
secondslideline = bestslideline;
bestslidefrac = in->frac;
bestslideline = li;
}
return false; // stop
}
//
// P_SlideCameraMove
//
// Tries to slide the camera along a wall.
//
void P_SlideCameraMove(camera_t *thiscam)
{
fixed_t leadx, leady, trailx, traily, newx, newy;
INT32 hitcount = 0;
INT32 retval = 0;
bestslideline = NULL;
retry:
if (++hitcount == 3)
goto stairstep; // don't loop forever
// trace along the three leading corners
if (thiscam->momx > 0)
{
leadx = thiscam->x + thiscam->radius;
trailx = thiscam->x - thiscam->radius;
}
else
{
leadx = thiscam->x - thiscam->radius;
trailx = thiscam->x + thiscam->radius;
}
if (thiscam->momy > 0)
{
leady = thiscam->y + thiscam->radius;
traily = thiscam->y - thiscam->radius;
}
else
{
leady = thiscam->y - thiscam->radius;
traily = thiscam->y + thiscam->radius;
}
bestslidefrac = FRACUNIT+1;
mapcampointer = thiscam;
P_PathTraverse(leadx, leady, leadx + thiscam->momx, leady + thiscam->momy,
PT_ADDLINES, PTR_SlideCameraTraverse);
P_PathTraverse(trailx, leady, trailx + thiscam->momx, leady + thiscam->momy,
PT_ADDLINES, PTR_SlideCameraTraverse);
P_PathTraverse(leadx, traily, leadx + thiscam->momx, traily + thiscam->momy,
PT_ADDLINES, PTR_SlideCameraTraverse);
// move up to the wall
if (bestslidefrac == FRACUNIT+1)
{
retval = P_TryCameraMove(thiscam->x, thiscam->y + thiscam->momy, thiscam);
// the move must have hit the middle, so stairstep
stairstep:
if (!retval) // Allow things to drop off.
P_TryCameraMove(thiscam->x + thiscam->momx, thiscam->y, thiscam);
return;
}
// fudge a bit to make sure it doesn't hit
bestslidefrac -= 0x800;
if (bestslidefrac > 0)
{
newx = FixedMul(thiscam->momx, bestslidefrac);
newy = FixedMul(thiscam->momy, bestslidefrac);
retval = P_TryCameraMove(thiscam->x + newx, thiscam->y + newy, thiscam);
if (!retval)
goto stairstep;
}
// Now continue along the wall.
// First calculate remainder.
bestslidefrac = FRACUNIT - (bestslidefrac+0x800);
if (bestslidefrac > FRACUNIT)
bestslidefrac = FRACUNIT;
if (bestslidefrac <= 0)
return;
tmxmove = FixedMul(thiscam->momx, bestslidefrac);
tmymove = FixedMul(thiscam->momy, bestslidefrac);
P_HitCameraSlideLine(bestslideline, thiscam); // clip the moves
thiscam->momx = tmxmove;
thiscam->momy = tmymove;
retval = P_TryCameraMove(thiscam->x + tmxmove, thiscam->y + tmymove, thiscam);
if (!retval)
goto retry;
}
Made solid lava walls damaging
2019-10-01 19:17:33 +00:00
static void P_CheckLavaWall(mobj_t *mo, sector_t *sec)
{
ffloor_t *rover;
fixed_t topheight, bottomheight;
for (rover = sec->ffloors; rover; rover = rover->next)
{
if (!(rover->flags & FF_EXISTS))
continue;
if (!(rover->flags & FF_SWIMMABLE))
continue;
if (GETSECSPECIAL(rover->master->frontsector->special, 1) != 3)
continue;
if (rover->master->flags & ML_BLOCKMONSTERS)
continue;
topheight =
#ifdef ESLOPE
*rover->t_slope ? P_GetZAt(*rover->t_slope, mo->x, mo->y) :
#endif
*rover->topheight;
if (mo->eflags & MFE_VERTICALFLIP)
{
if (topheight < mo->z - mo->height)
continue;
}
else
{
if (topheight < mo->z)
continue;
}
bottomheight =
#ifdef ESLOPE
*rover->b_slope ? P_GetZAt(*rover->b_slope, mo->x, mo->y) :
#endif
*rover->bottomheight;
if (mo->eflags & MFE_VERTICALFLIP)
{
if (bottomheight > mo->z)
continue;
}
else
{
if (bottomheight > mo->z + mo->height)
continue;
}
P_DamageMobj(mo, NULL, NULL, 1, DMG_FIRE);
return;
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// P_SlideMove
// The momx / momy move is bad, so try to slide
// along a wall.
// Find the first line hit, move flush to it,
// and slide along it
//
// This is a kludgy mess.
//
void P_SlideMove(mobj_t *mo)
{
fixed_t leadx, leady, trailx, traily, newx, newy;
INT16 hitcount = 0;
boolean success = false;
Whooh boy. Probably requires re-review. * Support for MF_PAPERCOLLISION tmhitthing in P_SlideMove. * Knockback for wallspikes is much more consistent. * Optimised away a FixedDiv call when determining the slopetype of a line. * Changed the position of the wallspike base slightly. * Made it so NOTHING can step up onto the player outside of other players, essentially killing a bunch of springs-launch-with-players style bugs. (I was able to recreate that issue with the wallspikes until I added this, which is why I did it in this branch.)
2017-07-18 13:17:10 +00:00
boolean papercol = false;
* Scope tweakin's to prevent having to make some stuff static. * Make wallspikes intangible if you're being thrust away from them in pain.
2017-07-18 13:17:10 +00:00
vertex_t v1, v2; // fake vertexes
line_t junk; // fake linedef
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (tmhitthing && mo->z + mo->height > tmhitthing->z && mo->z < tmhitthing->z + tmhitthing->height)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
// Don't mess with your momentum if it's a pushable object. Pushables do their own crazy things already.
if (tmhitthing->flags & MF_PUSHABLE)
return;
Whooh boy. Probably requires re-review. * Support for MF_PAPERCOLLISION tmhitthing in P_SlideMove. * Knockback for wallspikes is much more consistent. * Optimised away a FixedDiv call when determining the slopetype of a line. * Changed the position of the wallspike base slightly. * Made it so NOTHING can step up onto the player outside of other players, essentially killing a bunch of springs-launch-with-players style bugs. (I was able to recreate that issue with the wallspikes until I added this, which is why I did it in this branch.)
2017-07-18 13:17:10 +00:00
if (tmhitthing->flags & MF_PAPERCOLLISION)
{
* Scope tweakin's to prevent having to make some stuff static. * Make wallspikes intangible if you're being thrust away from them in pain.
2017-07-18 13:17:10 +00:00
fixed_t cosradius, sinradius, num, den;
Whooh boy. Probably requires re-review. * Support for MF_PAPERCOLLISION tmhitthing in P_SlideMove. * Knockback for wallspikes is much more consistent. * Optimised away a FixedDiv call when determining the slopetype of a line. * Changed the position of the wallspike base slightly. * Made it so NOTHING can step up onto the player outside of other players, essentially killing a bunch of springs-launch-with-players style bugs. (I was able to recreate that issue with the wallspikes until I added this, which is why I did it in this branch.)
2017-07-18 13:17:10 +00:00
// trace along the three leading corners
if (mo->momx > 0)
{
leadx = mo->x + mo->radius;
trailx = mo->x - mo->radius;
}
else
{
leadx = mo->x - mo->radius;
trailx = mo->x + mo->radius;
}
if (mo->momy > 0)
{
leady = mo->y + mo->radius;
traily = mo->y - mo->radius;
}
else
{
leady = mo->y - mo->radius;
traily = mo->y + mo->radius;
}
papercol = true;
slidemo = mo;
bestslideline = &junk;
cosradius = FixedMul(tmhitthing->radius, FINECOSINE(tmhitthing->angle>>ANGLETOFINESHIFT));
sinradius = FixedMul(tmhitthing->radius, FINESINE(tmhitthing->angle>>ANGLETOFINESHIFT));
v1.x = tmhitthing->x - cosradius;
v1.y = tmhitthing->y - sinradius;
v2.x = tmhitthing->x + cosradius;
v2.y = tmhitthing->y + sinradius;
SMOOTH PAPERCOLLISION TIME!!!!!!!! resolves #273, damn i feel good
2019-11-25 20:12:42 +00:00
// Can we box collision our way into smooth movement..?
-Fix player being able to push up spikes -Minor tweaks to make paper collision slightly more reliable
2019-11-25 21:35:40 +00:00
if (sinradius && mo->y + mo->radius <= min(v1.y, v2.y))
SMOOTH PAPERCOLLISION TIME!!!!!!!! resolves #273, damn i feel good
2019-11-25 20:12:42 +00:00
{
mo->momy = 0;
P_TryMove(mo, mo->x + mo->momx, min(v1.y, v2.y) - mo->radius, true);
return;
}
-Fix player being able to push up spikes -Minor tweaks to make paper collision slightly more reliable
2019-11-25 21:35:40 +00:00
else if (sinradius && mo->y - mo->radius >= max(v1.y, v2.y))
SMOOTH PAPERCOLLISION TIME!!!!!!!! resolves #273, damn i feel good
2019-11-25 20:12:42 +00:00
{
mo->momy = 0;
P_TryMove(mo, mo->x + mo->momx, max(v1.y, v2.y) + mo->radius, true);
return;
}
-Fix player being able to push up spikes -Minor tweaks to make paper collision slightly more reliable
2019-11-25 21:35:40 +00:00
else if (cosradius && mo->x + mo->radius <= min(v1.x, v2.x))
SMOOTH PAPERCOLLISION TIME!!!!!!!! resolves #273, damn i feel good
2019-11-25 20:12:42 +00:00
{
mo->momx = 0;
P_TryMove(mo, min(v1.x, v2.x) - mo->radius, mo->y + mo->momy, true);
return;
}
-Fix player being able to push up spikes -Minor tweaks to make paper collision slightly more reliable
2019-11-25 21:35:40 +00:00
else if (cosradius && mo->x - mo->radius >= max(v1.x, v2.x))
SMOOTH PAPERCOLLISION TIME!!!!!!!! resolves #273, damn i feel good
2019-11-25 20:12:42 +00:00
{
mo->momx = 0;
P_TryMove(mo, max(v1.x, v2.x) + mo->radius, mo->y + mo->momy, true);
return;
}
// nope, gotta fuck around with a fake linedef!
Whooh boy. Probably requires re-review. * Support for MF_PAPERCOLLISION tmhitthing in P_SlideMove. * Knockback for wallspikes is much more consistent. * Optimised away a FixedDiv call when determining the slopetype of a line. * Changed the position of the wallspike base slightly. * Made it so NOTHING can step up onto the player outside of other players, essentially killing a bunch of springs-launch-with-players style bugs. (I was able to recreate that issue with the wallspikes until I added this, which is why I did it in this branch.)
2017-07-18 13:17:10 +00:00
junk.v1 = &v1;
junk.v2 = &v2;
junk.dx = 2*cosradius; // v2.x - v1.x;
junk.dy = 2*sinradius; // v2.y - v1.y;
junk.slopetype = !cosradius ? ST_VERTICAL : !sinradius ? ST_HORIZONTAL :
((sinradius > 0) == (cosradius > 0)) ? ST_POSITIVE : ST_NEGATIVE;
bestslidefrac = FRACUNIT+1;
den = FixedMul(junk.dy>>8, mo->momx) - FixedMul(junk.dx>>8, mo->momy);
if (!den)
bestslidefrac = 0;
else
{
fixed_t frac;
#define P_PaperTraverse(startx, starty) \
num = FixedMul((v1.x - leadx)>>8, junk.dy) + FixedMul((leady - v1.y)>>8, junk.dx); \
frac = FixedDiv(num, den); \
if (frac < bestslidefrac) \
bestslidefrac = frac
P_PaperTraverse(leadx, leady);
P_PaperTraverse(trailx, leady);
P_PaperTraverse(leadx, traily);
#undef dowork
}
goto papercollision;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Thankfully box collisions are a lot simpler than arbitrary lines. There's only four possible cases.
if (mo->y + mo->radius <= tmhitthing->y - tmhitthing->radius)
{
mo->momy = 0;
P_TryMove(mo, mo->x + mo->momx, tmhitthing->y - tmhitthing->radius - mo->radius, true);
}
else if (mo->y - mo->radius >= tmhitthing->y + tmhitthing->radius)
{
mo->momy = 0;
P_TryMove(mo, mo->x + mo->momx, tmhitthing->y + tmhitthing->radius + mo->radius, true);
}
else if (mo->x + mo->radius <= tmhitthing->x - tmhitthing->radius)
{
mo->momx = 0;
P_TryMove(mo, tmhitthing->x - tmhitthing->radius - mo->radius, mo->y + mo->momy, true);
}
else if (mo->x - mo->radius >= tmhitthing->x + tmhitthing->radius)
{
mo->momx = 0;
P_TryMove(mo, tmhitthing->x + tmhitthing->radius + mo->radius, mo->y + mo->momy, true);
}
else
mo->momx = mo->momy = 0;
return;
}
slidemo = mo;
bestslideline = NULL;
retry:
Whooh boy. Probably requires re-review. * Support for MF_PAPERCOLLISION tmhitthing in P_SlideMove. * Knockback for wallspikes is much more consistent. * Optimised away a FixedDiv call when determining the slopetype of a line. * Changed the position of the wallspike base slightly. * Made it so NOTHING can step up onto the player outside of other players, essentially killing a bunch of springs-launch-with-players style bugs. (I was able to recreate that issue with the wallspikes until I added this, which is why I did it in this branch.)
2017-07-18 13:17:10 +00:00
if ((++hitcount == 3) || papercol)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
goto stairstep; // don't loop forever
// trace along the three leading corners
if (mo->momx > 0)
{
leadx = mo->x + mo->radius;
trailx = mo->x - mo->radius;
}
else
{
leadx = mo->x - mo->radius;
trailx = mo->x + mo->radius;
}
if (mo->momy > 0)
{
leady = mo->y + mo->radius;
traily = mo->y - mo->radius;
}
else
{
leady = mo->y - mo->radius;
traily = mo->y + mo->radius;
}
bestslidefrac = FRACUNIT+1;
P_PathTraverse(leadx, leady, leadx + mo->momx, leady + mo->momy,
PT_ADDLINES, PTR_SlideTraverse);
P_PathTraverse(trailx, leady, trailx + mo->momx, leady + mo->momy,
PT_ADDLINES, PTR_SlideTraverse);
P_PathTraverse(leadx, traily, leadx + mo->momx, traily + mo->momy,
PT_ADDLINES, PTR_SlideTraverse);
Made solid lava walls damaging
2019-10-01 19:17:33 +00:00
if (bestslideline && mo->player && bestslideline->sidenum[1] != 0xffff)
{
sector_t *sec = P_PointOnLineSide(mo->x, mo->y, bestslideline) ? bestslideline->frontsector : bestslideline->backsector;
P_CheckLavaWall(mo, sec);
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Some walls are bouncy even if you're not
if (bestslideline && bestslideline->flags & ML_BOUNCY)
{
P_BounceMove(mo);
return;
}
Whooh boy. Probably requires re-review. * Support for MF_PAPERCOLLISION tmhitthing in P_SlideMove. * Knockback for wallspikes is much more consistent. * Optimised away a FixedDiv call when determining the slopetype of a line. * Changed the position of the wallspike base slightly. * Made it so NOTHING can step up onto the player outside of other players, essentially killing a bunch of springs-launch-with-players style bugs. (I was able to recreate that issue with the wallspikes until I added this, which is why I did it in this branch.)
2017-07-18 13:17:10 +00:00
papercollision:
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// move up to the wall
if (bestslidefrac == FRACUNIT+1)
{
// the move must have hit the middle, so stairstep
stairstep:
if (!P_TryMove(mo, mo->x, mo->y + mo->momy, true)) //Allow things to drop off.
P_TryMove(mo, mo->x + mo->momx, mo->y, true);
return;
}
// fudge a bit to make sure it doesn't hit
bestslidefrac -= 0x800;
if (bestslidefrac > 0)
{
newx = FixedMul(mo->momx, bestslidefrac);
newy = FixedMul(mo->momy, bestslidefrac);
if (!P_TryMove(mo, mo->x + newx, mo->y + newy, true))
goto stairstep;
}
// Now continue along the wall.
// First calculate remainder.
bestslidefrac = FRACUNIT - (bestslidefrac+0x800);
if (bestslidefrac > FRACUNIT)
bestslidefrac = FRACUNIT;
if (bestslidefrac <= 0)
return;
tmxmove = FixedMul(mo->momx, bestslidefrac);
tmymove = FixedMul(mo->momy, bestslidefrac);
P_HitSlideLine(bestslideline); // clip the moves
if ((twodlevel || (mo->flags2 & MF2_TWOD)) && mo->player)
{
mo->momx = tmxmove;
tmymove = 0;
}
else
{
mo->momx = tmxmove;
mo->momy = tmymove;
}
do {
if (tmxmove > mo->radius) {
newx = mo->x + mo->radius;
tmxmove -= mo->radius;
} else if (tmxmove < -mo->radius) {
newx = mo->x - mo->radius;
tmxmove += mo->radius;
} else {
newx = mo->x + tmxmove;
tmxmove = 0;
}
if (tmymove > mo->radius) {
newy = mo->y + mo->radius;
tmymove -= mo->radius;
} else if (tmymove < -mo->radius) {
newy = mo->y - mo->radius;
tmymove += mo->radius;
} else {
newy = mo->y + tmymove;
tmymove = 0;
}
if (!P_TryMove(mo, newx, newy, true)) {
if (success)
return; // Good enough!!
else
goto retry;
}
success = true;
} while(tmxmove || tmymove);
}
//
// P_BounceMove
//
// The momx / momy move is bad, so try to bounce off a wall.
//
void P_BounceMove(mobj_t *mo)
{
fixed_t leadx, leady;
fixed_t trailx, traily;
fixed_t newx, newy;
INT32 hitcount;
fixed_t mmomx = 0, mmomy = 0;
slidemo = mo;
hitcount = 0;
retry:
if (++hitcount == 3)
goto bounceback; // don't loop forever
if (mo->player)
{
mmomx = mo->player->rmomx;
mmomy = mo->player->rmomy;
}
else
{
mmomx = mo->momx;
mmomy = mo->momy;
}
// trace along the three leading corners
if (mo->momx > 0)
{
leadx = mo->x + mo->radius;
trailx = mo->x - mo->radius;
}
else
{
leadx = mo->x - mo->radius;
trailx = mo->x + mo->radius;
}
if (mo->momy > 0)
{
leady = mo->y + mo->radius;
traily = mo->y - mo->radius;
}
else
{
leady = mo->y - mo->radius;
traily = mo->y + mo->radius;
}
bestslidefrac = FRACUNIT + 1;
P_PathTraverse(leadx, leady, leadx + mmomx, leady + mmomy, PT_ADDLINES, PTR_SlideTraverse);
P_PathTraverse(trailx, leady, trailx + mmomx, leady + mmomy, PT_ADDLINES, PTR_SlideTraverse);
P_PathTraverse(leadx, traily, leadx + mmomx, traily + mmomy, PT_ADDLINES, PTR_SlideTraverse);
// move up to the wall
if (bestslidefrac == FRACUNIT + 1)
{
// the move must have hit the middle, so bounce straight back
bounceback:
if (P_TryMove(mo, mo->x - mmomx, mo->y - mmomy, true))
{
mo->momx *= -1;
mo->momy *= -1;
mo->momx = FixedMul(mo->momx, (FRACUNIT - (FRACUNIT>>2) - (FRACUNIT>>3)));
mo->momy = FixedMul(mo->momy, (FRACUNIT - (FRACUNIT>>2) - (FRACUNIT>>3)));
if (mo->player)
{
mo->player->cmomx *= -1;
mo->player->cmomy *= -1;
mo->player->cmomx = FixedMul(mo->player->cmomx,
(FRACUNIT - (FRACUNIT>>2) - (FRACUNIT>>3)));
mo->player->cmomy = FixedMul(mo->player->cmomy,
(FRACUNIT - (FRACUNIT>>2) - (FRACUNIT>>3)));
}
}
return;
}
// fudge a bit to make sure it doesn't hit
bestslidefrac -= 0x800;
if (bestslidefrac > 0)
{
newx = FixedMul(mmomx, bestslidefrac);
newy = FixedMul(mmomy, bestslidefrac);
if (!P_TryMove(mo, mo->x + newx, mo->y + newy, true))
goto bounceback;
}
// Now continue along the wall.
// First calculate remainder.
bestslidefrac = FRACUNIT - bestslidefrac;
if (bestslidefrac > FRACUNIT)
bestslidefrac = FRACUNIT;
if (bestslidefrac <= 0)
return;
if (mo->type == MT_SHELL)
{
tmxmove = mmomx;
tmymove = mmomy;
}
else if (mo->type == MT_THROWNBOUNCE)
{
tmxmove = FixedMul(mmomx, (FRACUNIT - (FRACUNIT>>6) - (FRACUNIT>>5)));
tmymove = FixedMul(mmomy, (FRACUNIT - (FRACUNIT>>6) - (FRACUNIT>>5)));
}
else if (mo->type == MT_THROWNGRENADE || mo->type == MT_CYBRAKDEMON_NAPALM_BOMB_LARGE)
{
// Quickly decay speed as it bounces
tmxmove = FixedDiv(mmomx, 2*FRACUNIT);
tmymove = FixedDiv(mmomy, 2*FRACUNIT);
}
else
{
tmxmove = FixedMul(mmomx, (FRACUNIT - (FRACUNIT>>2) - (FRACUNIT>>3)));
tmymove = FixedMul(mmomy, (FRACUNIT - (FRACUNIT>>2) - (FRACUNIT>>3)));
}
P_HitBounceLine(bestslideline); // clip the moves
mo->momx = tmxmove;
mo->momy = tmymove;
if (mo->player)
{
mo->player->cmomx = tmxmove;
mo->player->cmomy = tmymove;
}
if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true))
goto retry;
}
//
// RADIUS ATTACK
//
static fixed_t bombdamage;
static mobj_t *bombsource;
static mobj_t *bombspot;
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
static UINT8 bombdamagetype;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
//
// PIT_RadiusAttack
// "bombsource" is the creature
// that caused the explosion at "bombspot".
//
static boolean PIT_RadiusAttack(mobj_t *thing)
{
fixed_t dx, dy, dz, dist;
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
if (thing == bombspot) // ignore the bomb itself (Deton fix)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
if ((thing->flags & (MF_MONITOR|MF_SHOOTABLE)) != MF_SHOOTABLE)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
if (bombsource && thing->type == bombsource->type && !(bombdamagetype & DMG_CANHURTSELF)) // ignore the type of guys who dropped the bomb (Jetty-Syn Bomber or Skim can bomb eachother, but not themselves.)
Revert "Nev3r wants to make barrels which are both shootable and die when you break them like you break monitors." This reverts commit 286a8b0289c8c0c40190f66f2473b287788806f1.
2016-11-12 15:39:47 +00:00
return true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
dx = abs(thing->x - bombspot->x);
dy = abs(thing->y - bombspot->y);
dz = abs(thing->z + (thing->height>>1) - bombspot->z);
dist = P_AproxDistance(P_AproxDistance(dx, dy), dz);
dist -= thing->radius;
if (dist < 0)
dist = 0;
if (dist >= bombdamage)
return true; // out of range
if (thing->floorz > bombspot->z && bombspot->ceilingz < thing->z)
return true;
if (thing->ceilingz < bombspot->z && bombspot->floorz > thing->z)
return true;
if (P_CheckSight(thing, bombspot))
{ // must be in direct path
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
P_DamageMobj(thing, bombspot, bombsource, 1, bombdamagetype); // Tails 01-11-2001
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
return true;
}
//
// P_RadiusAttack
// Source is the creature that caused the explosion at spot.
//
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
void P_RadiusAttack(mobj_t *spot, mobj_t *source, fixed_t damagedist, UINT8 damagetype)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
INT32 x, y;
INT32 xl, xh, yl, yh;
fixed_t dist;
dist = FixedMul(damagedist, spot->scale) + MAXRADIUS;
Revert "Guess what major breaking-news bug I just fixed B)" This reverts commit 9e306394ddff993a5e5bb32bf9b3835203eea1ce. Sorry MI, but this completely breaks large maps like AGZ.
2015-04-09 01:50:49 +00:00
yh = (unsigned)(spot->y + dist - bmaporgy)>>MAPBLOCKSHIFT;
yl = (unsigned)(spot->y - dist - bmaporgy)>>MAPBLOCKSHIFT;
xh = (unsigned)(spot->x + dist - bmaporgx)>>MAPBLOCKSHIFT;
xl = (unsigned)(spot->x - dist - bmaporgx)>>MAPBLOCKSHIFT;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix the west/south blockmap issue without fucking up huge maps
2015-04-09 02:32:07 +00:00
BMBOUNDFIX(xl, xh, yl, yh);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
bombspot = spot;
bombsource = source;
bombdamage = FixedMul(damagedist, spot->scale);
* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.
2018-05-08 22:26:36 +00:00
bombdamagetype = damagetype;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (y = yl; y <= yh; y++)
for (x = xl; x <= xh; x++)
P_BlockThingsIterator(x, y, PIT_RadiusAttack);
}
//
// SECTOR HEIGHT CHANGING
// After modifying a sectors floor or ceiling height,
// call this routine to adjust the positions
// of all things that touch the sector.
//
// If anything doesn't fit anymore, true will be returned.
// If crunch is true, they will take damage
// as they are being crushed.
// If Crunch is false, you should set the sector height back
// the way it was and call P_CheckSector (? was P_ChangeSector - Graue) again
// to undo the changes.
//
static boolean crushchange;
static boolean nofit;
//
// PIT_ChangeSector
//
static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
{
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
mobj_t *killer = NULL;
Pushables that are also vulnerable no longer block crushers (because they die anyway). This allows us to make TNT barrels pushable again.
2019-06-10 12:10:37 +00:00
//If a thing is both pushable and vulnerable, it doesn't block the crusher because it gets killed.
boolean immunepushable = ((thing->flags & (MF_PUSHABLE | MF_SHOOTABLE)) == MF_PUSHABLE);
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (P_ThingHeightClip(thing))
{
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
//thing fits, check next thing
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
if (!(thing->flags & (MF_SHOOTABLE|MF_PUSHABLE))
|| thing->flags & MF_NOCLIPHEIGHT)
{
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
//doesn't interact with the crusher, just ignore it
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
return true;
}
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
// Thing doesn't fit. If thing is vulnerable, that means it's being crushed. If thing is pushable, it might
// just be blocked by another object - check if it's really a ceiling!
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (thing->z + thing->height > thing->ceilingz && thing->z <= thing->ceilingz)
{
Pushables that are also vulnerable no longer block crushers (because they die anyway). This allows us to make TNT barrels pushable again.
2019-06-10 12:10:37 +00:00
if (immunepushable && thing->z + thing->height > thing->subsector->sector->ceilingheight)
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
{
//Thing is a pushable and blocks the moving ceiling
nofit = true;
return false;
}
//Check FOFs in the sector
Pushables that are also vulnerable no longer block crushers (because they die anyway). This allows us to make TNT barrels pushable again.
2019-06-10 12:10:37 +00:00
if (thing->subsector->sector->ffloors && (realcrush || immunepushable))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
ffloor_t *rover;
Revert/remove unused/broken junk from original slopes port m_vector removal to come later. The little thing commented out in it is so I could revert the weird tables.c change.
2015-05-23 01:57:58 +00:00
fixed_t topheight, bottomheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
fixed_t delta1, delta2;
INT32 thingtop = thing->z + thing->height;
for (rover = thing->subsector->sector->ffloors; rover; rover = rover->next)
{
if (!(((rover->flags & FF_BLOCKPLAYER) && thing->player)
|| ((rover->flags & FF_BLOCKOTHERS) && !thing->player)) || !(rover->flags & FF_EXISTS))
continue;
Revert/remove unused/broken junk from original slopes port m_vector removal to come later. The little thing commented out in it is so I could revert the weird tables.c change.
2015-05-23 01:57:58 +00:00
topheight = *rover->topheight;
bottomheight = *rover->bottomheight;
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
/*#ifdef ESLOPE
if (rover->t_slope)
topheight = P_GetZAt(rover->t_slope, thing->x, thing->y);
if (rover->b_slope)
bottomheight = P_GetZAt(rover->b_slope, thing->x, thing->y);
#endif*/
delta1 = thing->z - (bottomheight + topheight)/2;
delta2 = thingtop - (bottomheight + topheight)/2;
if (bottomheight <= thing->ceilingz && abs(delta1) >= abs(delta2))
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
Pushables that are also vulnerable no longer block crushers (because they die anyway). This allows us to make TNT barrels pushable again.
2019-06-10 12:10:37 +00:00
if (immunepushable)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
//FOF is blocked by pushable
nofit = true;
return false;
}
else
{
//If the thing was crushed by a crumbling FOF, reward the player who made it crumble!
thinker_t *think;
elevator_t *crumbler;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Basic multiple thinker list implementation Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 20:37:19 +00:00
for (think = thlist[THINK_MAIN].next; think != &thlist[THINK_MAIN]; think = think->next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
if (think->function.acp1 != (actionf_p1)T_StartCrumble)
continue;
crumbler = (elevator_t *)think;
if (crumbler->player && crumbler->player->mo
&& crumbler->player->mo != thing
&& crumbler->actionsector == thing->subsector->sector
&& crumbler->sector == rover->master->frontsector
&& (crumbler->type == elevateBounce
|| crumbler->type == elevateContinuous))
{
killer = crumbler->player->mo;
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
}
}
}
if (realcrush)
{
SRB2 2.1.9 release
2014-08-04 03:49:33 +00:00
// Crush the object
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (netgame && thing->player && thing->player->spectator)
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(thing, NULL, NULL, 1, DMG_SPECTATOR); // Respawn crushed spectators
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(thing, killer, killer, 1, DMG_CRUSHED);
return true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
if (realcrush && crushchange)
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time? Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-13 16:15:58 +00:00
P_DamageMobj(thing, NULL, NULL, 1, 0);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// keep checking (crush other things)
return true;
}
//
// P_CheckSector
//
boolean P_CheckSector(sector_t *sector, boolean crunch)
{
msecnode_t *n;
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
2019-08-02 15:51:44 +00:00
size_t i;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
nofit = false;
crushchange = crunch;
// killough 4/4/98: scan list front-to-back until empty or exhausted,
// restarting from beginning after each thing is processed. Avoids
// crashes, and is sure to examine all things in the sector, and only
// the things which are in the sector, until a steady-state is reached.
// Things can arbitrarily be inserted and removed and it won't mess up.
//
// killough 4/7/98: simplified to avoid using complicated counter
// First, let's see if anything will keep it from crushing.
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
2019-08-02 15:51:44 +00:00
// Sal: This stupid function chain is required to fix polyobjects not being able to crush.
// Monster Iestyn: don't use P_CheckSector actually just look for objects in the blockmap instead
validcount++;
for (i = 0; i < sector->linecount; i++)
{
if (sector->lines[i]->polyobj)
{
polyobj_t *po = sector->lines[i]->polyobj;
if (po->validcount == validcount)
continue; // skip if already checked
if (!(po->flags & POF_SOLID))
continue;
if (po->lines[0]->backsector == sector) // Make sure you're currently checking the control sector
{
INT32 x, y;
po->validcount = validcount;
for (y = po->blockbox[BOXBOTTOM]; y <= po->blockbox[BOXTOP]; ++y)
{
for (x = po->blockbox[BOXLEFT]; x <= po->blockbox[BOXRIGHT]; ++x)
{
mobj_t *mo;
if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
continue;
mo = blocklinks[y * bmapwidth + x];
for (; mo; mo = mo->bnext)
{
// Monster Iestyn: do we need to check if a mobj has already been checked? ...probably not I suspect
Use P_MobjInsidePolyobj instead of P_MobjTouchingPolyobj, so that you can be crushed by the polyobject's middle rather than just its edges
2019-08-16 13:54:01 +00:00
if (!P_MobjInsidePolyobj(po, mo))
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
2019-08-02 15:51:44 +00:00
continue;
if (!PIT_ChangeSector(mo, false))
{
nofit = true;
return nofit;
}
}
}
}
}
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (sector->numattached)
{
sector_t *sec;
for (i = 0; i < sector->numattached; i++)
{
sec = &sectors[sector->attached[i]];
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
for (n = sec->touching_thinglist; n; n = n->m_thinglist_next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
n->visited = false;
sec->moved = true;
P_RecalcPrecipInSector(sec);
if (!sector->attachedsolid[i])
continue;
do
{
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
for (n = sec->touching_thinglist; n; n = n->m_thinglist_next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!n->visited)
{
n->visited = true;
if (!(n->m_thing->flags & MF_NOBLOCKMAP))
{
if (!PIT_ChangeSector(n->m_thing, false))
{
nofit = true;
return nofit;
}
}
break;
}
} while (n);
}
}
// Mark all things invalid
sector->moved = true;
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
for (n = sector->touching_thinglist; n; n = n->m_thinglist_next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
n->visited = false;
do
{
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) // go through list
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!n->visited) // unprocessed thing found
{
n->visited = true; // mark thing as processed
if (!(n->m_thing->flags & MF_NOBLOCKMAP)) //jff 4/7/98 don't do these
{
if (!PIT_ChangeSector(n->m_thing, false)) // process it
{
nofit = true;
return nofit;
}
}
break; // exit and start over
}
} while (n); // repeat from scratch until all things left are marked valid
// Nothing blocked us, so lets crush for real!
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
2019-08-02 15:51:44 +00:00
// Sal: This stupid function chain is required to fix polyobjects not being able to crush.
// Monster Iestyn: don't use P_CheckSector actually just look for objects in the blockmap instead
validcount++;
for (i = 0; i < sector->linecount; i++)
{
if (sector->lines[i]->polyobj)
{
polyobj_t *po = sector->lines[i]->polyobj;
if (po->validcount == validcount)
continue; // skip if already checked
if (!(po->flags & POF_SOLID))
continue;
if (po->lines[0]->backsector == sector) // Make sure you're currently checking the control sector
{
INT32 x, y;
po->validcount = validcount;
for (y = po->blockbox[BOXBOTTOM]; y <= po->blockbox[BOXTOP]; ++y)
{
for (x = po->blockbox[BOXLEFT]; x <= po->blockbox[BOXRIGHT]; ++x)
{
mobj_t *mo;
if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
continue;
mo = blocklinks[y * bmapwidth + x];
for (; mo; mo = mo->bnext)
{
// Monster Iestyn: do we need to check if a mobj has already been checked? ...probably not I suspect
Use P_MobjInsidePolyobj instead of P_MobjTouchingPolyobj, so that you can be crushed by the polyobject's middle rather than just its edges
2019-08-16 13:54:01 +00:00
if (!P_MobjInsidePolyobj(po, mo))
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
2019-08-02 15:51:44 +00:00
continue;
PIT_ChangeSector(mo, true);
return nofit;
}
}
}
}
}
}
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (sector->numattached)
{
sector_t *sec;
for (i = 0; i < sector->numattached; i++)
{
sec = &sectors[sector->attached[i]];
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
for (n = sec->touching_thinglist; n; n = n->m_thinglist_next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
n->visited = false;
sec->moved = true;
P_RecalcPrecipInSector(sec);
if (!sector->attachedsolid[i])
continue;
do
{
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
for (n = sec->touching_thinglist; n; n = n->m_thinglist_next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!n->visited)
{
n->visited = true;
if (!(n->m_thing->flags & MF_NOBLOCKMAP))
{
PIT_ChangeSector(n->m_thing, true);
return nofit;
}
break;
}
} while (n);
}
}
// Mark all things invalid
sector->moved = true;
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
for (n = sector->touching_thinglist; n; n = n->m_thinglist_next)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
n->visited = false;
do
{
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) // go through list
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!n->visited) // unprocessed thing found
{
n->visited = true; // mark thing as processed
if (!(n->m_thing->flags & MF_NOBLOCKMAP)) //jff 4/7/98 don't do these
{
PIT_ChangeSector(n->m_thing, true); // process it
return nofit;
}
break; // exit and start over
}
} while (n); // repeat from scratch until all things left are marked valid
return nofit;
}
/*
SoM: 3/15/2000
Lots of new Boom functions that work faster and add functionality.
*/
static msecnode_t *headsecnode = NULL;
static mprecipsecnode_t *headprecipsecnode = NULL;
void P_Initsecnode(void)
{
headsecnode = NULL;
headprecipsecnode = NULL;
}
// P_GetSecnode() retrieves a node from the freelist. The calling routine
// should make sure it sets all fields properly.
static msecnode_t *P_GetSecnode(void)
{
msecnode_t *node;
if (headsecnode)
{
node = headsecnode;
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
headsecnode = headsecnode->m_thinglist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
node = Z_Calloc(sizeof (*node), PU_LEVEL, NULL);
return node;
}
static mprecipsecnode_t *P_GetPrecipSecnode(void)
{
mprecipsecnode_t *node;
if (headprecipsecnode)
{
node = headprecipsecnode;
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
headprecipsecnode = headprecipsecnode->m_thinglist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
else
node = Z_Calloc(sizeof (*node), PU_LEVEL, NULL);
return node;
}
// P_PutSecnode() returns a node to the freelist.
static inline void P_PutSecnode(msecnode_t *node)
{
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node->m_thinglist_next = headsecnode;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
headsecnode = node;
}
// Tails 08-25-2002
static inline void P_PutPrecipSecnode(mprecipsecnode_t *node)
{
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node->m_thinglist_next = headprecipsecnode;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
headprecipsecnode = node;
}
// P_AddSecnode() searches the current list to see if this sector is
// already there. If not, it adds a sector node at the head of the list of
// sectors this object appears in. This is called when creating a list of
// nodes that will get linked in later. Returns a pointer to the new node.
static msecnode_t *P_AddSecnode(sector_t *s, mobj_t *thing, msecnode_t *nextnode)
{
msecnode_t *node;
node = nextnode;
while (node)
{
if (node->m_sector == s) // Already have a node for this sector?
{
node->m_thing = thing; // Yes. Setting m_thing says 'keep it'.
return nextnode;
}
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node = node->m_sectorlist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Couldn't find an existing node for this sector. Add one at the head
// of the list.
node = P_GetSecnode();
// mark new nodes unvisited.
node->visited = 0;
node->m_sector = s; // sector
node->m_thing = thing; // mobj
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node->m_sectorlist_prev = NULL; // prev node on Thing thread
node->m_sectorlist_next = nextnode; // next node on Thing thread
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (nextnode)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
nextnode->m_sectorlist_prev = node; // set back link on Thing
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Add new node at head of sector thread starting at s->touching_thinglist
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node->m_thinglist_prev = NULL; // prev node on sector thread
node->m_thinglist_next = s->touching_thinglist; // next node on sector thread
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (s->touching_thinglist)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node->m_thinglist_next->m_thinglist_prev = node;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
s->touching_thinglist = node;
return node;
}
// More crazy crap Tails 08-25-2002
static mprecipsecnode_t *P_AddPrecipSecnode(sector_t *s, precipmobj_t *thing, mprecipsecnode_t *nextnode)
{
mprecipsecnode_t *node;
node = nextnode;
while (node)
{
if (node->m_sector == s) // Already have a node for this sector?
{
node->m_thing = thing; // Yes. Setting m_thing says 'keep it'.
return nextnode;
}
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node = node->m_sectorlist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
// Couldn't find an existing node for this sector. Add one at the head
// of the list.
node = P_GetPrecipSecnode();
// mark new nodes unvisited.
node->visited = 0;
node->m_sector = s; // sector
node->m_thing = thing; // mobj
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node->m_sectorlist_prev = NULL; // prev node on Thing thread
node->m_sectorlist_next = nextnode; // next node on Thing thread
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (nextnode)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
nextnode->m_sectorlist_prev = node; // set back link on Thing
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Add new node at head of sector thread starting at s->touching_thinglist
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node->m_thinglist_prev = NULL; // prev node on sector thread
node->m_thinglist_next = s->touching_preciplist; // next node on sector thread
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (s->touching_preciplist)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node->m_thinglist_next->m_thinglist_prev = node;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
s->touching_preciplist = node;
return node;
}
// P_DelSecnode() deletes a sector node from the list of
// sectors this object appears in. Returns a pointer to the next node
// on the linked list, or NULL.
static msecnode_t *P_DelSecnode(msecnode_t *node)
{
msecnode_t *tp; // prev node on thing thread
msecnode_t *tn; // next node on thing thread
msecnode_t *sp; // prev node on sector thread
msecnode_t *sn; // next node on sector thread
if (!node)
return NULL;
// Unlink from the Thing thread. The Thing thread begins at
// sector_list and not from mobj_t->touching_sectorlist.
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
tp = node->m_sectorlist_prev;
tn = node->m_sectorlist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (tp)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
tp->m_sectorlist_next = tn;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (tn)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
tn->m_sectorlist_prev = tp;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Unlink from the sector thread. This thread begins at
// sector_t->touching_thinglist.
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
sp = node->m_thinglist_prev;
sn = node->m_thinglist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (sp)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
sp->m_thinglist_next = sn;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
node->m_sector->touching_thinglist = sn;
if (sn)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
sn->m_thinglist_prev = sp;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Return this node to the freelist
P_PutSecnode(node);
return tn;
}
// Tails 08-25-2002
static mprecipsecnode_t *P_DelPrecipSecnode(mprecipsecnode_t *node)
{
mprecipsecnode_t *tp; // prev node on thing thread
mprecipsecnode_t *tn; // next node on thing thread
mprecipsecnode_t *sp; // prev node on sector thread
mprecipsecnode_t *sn; // next node on sector thread
if (!node)
return NULL;
// Unlink from the Thing thread. The Thing thread begins at
// sector_list and not from mobj_t->touching_sectorlist.
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
tp = node->m_sectorlist_prev;
tn = node->m_sectorlist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (tp)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
tp->m_sectorlist_next = tn;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (tn)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
tn->m_sectorlist_prev = tp;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Unlink from the sector thread. This thread begins at
// sector_t->touching_thinglist.
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
sp = node->m_thinglist_prev;
sn = node->m_thinglist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (sp)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
sp->m_thinglist_next = sn;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
else
node->m_sector->touching_preciplist = sn;
if (sn)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
sn->m_thinglist_prev = sp;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Return this node to the freelist
P_PutPrecipSecnode(node);
return tn;
}
// Delete an entire sector list
void P_DelSeclist(msecnode_t *node)
{
while (node)
node = P_DelSecnode(node);
}
// Tails 08-25-2002
void P_DelPrecipSeclist(mprecipsecnode_t *node)
{
while (node)
node = P_DelPrecipSecnode(node);
}
// PIT_GetSectors
// Locates all the sectors the object is in by looking at the lines that
// cross through it. You have already decided that the object is allowed
// at this location, so don't bother with checking impassable or
// blocking lines.
static inline boolean PIT_GetSectors(line_t *ld)
{
if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] ||
tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
return true;
if (P_BoxOnLineSide(tmbbox, ld) != -1)
return true;
Don't add polyobjects to a mobj's sector nodes list. This causes the player to teeter whenever they are above the polyobject's bottom, whether or not it is solid Also, a minor tweak for the teetering code itself, though it looks a right mess and probably should be redone in the future
2016-02-28 18:30:29 +00:00
if (ld->polyobj) // line belongs to a polyobject, don't add it
return true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// This line crosses through the object.
// Collect the sector(s) from the line and add to the
// sector_list you're examining. If the Thing ends up being
// allowed to move to this position, then the sector_list
// will be attached to the Thing's mobj_t at touching_sectorlist.
sector_list = P_AddSecnode(ld->frontsector,tmthing,sector_list);
// Don't assume all lines are 2-sided, since some Things
// like MT_TFOG are allowed regardless of whether their radius takes
// them beyond an impassable linedef.
// Use sidedefs instead of 2s flag to determine two-sidedness.
if (ld->backsector)
sector_list = P_AddSecnode(ld->backsector, tmthing, sector_list);
return true;
}
// Tails 08-25-2002
static inline boolean PIT_GetPrecipSectors(line_t *ld)
{
if (preciptmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] ||
preciptmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
preciptmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
preciptmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
return true;
if (P_BoxOnLineSide(preciptmbbox, ld) != -1)
return true;
Don't add polyobjects to a mobj's sector nodes list. This causes the player to teeter whenever they are above the polyobject's bottom, whether or not it is solid Also, a minor tweak for the teetering code itself, though it looks a right mess and probably should be redone in the future
2016-02-28 18:30:29 +00:00
if (ld->polyobj) // line belongs to a polyobject, don't add it
return true;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// This line crosses through the object.
// Collect the sector(s) from the line and add to the
// sector_list you're examining. If the Thing ends up being
// allowed to move to this position, then the sector_list
// will be attached to the Thing's mobj_t at touching_sectorlist.
precipsector_list = P_AddPrecipSecnode(ld->frontsector, tmprecipthing, precipsector_list);
// Don't assume all lines are 2-sided, since some Things
// like MT_TFOG are allowed regardless of whether their radius takes
// them beyond an impassable linedef.
// Use sidedefs instead of 2s flag to determine two-sidedness.
if (ld->backsector)
precipsector_list = P_AddPrecipSecnode(ld->backsector, tmprecipthing, precipsector_list);
return true;
}
// P_CreateSecNodeList alters/creates the sector_list that shows what sectors
// the object resides in.
void P_CreateSecNodeList(mobj_t *thing, fixed_t x, fixed_t y)
{
INT32 xl, xh, yl, yh, bx, by;
msecnode_t *node = sector_list;
mobj_t *saved_tmthing = tmthing; /* cph - see comment at func end */
fixed_t saved_tmx = tmx, saved_tmy = tmy; /* ditto */
// First, clear out the existing m_thing fields. As each node is
// added or verified as needed, m_thing will be set properly. When
// finished, delete all nodes where m_thing is still NULL. These
// represent the sectors the Thing has vacated.
while (node)
{
node->m_thing = NULL;
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node = node->m_sectorlist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
P_SetTarget(&tmthing, thing);
tmflags = thing->flags;
tmx = x;
tmy = y;
tmbbox[BOXTOP] = y + tmthing->radius;
tmbbox[BOXBOTTOM] = y - tmthing->radius;
tmbbox[BOXRIGHT] = x + tmthing->radius;
tmbbox[BOXLEFT] = x - tmthing->radius;
validcount++; // used to make sure we only process a line once
Revert "Guess what major breaking-news bug I just fixed B)" This reverts commit 9e306394ddff993a5e5bb32bf9b3835203eea1ce. Sorry MI, but this completely breaks large maps like AGZ.
2015-04-09 01:50:49 +00:00
xl = (unsigned)(tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
xh = (unsigned)(tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
yl = (unsigned)(tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
yh = (unsigned)(tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix the west/south blockmap issue without fucking up huge maps
2015-04-09 02:32:07 +00:00
BMBOUNDFIX(xl, xh, yl, yh);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (bx = xl; bx <= xh; bx++)
for (by = yl; by <= yh; by++)
P_BlockLinesIterator(bx, by, PIT_GetSectors);
// Add the sector of the (x, y) point to sector_list.
sector_list = P_AddSecnode(thing->subsector->sector, thing, sector_list);
// Now delete any nodes that won't be used. These are the ones where
// m_thing is still NULL.
node = sector_list;
while (node)
{
if (!node->m_thing)
{
if (node == sector_list)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
sector_list = node->m_sectorlist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
node = P_DelSecnode(node);
}
else
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node = node->m_sectorlist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
/* cph -
* This is the strife we get into for using global variables. tmthing
* is being used by several different functions calling
* P_BlockThingIterator, including functions that can be called *from*
* P_BlockThingIterator. Using a global tmthing is not reentrant.
* OTOH for Boom/MBF demos we have to preserve the buggy behavior.
* Fun. We restore its previous value unless we're in a Boom/MBF demo.
*/
P_SetTarget(&tmthing, saved_tmthing);
/* And, duh, the same for tmx/y - cph 2002/09/22
* And for tmbbox - cph 2003/08/10 */
tmx = saved_tmx, tmy = saved_tmy;
if (tmthing)
{
tmbbox[BOXTOP] = tmy + tmthing->radius;
tmbbox[BOXBOTTOM] = tmy - tmthing->radius;
tmbbox[BOXRIGHT] = tmx + tmthing->radius;
tmbbox[BOXLEFT] = tmx - tmthing->radius;
}
}
// More crazy crap Tails 08-25-2002
void P_CreatePrecipSecNodeList(precipmobj_t *thing,fixed_t x,fixed_t y)
{
INT32 xl, xh, yl, yh, bx, by;
mprecipsecnode_t *node = precipsector_list;
precipmobj_t *saved_tmthing = tmprecipthing; /* cph - see comment at func end */
// First, clear out the existing m_thing fields. As each node is
// added or verified as needed, m_thing will be set properly. When
// finished, delete all nodes where m_thing is still NULL. These
// represent the sectors the Thing has vacated.
while (node)
{
node->m_thing = NULL;
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node = node->m_sectorlist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
tmprecipthing = thing;
preciptmbbox[BOXTOP] = y + 2*FRACUNIT;
preciptmbbox[BOXBOTTOM] = y - 2*FRACUNIT;
preciptmbbox[BOXRIGHT] = x + 2*FRACUNIT;
preciptmbbox[BOXLEFT] = x - 2*FRACUNIT;
validcount++; // used to make sure we only process a line once
Revert "Guess what major breaking-news bug I just fixed B)" This reverts commit 9e306394ddff993a5e5bb32bf9b3835203eea1ce. Sorry MI, but this completely breaks large maps like AGZ.
2015-04-09 01:50:49 +00:00
xl = (unsigned)(preciptmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
xh = (unsigned)(preciptmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
yl = (unsigned)(preciptmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
yh = (unsigned)(preciptmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
Fix the west/south blockmap issue without fucking up huge maps
2015-04-09 02:32:07 +00:00
BMBOUNDFIX(xl, xh, yl, yh);
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
for (bx = xl; bx <= xh; bx++)
for (by = yl; by <= yh; by++)
P_BlockLinesIterator(bx, by, PIT_GetPrecipSectors);
// Add the sector of the (x, y) point to sector_list.
precipsector_list = P_AddPrecipSecnode(thing->subsector->sector, thing, precipsector_list);
// Now delete any nodes that won't be used. These are the ones where
// m_thing is still NULL.
node = precipsector_list;
while (node)
{
if (!node->m_thing)
{
if (node == precipsector_list)
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
precipsector_list = node->m_sectorlist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
node = P_DelPrecipSecnode(node);
}
else
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance. * m_snext ==> m_thinglist_next * m_sprev ==> m_thinglist_prev * m_tnext ==> m_sectorlist_next * m_tprev ==> m_sectorlist_prev
2016-06-09 13:16:02 +00:00
node = node->m_sectorlist_next;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
/* cph -
* This is the strife we get into for using global variables. tmthing
* is being used by several different functions calling
* P_BlockThingIterator, including functions that can be called *from*
* P_BlockThingIterator. Using a global tmthing is not reentrant.
* OTOH for Boom/MBF demos we have to preserve the buggy behavior.
* Fun. We restore its previous value unless we're in a Boom/MBF demo.
*/
tmprecipthing = saved_tmthing;
}
/* cphipps 2004/08/30 -
* Must clear tmthing at tic end, as it might contain a pointer to a removed thinker, or the level might have ended/been ended and we clear the objects it was pointing too. Hopefully we don't need to carry this between tics for sync. */
void P_MapStart(void)
{
if (tmthing)
I_Error("P_MapStart: tmthing set!");
}
void P_MapEnd(void)
{
P_SetTarget(&tmthing, NULL);
}
// P_FloorzAtPos
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
// Returns the floorz of the XYZ position // TODO: Need ceilingpos function too
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Tails 05-26-2003
fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
{
sector_t *sec = R_PointInSubsector(x, y)->sector;
fixed_t floorz = sec->floorheight;
P_FloorzAtPos: Check the normal floor's slope as well as FOF slopes, silly.
2017-08-30 18:21:23 +00:00
#ifdef ESLOPE
if (sec->f_slope)
floorz = P_GetZAt(sec->f_slope, x, y);
#endif
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
// Intercept the stupid 'fall through 3dfloors' bug Tails 03-17-2002
if (sec->ffloors)
{
ffloor_t *rover;
fixed_t delta1, delta2, thingtop = z + height;
for (rover = sec->ffloors; rover; rover = rover->next)
{
We can compile the slopes code now, yay! My brain hurts. Compiling errors fixed in this commit: * Various cases of mixed declaration and statement code * Implicit declaration of slope functions (read: you forgot to put "include "p_slopes.h" in MORE than a few places) * an odd case of a bad fixed_t to float typecase, cause by using P_GetZAt directly inside FIXED_TO_FLOAT * a few minor cases of bad unsigned-signed comparisons * no prototypes for some of the new slope functions. For goodness sake Red, this is basic stuff!
2015-10-10 16:57:35 +00:00
fixed_t topheight, bottomheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (!(rover->flags & FF_EXISTS))
continue;
if ((!(rover->flags & FF_SOLID || rover->flags & FF_QUICKSAND) || (rover->flags & FF_SWIMMABLE)))
continue;
We can compile the slopes code now, yay! My brain hurts. Compiling errors fixed in this commit: * Various cases of mixed declaration and statement code * Implicit declaration of slope functions (read: you forgot to put "include "p_slopes.h" in MORE than a few places) * an odd case of a bad fixed_t to float typecase, cause by using P_GetZAt directly inside FIXED_TO_FLOAT * a few minor cases of bad unsigned-signed comparisons * no prototypes for some of the new slope functions. For goodness sake Red, this is basic stuff!
2015-10-10 16:57:35 +00:00
topheight = *rover->topheight;
bottomheight = *rover->bottomheight;
Overhaul slope collision (NOT PHYSICS) to work almost perfectly
2015-04-27 18:20:50 +00:00
Collision with FOF slopes (might be unfinished, idk)
2015-05-17 16:53:28 +00:00
#ifdef ESLOPE
if (*rover->t_slope)
topheight = P_GetZAt(*rover->t_slope, x, y);
if (*rover->b_slope)
bottomheight = P_GetZAt(*rover->b_slope, x, y);
#endif
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
if (rover->flags & FF_QUICKSAND)
{
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
if (z < topheight && bottomheight < thingtop)
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
{
if (floorz < z)
floorz = z;
}
continue;
}
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-19 00:45:57 +00:00
delta1 = z - (bottomheight + ((topheight - bottomheight)/2));
delta2 = thingtop - (bottomheight + ((topheight - bottomheight)/2));
if (topheight > floorz && abs(delta1) < abs(delta2))
floorz = topheight;
SRB2 2.1 release
2014-03-15 16:59:03 +00:00
}
}
return floorz;
}
Reference in a new issue Copy permalink