2006-02-24 04:48:15 +00:00
|
|
|
// Emacs style mode select -*- C++ -*-
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// $Id:$
|
|
|
|
//
|
|
|
|
// Copyright (C) 1993-1996 by id Software, Inc.
|
|
|
|
//
|
|
|
|
// This source is available for distribution and/or modification
|
|
|
|
// only under the terms of the DOOM Source Code License as
|
|
|
|
// published by id Software. All rights reserved.
|
|
|
|
//
|
|
|
|
// The source is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
|
|
|
|
// for more details.
|
|
|
|
//
|
|
|
|
// $Log:$
|
|
|
|
//
|
|
|
|
// DESCRIPTION:
|
|
|
|
// Moving object handling. Spawn functions.
|
|
|
|
//
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
// HEADER FILES ------------------------------------------------------------
|
|
|
|
|
|
|
|
#include "templates.h"
|
|
|
|
#include "m_alloc.h"
|
|
|
|
#include "i_system.h"
|
|
|
|
#include "m_random.h"
|
|
|
|
#include "doomdef.h"
|
|
|
|
#include "p_local.h"
|
|
|
|
#include "p_lnspec.h"
|
|
|
|
#include "p_effect.h"
|
|
|
|
#include "p_terrain.h"
|
|
|
|
#include "st_stuff.h"
|
|
|
|
#include "hu_stuff.h"
|
|
|
|
#include "s_sound.h"
|
|
|
|
#include "doomstat.h"
|
|
|
|
#include "v_video.h"
|
|
|
|
#include "c_cvars.h"
|
|
|
|
#include "b_bot.h" //Added by MC:
|
|
|
|
#include "stats.h"
|
|
|
|
#include "a_doomglobal.h"
|
|
|
|
#include "a_hexenglobal.h"
|
|
|
|
#include "a_sharedglobal.h"
|
|
|
|
#include "gi.h"
|
|
|
|
#include "sbar.h"
|
|
|
|
#include "p_acs.h"
|
|
|
|
#include "cmdlib.h"
|
|
|
|
#include "decallib.h"
|
|
|
|
#include "ravenshared.h"
|
|
|
|
#include "a_action.h"
|
|
|
|
#include "a_keys.h"
|
|
|
|
#include "p_conversation.h"
|
2007-05-28 14:46:49 +00:00
|
|
|
#include "thingdef/thingdef.h"
|
2006-11-25 04:26:04 +00:00
|
|
|
#include "g_game.h"
|
2007-12-20 20:22:31 +00:00
|
|
|
#include "teaminfo.h"
|
2007-12-26 16:06:03 +00:00
|
|
|
#include "r_translate.h"
|
2008-06-15 18:36:26 +00:00
|
|
|
#include "r_sky.h"
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// MACROS ------------------------------------------------------------------
|
|
|
|
|
|
|
|
#define WATER_SINK_FACTOR 3
|
|
|
|
#define WATER_SINK_SMALL_FACTOR 4
|
|
|
|
#define WATER_SINK_SPEED (FRACUNIT/2)
|
|
|
|
#define WATER_JUMP_SPEED (FRACUNIT*7/2)
|
|
|
|
|
|
|
|
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
|
|
|
|
|
|
|
|
void G_PlayerReborn (int player);
|
|
|
|
|
|
|
|
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
|
|
|
|
|
|
|
|
static void PlayerLandedOnThing (AActor *mo, AActor *onmobj);
|
|
|
|
|
|
|
|
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
|
|
|
|
|
|
|
|
extern cycle_t BotSupportCycles;
|
|
|
|
extern cycle_t BotWTG;
|
|
|
|
EXTERN_CVAR (Bool, r_drawfuzz);
|
2008-04-04 14:31:20 +00:00
|
|
|
EXTERN_CVAR (Int, cl_rockettrails)
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// PRIVATE DATA DEFINITIONS ------------------------------------------------
|
|
|
|
|
|
|
|
static bool SpawningMapThing;
|
|
|
|
static FRandom pr_explodemissile ("ExplodeMissile");
|
|
|
|
static FRandom pr_bounce ("Bounce");
|
|
|
|
static FRandom pr_reflect ("Reflect");
|
|
|
|
static FRandom pr_nightmarerespawn ("NightmareRespawn");
|
|
|
|
static FRandom pr_botspawnmobj ("BotSpawnActor");
|
|
|
|
static FRandom pr_spawnmapthing ("SpawnMapThing");
|
|
|
|
static FRandom pr_spawnpuff ("SpawnPuff");
|
|
|
|
static FRandom pr_spawnblood ("SpawnBlood");
|
|
|
|
static FRandom pr_splatter ("BloodSplatter");
|
2006-05-07 00:27:22 +00:00
|
|
|
static FRandom pr_takedamage ("TakeDamage");
|
2006-11-29 10:03:35 +00:00
|
|
|
static FRandom pr_splat ("FAxeSplatter");
|
2006-02-24 04:48:15 +00:00
|
|
|
static FRandom pr_ripperblood ("RipperBlood");
|
|
|
|
static FRandom pr_chunk ("Chunk");
|
|
|
|
static FRandom pr_checkmissilespawn ("CheckMissileSpawn");
|
|
|
|
static FRandom pr_spawnmissile ("SpawnMissile");
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
static FRandom pr_missiledamage ("MissileDamage");
|
2006-02-24 04:48:15 +00:00
|
|
|
FRandom pr_slam ("SkullSlam");
|
|
|
|
static FRandom pr_multiclasschoice ("MultiClassChoice");
|
2008-04-04 14:31:20 +00:00
|
|
|
static FRandom pr_rockettrail("RocketTrail");
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// PUBLIC DATA DEFINITIONS -------------------------------------------------
|
|
|
|
|
|
|
|
FRandom pr_spawnmobj ("SpawnActor");
|
|
|
|
|
|
|
|
CUSTOM_CVAR (Float, sv_gravity, 800.f, CVAR_SERVERINFO|CVAR_NOSAVE)
|
|
|
|
{
|
|
|
|
level.gravity = self;
|
|
|
|
}
|
|
|
|
|
|
|
|
CVAR (Bool, cl_missiledecals, true, CVAR_ARCHIVE)
|
|
|
|
CVAR (Bool, addrocketexplosion, false, CVAR_ARCHIVE)
|
|
|
|
|
|
|
|
fixed_t FloatBobOffsets[64] =
|
|
|
|
{
|
|
|
|
0, 51389, 102283, 152192,
|
|
|
|
200636, 247147, 291278, 332604,
|
|
|
|
370727, 405280, 435929, 462380,
|
|
|
|
484378, 501712, 514213, 521763,
|
|
|
|
524287, 521763, 514213, 501712,
|
|
|
|
484378, 462380, 435929, 405280,
|
|
|
|
370727, 332604, 291278, 247147,
|
|
|
|
200636, 152192, 102283, 51389,
|
|
|
|
-1, -51390, -102284, -152193,
|
|
|
|
-200637, -247148, -291279, -332605,
|
|
|
|
-370728, -405281, -435930, -462381,
|
|
|
|
-484380, -501713, -514215, -521764,
|
|
|
|
-524288, -521764, -514214, -501713,
|
|
|
|
-484379, -462381, -435930, -405280,
|
|
|
|
-370728, -332605, -291279, -247148,
|
|
|
|
-200637, -152193, -102284, -51389
|
|
|
|
};
|
|
|
|
|
|
|
|
fixed_t FloatBobDiffs[64] =
|
|
|
|
{
|
|
|
|
51389, 51389, 50894, 49909, 48444,
|
|
|
|
46511, 44131, 41326, 38123,
|
|
|
|
34553, 30649, 26451, 21998,
|
|
|
|
17334, 12501, 7550, 2524,
|
|
|
|
-2524, -7550, -12501, -17334,
|
|
|
|
-21998, -26451, -30649, -34553,
|
|
|
|
-38123, -41326, -44131, -46511,
|
|
|
|
-48444, -49909, -50894, -51390,
|
|
|
|
-51389, -50894, -49909, -48444,
|
|
|
|
-46511, -44131, -41326, -38123,
|
|
|
|
-34553, -30649, -26451, -21999,
|
|
|
|
-17333, -12502, -7549, -2524,
|
|
|
|
2524, 7550, 12501, 17334,
|
|
|
|
21998, 26451, 30650, 34552,
|
|
|
|
38123, 41326, 44131, 46511,
|
|
|
|
48444, 49909, 50895
|
|
|
|
};
|
|
|
|
|
|
|
|
CVAR (Int, cl_pufftype, 0, CVAR_ARCHIVE);
|
|
|
|
CVAR (Int, cl_bloodtype, 0, CVAR_ARCHIVE);
|
|
|
|
|
|
|
|
// CODE --------------------------------------------------------------------
|
|
|
|
|
|
|
|
IMPLEMENT_POINTY_CLASS (AActor)
|
|
|
|
DECLARE_POINTER (target)
|
|
|
|
DECLARE_POINTER (lastenemy)
|
|
|
|
DECLARE_POINTER (tracer)
|
|
|
|
DECLARE_POINTER (goal)
|
2008-03-12 02:56:11 +00:00
|
|
|
DECLARE_POINTER (LastLookActor)
|
2006-02-24 04:48:15 +00:00
|
|
|
DECLARE_POINTER (Inventory)
|
|
|
|
DECLARE_POINTER (LastHeard)
|
|
|
|
DECLARE_POINTER (master)
|
|
|
|
END_POINTERS
|
|
|
|
|
|
|
|
AActor::~AActor ()
|
|
|
|
{
|
|
|
|
// Please avoid calling the destructor directly (or through delete)!
|
|
|
|
// Use Destroy() instead.
|
|
|
|
}
|
|
|
|
|
|
|
|
void AActor::Serialize (FArchive &arc)
|
|
|
|
{
|
|
|
|
Super::Serialize (arc);
|
|
|
|
|
|
|
|
if (arc.IsStoring ())
|
|
|
|
{
|
|
|
|
arc.WriteSprite (sprite);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sprite = arc.ReadSprite ();
|
|
|
|
}
|
|
|
|
|
|
|
|
arc << x
|
|
|
|
<< y
|
|
|
|
<< z
|
|
|
|
<< angle
|
|
|
|
<< frame
|
2006-11-14 16:54:02 +00:00
|
|
|
<< scaleX
|
|
|
|
<< scaleY
|
2006-02-24 04:48:15 +00:00
|
|
|
<< RenderStyle
|
2008-06-15 18:36:26 +00:00
|
|
|
<< renderflags
|
|
|
|
<< picnum
|
|
|
|
<< floorpic
|
|
|
|
<< ceilingpic
|
|
|
|
<< TIDtoHate
|
|
|
|
<< LastLookPlayerNumber
|
|
|
|
<< LastLookActor
|
|
|
|
<< effects
|
2006-02-24 04:48:15 +00:00
|
|
|
<< alpha
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
<< fillcolor
|
2006-02-24 04:48:15 +00:00
|
|
|
<< pitch
|
|
|
|
<< roll
|
|
|
|
<< Sector
|
|
|
|
<< floorz
|
|
|
|
<< ceilingz
|
|
|
|
<< dropoffz
|
2006-04-11 16:27:41 +00:00
|
|
|
<< floorsector
|
2006-04-17 13:53:34 +00:00
|
|
|
<< ceilingsector
|
2006-04-11 16:27:41 +00:00
|
|
|
<< radius
|
2006-02-24 04:48:15 +00:00
|
|
|
<< height
|
|
|
|
<< momx
|
|
|
|
<< momy
|
|
|
|
<< momz
|
|
|
|
<< tics
|
|
|
|
<< state
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
<< Damage
|
2006-02-24 04:48:15 +00:00
|
|
|
<< flags
|
|
|
|
<< flags2
|
|
|
|
<< flags3
|
|
|
|
<< flags4
|
2006-04-16 13:29:50 +00:00
|
|
|
<< flags5
|
2006-02-24 04:48:15 +00:00
|
|
|
<< special1
|
|
|
|
<< special2
|
|
|
|
<< health
|
|
|
|
<< movedir
|
|
|
|
<< visdir
|
|
|
|
<< movecount
|
|
|
|
<< target
|
|
|
|
<< lastenemy
|
|
|
|
<< LastHeard
|
|
|
|
<< reactiontime
|
|
|
|
<< threshold
|
|
|
|
<< player
|
|
|
|
<< SpawnPoint[0] << SpawnPoint[1] << SpawnPoint[2]
|
|
|
|
<< SpawnAngle
|
2008-01-26 16:42:16 +00:00
|
|
|
<< skillrespawncount
|
2006-02-24 04:48:15 +00:00
|
|
|
<< tracer
|
|
|
|
<< floorclip
|
|
|
|
<< tid
|
|
|
|
<< special
|
|
|
|
<< args[0] << args[1] << args[2] << args[3] << args[4]
|
|
|
|
<< goal
|
|
|
|
<< waterlevel
|
|
|
|
<< MinMissileChance
|
|
|
|
<< SpawnFlags
|
|
|
|
<< Inventory
|
|
|
|
<< InventoryID
|
|
|
|
<< id
|
|
|
|
<< FloatBobPhase
|
|
|
|
<< Translation
|
2008-06-15 02:25:09 +00:00
|
|
|
<< SeeSound
|
|
|
|
<< AttackSound
|
|
|
|
<< PainSound
|
|
|
|
<< DeathSound
|
|
|
|
<< ActiveSound
|
|
|
|
<< UseSound
|
2006-02-24 04:48:15 +00:00
|
|
|
<< Speed
|
2006-05-14 14:30:13 +00:00
|
|
|
<< FloatSpeed
|
2006-02-24 04:48:15 +00:00
|
|
|
<< Mass
|
|
|
|
<< PainChance
|
|
|
|
<< SpawnState
|
|
|
|
<< SeeState
|
|
|
|
<< MeleeState
|
|
|
|
<< MissileState
|
2006-04-11 16:27:41 +00:00
|
|
|
<< MaxDropOffHeight
|
|
|
|
<< MaxStepHeight
|
|
|
|
<< bouncefactor
|
2008-06-10 09:16:01 +00:00
|
|
|
<< wallbouncefactor
|
2006-04-18 22:15:05 +00:00
|
|
|
<< bouncecount
|
2007-04-22 21:01:35 +00:00
|
|
|
<< maxtargetrange
|
|
|
|
<< meleethreshold
|
2006-04-11 16:27:41 +00:00
|
|
|
<< meleerange
|
2007-01-20 14:27:44 +00:00
|
|
|
<< DamageType
|
2007-11-28 13:53:55 +00:00
|
|
|
<< gravity
|
2008-03-12 13:48:35 +00:00
|
|
|
<< FastChaseStrafeCount
|
2008-04-04 14:31:20 +00:00
|
|
|
<< master
|
2008-04-08 20:52:49 +00:00
|
|
|
<< smokecounter
|
|
|
|
<< BlockingMobj
|
|
|
|
<< BlockingLine;
|
2008-03-01 13:12:33 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
if (arc.IsStoring ())
|
|
|
|
{
|
|
|
|
int convnum = 0;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
if (Conversation != NULL)
|
|
|
|
{
|
|
|
|
for (i = 0; i < StrifeDialogues.Size(); ++i)
|
|
|
|
{
|
|
|
|
if (StrifeDialogues[i] == GetDefault()->Conversation)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (; i + convnum < StrifeDialogues.Size(); ++convnum)
|
|
|
|
{
|
|
|
|
if (StrifeDialogues[i + convnum] == Conversation)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (i + convnum < StrifeDialogues.Size())
|
|
|
|
{
|
|
|
|
convnum++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
convnum = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
arc.WriteCount (convnum);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int convnum;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
convnum = arc.ReadCount();
|
|
|
|
if (convnum == 0 || GetDefault()->Conversation == NULL)
|
|
|
|
{
|
|
|
|
Conversation = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i = 0; i < StrifeDialogues.Size(); ++i)
|
|
|
|
{
|
|
|
|
if (StrifeDialogues[i] == GetDefault()->Conversation)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (i + convnum <= StrifeDialogues.Size())
|
|
|
|
{
|
|
|
|
Conversation = StrifeDialogues[i + convnum - 1];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Conversation = GetDefault()->Conversation;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (arc.IsLoading ())
|
|
|
|
{
|
|
|
|
touching_sectorlist = NULL;
|
|
|
|
LinkToWorld (Sector);
|
|
|
|
AddToHash ();
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
SetShade (fillcolor);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (player)
|
|
|
|
{
|
2006-07-13 10:17:56 +00:00
|
|
|
if (playeringame[player - players] &&
|
|
|
|
player->cls != NULL &&
|
|
|
|
state->sprite.index ==
|
|
|
|
GetDefaultByType (player->cls)->SpawnState->sprite.index)
|
2006-02-24 04:48:15 +00:00
|
|
|
{ // Give player back the skin
|
2006-07-13 10:17:56 +00:00
|
|
|
sprite = skins[player->userinfo.skin].sprite;
|
2008-04-27 22:33:19 +00:00
|
|
|
scaleX = skins[player->userinfo.skin].ScaleX;
|
|
|
|
scaleY = skins[player->userinfo.skin].ScaleY;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
if (Speed == 0)
|
|
|
|
{
|
|
|
|
Speed = GetDefault()->Speed;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PrevX = x;
|
|
|
|
PrevY = y;
|
|
|
|
PrevZ = z;
|
2007-01-07 09:43:58 +00:00
|
|
|
UpdateWaterLevel(z, false);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-05-08 08:06:26 +00:00
|
|
|
void FMapThing::Serialize (FArchive &arc)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
arc << thingid << x << y << z << angle << type << flags << special
|
|
|
|
<< args[0] << args[1] << args[2] << args[3] << args[4];
|
|
|
|
}
|
|
|
|
|
|
|
|
AActor::AActor () throw()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
AActor::AActor (const AActor &other) throw()
|
|
|
|
{
|
2006-09-14 00:02:31 +00:00
|
|
|
memcpy (&x, &other.x, (BYTE *)&this[1] - (BYTE *)&x);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
AActor &AActor::operator= (const AActor &other)
|
|
|
|
{
|
2006-09-14 00:02:31 +00:00
|
|
|
memcpy (&x, &other.x, (BYTE *)&this[1] - (BYTE *)&x);
|
2006-02-24 04:48:15 +00:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2006-04-16 13:29:50 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// AActor::InStateSequence
|
|
|
|
//
|
|
|
|
// Checks whether the current state is in a contiguous sequence that
|
|
|
|
// starts with basestate
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
bool AActor::InStateSequence(FState * newstate, FState * basestate)
|
|
|
|
{
|
|
|
|
if (basestate == NULL) return false;
|
|
|
|
|
|
|
|
FState * thisstate = basestate;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (newstate == thisstate) return true;
|
|
|
|
basestate = thisstate;
|
|
|
|
thisstate = thisstate->GetNextState();
|
|
|
|
}
|
|
|
|
while (thisstate == basestate+1);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// AActor::GetTics
|
|
|
|
//
|
|
|
|
// Get the actual duration of the next state
|
|
|
|
// This is a more generalized attempt to make the Demon faster in
|
|
|
|
// nightmare mode. Actually changing the states' durations has to
|
|
|
|
// be considered highly problematic.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
int AActor::GetTics(FState * newstate)
|
|
|
|
{
|
|
|
|
int tics = newstate->GetTics();
|
|
|
|
|
2007-10-29 22:15:46 +00:00
|
|
|
if (isFast())
|
2006-04-16 13:29:50 +00:00
|
|
|
{
|
|
|
|
if (flags5 & MF5_FASTER)
|
|
|
|
{
|
|
|
|
if (InStateSequence(newstate, SeeState)) return tics - (tics>>1);
|
|
|
|
}
|
|
|
|
if (flags5 & MF5_FASTMELEE)
|
|
|
|
{
|
|
|
|
if (InStateSequence(newstate, MeleeState)) return tics - (tics>>1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return tics;
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// AActor::SetState
|
|
|
|
//
|
|
|
|
// Returns true if the mobj is still present.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
bool AActor::SetState (FState *newstate)
|
|
|
|
{
|
|
|
|
if (debugfile && player && (player->cheats & CF_PREDICTING))
|
2008-05-14 03:39:30 +00:00
|
|
|
fprintf (debugfile, "for pl %td: SetState while predicting!\n", player-players);
|
2006-02-24 04:48:15 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
if (newstate == NULL)
|
|
|
|
{
|
|
|
|
state = NULL;
|
|
|
|
Destroy ();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
int prevsprite, newsprite;
|
|
|
|
|
|
|
|
if (state != NULL)
|
|
|
|
{
|
|
|
|
prevsprite = state->sprite.index;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
prevsprite = -1;
|
|
|
|
}
|
|
|
|
state = newstate;
|
2006-04-16 13:29:50 +00:00
|
|
|
tics = GetTics(newstate);
|
2006-02-24 04:48:15 +00:00
|
|
|
renderflags = (renderflags & ~RF_FULLBRIGHT) | newstate->GetFullbright();
|
|
|
|
newsprite = newstate->sprite.index;
|
|
|
|
if (newsprite != 1)
|
|
|
|
{
|
|
|
|
// Sprite 1 is ----, which means "do not change the sprite"
|
|
|
|
frame = newstate->GetFrame();
|
|
|
|
|
|
|
|
if (!(flags4 & MF4_NOSKIN) && newsprite == SpawnState->sprite.index)
|
|
|
|
{ // [RH] If the new sprite is the same as the original sprite, and
|
|
|
|
// this actor is attached to a player, use the player's skin's
|
|
|
|
// sprite. If a player is not attached, do not change the sprite
|
|
|
|
// unless it is different from the previous state's sprite; a
|
|
|
|
// player may have been attached, died, and respawned elsewhere,
|
|
|
|
// and we do not want to lose the skin on the body. If it wasn't
|
|
|
|
// for Dehacked, I would move sprite changing out of the states
|
|
|
|
// altogether, since actors rarely change their sprites after
|
|
|
|
// spawning.
|
|
|
|
if (player != NULL)
|
|
|
|
{
|
|
|
|
sprite = skins[player->userinfo.skin].sprite;
|
|
|
|
}
|
|
|
|
else if (newsprite != prevsprite)
|
|
|
|
{
|
|
|
|
sprite = newsprite;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sprite = newsprite;
|
|
|
|
}
|
|
|
|
}
|
2007-07-28 12:38:10 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
if (newstate->GetAction())
|
|
|
|
{
|
|
|
|
// The parameterized action functions need access to the current state and
|
|
|
|
// if a function is supposed to work with both actors and weapons
|
|
|
|
// there is no real means to get to it reliably so I store it in a global variable here.
|
|
|
|
// Yes, I know this is truly awful but it is the only method I can think of
|
|
|
|
// that does not involve changing stuff throughout the code.
|
|
|
|
// Of course this should be rewritten ASAP.
|
|
|
|
CallingState = newstate;
|
|
|
|
newstate->GetAction() (this);
|
2006-09-17 10:43:51 +00:00
|
|
|
|
|
|
|
// Check whether the called action function resulted in destroying the actor
|
2008-03-12 02:56:11 +00:00
|
|
|
if (ObjectFlags & OF_EuthanizeMe)
|
|
|
|
return false;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
newstate = newstate->GetNextState();
|
|
|
|
} while (tics == 0);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// FUNC AActor::SetStateNF
|
|
|
|
//
|
|
|
|
// Same as SetState, but does not call the state function.
|
|
|
|
//
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
bool AActor::SetStateNF (FState *newstate)
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (newstate == NULL)
|
|
|
|
{
|
|
|
|
state = NULL;
|
|
|
|
Destroy ();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
int prevsprite, newsprite;
|
|
|
|
|
|
|
|
if (state != NULL)
|
|
|
|
{
|
|
|
|
prevsprite = state->sprite.index;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
prevsprite = -1;
|
|
|
|
}
|
|
|
|
state = newstate;
|
2006-04-16 13:29:50 +00:00
|
|
|
tics = GetTics(newstate);
|
2006-02-24 04:48:15 +00:00
|
|
|
renderflags = (renderflags & ~RF_FULLBRIGHT) | newstate->GetFullbright();
|
|
|
|
newsprite = newstate->sprite.index;
|
|
|
|
if (newsprite != 1)
|
|
|
|
{
|
|
|
|
// Sprite 1 is ----, which means "do not change the sprite"
|
|
|
|
|
|
|
|
frame = newstate->GetFrame();
|
|
|
|
if (!(flags4 & MF4_NOSKIN) && newsprite == SpawnState->sprite.index)
|
|
|
|
{
|
|
|
|
if (player != NULL && gameinfo.gametype != GAME_Hexen)
|
|
|
|
{
|
|
|
|
sprite = skins[player->userinfo.skin].sprite;
|
|
|
|
}
|
|
|
|
else if (newsprite != prevsprite)
|
|
|
|
{
|
|
|
|
sprite = newsprite;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sprite = newsprite;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
newstate = newstate->GetNextState();
|
|
|
|
} while (tics == 0);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: AddInventory
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void AActor::AddInventory (AInventory *item)
|
|
|
|
{
|
|
|
|
// Check if it's already attached to an actor
|
|
|
|
if (item->Owner != NULL)
|
|
|
|
{
|
|
|
|
// Is it attached to us?
|
|
|
|
if (item->Owner == this)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// No, then remove it from the other actor first
|
|
|
|
item->Owner->RemoveInventory (item);
|
|
|
|
}
|
|
|
|
|
|
|
|
item->Owner = this;
|
|
|
|
item->Inventory = Inventory;
|
|
|
|
Inventory = item;
|
|
|
|
|
|
|
|
// Each item receives an unique ID when added to an actor's inventory.
|
|
|
|
// This is used by the DEM_INVUSE command to identify the item. Simply
|
|
|
|
// using the item's position in the list won't work, because ticcmds get
|
|
|
|
// run sometime in the future, so by the time it runs, the inventory
|
|
|
|
// might not be in the same state as it was when DEM_INVUSE was sent.
|
|
|
|
Inventory->InventoryID = InventoryID++;
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: RemoveInventory
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void AActor::RemoveInventory (AInventory *item)
|
|
|
|
{
|
|
|
|
AInventory *inv, **invp;
|
|
|
|
|
|
|
|
invp = &item->Owner->Inventory;
|
|
|
|
for (inv = *invp; inv != NULL; invp = &inv->Inventory, inv = *invp)
|
|
|
|
{
|
|
|
|
if (inv == item)
|
|
|
|
{
|
|
|
|
*invp = item->Inventory;
|
|
|
|
item->DetachFromOwner ();
|
|
|
|
item->Owner = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-18 04:10:47 +00:00
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: DestroyAllInventory
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void AActor::DestroyAllInventory ()
|
|
|
|
{
|
|
|
|
while (Inventory != NULL)
|
|
|
|
{
|
2006-06-20 20:30:39 +00:00
|
|
|
AInventory *item = Inventory;
|
|
|
|
item->Destroy ();
|
|
|
|
assert (item != Inventory);
|
2006-06-18 04:10:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: FirstInv
|
|
|
|
//
|
|
|
|
// Returns the first item in this actor's inventory that has IF_INVBAR set.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2008-03-12 02:56:11 +00:00
|
|
|
AInventory *AActor::FirstInv ()
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
if (Inventory == NULL)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (Inventory->ItemFlags & IF_INVBAR)
|
|
|
|
{
|
|
|
|
return Inventory;
|
|
|
|
}
|
|
|
|
return Inventory->NextInv ();
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: UseInventory
|
|
|
|
//
|
|
|
|
// Attempts to use an item. If the use succeeds, one copy of the item is
|
|
|
|
// removed from the inventory. If all copies are removed, then the item is
|
|
|
|
// destroyed.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
bool AActor::UseInventory (AInventory *item)
|
|
|
|
{
|
|
|
|
// No using items if you're dead.
|
|
|
|
if (health <= 0)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2007-03-07 02:24:24 +00:00
|
|
|
// Don't use it if you don't actually have any of it.
|
|
|
|
if (item->Amount <= 0)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
if (!item->Use (false))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2008-01-09 02:53:38 +00:00
|
|
|
|
|
|
|
if (dmflags2 & DF2_INFINITE_INVENTORY)
|
|
|
|
return true;
|
|
|
|
|
2007-03-07 02:24:24 +00:00
|
|
|
if (--item->Amount <= 0 && !(item->ItemFlags & IF_KEEPDEPLETED))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
item->Destroy ();
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
//===========================================================================
|
|
|
|
//
|
|
|
|
// AActor :: DropInventory
|
|
|
|
//
|
|
|
|
// Removes a single copy of an item and throws it out in front of the actor.
|
|
|
|
//
|
|
|
|
//===========================================================================
|
|
|
|
|
|
|
|
AInventory *AActor::DropInventory (AInventory *item)
|
|
|
|
{
|
|
|
|
fixed_t dropdist;
|
|
|
|
angle_t an;
|
|
|
|
AInventory *drop = item->CreateTossable ();
|
|
|
|
|
|
|
|
if (drop == NULL)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
an = angle >> ANGLETOFINESHIFT;
|
|
|
|
/* 92682 = sqrt(2) * FRACUNIT */
|
|
|
|
dropdist = FixedMul (92682, radius + 8*FRACUNIT + item->radius);
|
|
|
|
drop->x = x;
|
|
|
|
drop->y = y;
|
|
|
|
drop->z = z + 10*FRACUNIT;
|
|
|
|
P_TryMove (drop, x, y, true);
|
|
|
|
drop->angle = angle;
|
|
|
|
drop->momx = momx + 5 * finecosine[an];
|
|
|
|
drop->momy = momy + 5 * finesine[an];
|
|
|
|
drop->momz = momz + FRACUNIT;
|
|
|
|
drop->flags &= ~MF_NOGRAVITY; // Don't float
|
|
|
|
return drop;
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: FindInventory
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2008-03-12 02:56:11 +00:00
|
|
|
AInventory *AActor::FindInventory (const PClass *type)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
AInventory *item;
|
|
|
|
|
2006-07-09 20:15:38 +00:00
|
|
|
if (type == NULL) return NULL;
|
|
|
|
|
2006-07-08 02:17:35 +00:00
|
|
|
assert (type->ActorInfo != NULL);
|
2006-02-24 04:48:15 +00:00
|
|
|
for (item = Inventory; item != NULL; item = item->Inventory)
|
|
|
|
{
|
|
|
|
if (item->GetClass() == type)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
2008-03-12 02:56:11 +00:00
|
|
|
AInventory *AActor::FindInventory (FName type)
|
2006-12-25 13:43:11 +00:00
|
|
|
{
|
|
|
|
return FindInventory(PClass::FindClass(type));
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: GiveInventoryType
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
AInventory *AActor::GiveInventoryType (const PClass *type)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
AInventory *item;
|
|
|
|
|
2006-07-16 09:10:45 +00:00
|
|
|
item = static_cast<AInventory *>(Spawn (type, 0,0,0, NO_REPLACE));
|
2006-02-24 04:48:15 +00:00
|
|
|
if (!item->TryPickup (this))
|
|
|
|
{
|
|
|
|
item->Destroy ();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: GiveAmmo
|
|
|
|
//
|
|
|
|
// Returns true if the ammo was added, false if not.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
bool AActor::GiveAmmo (const PClass *type, int amount)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2007-10-29 20:27:40 +00:00
|
|
|
if (type != NULL)
|
2006-05-18 04:25:26 +00:00
|
|
|
{
|
2007-10-29 20:27:40 +00:00
|
|
|
AInventory *item = static_cast<AInventory *>(Spawn (type, 0, 0, 0, NO_REPLACE));
|
|
|
|
if (item)
|
|
|
|
{
|
|
|
|
item->Amount = amount;
|
|
|
|
item->flags |= MF_DROPPED;
|
|
|
|
if (!item->TryPickup (this))
|
|
|
|
{
|
|
|
|
item->Destroy ();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
2006-05-18 04:25:26 +00:00
|
|
|
}
|
2007-10-29 20:27:40 +00:00
|
|
|
return false;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: CopyFriendliness
|
|
|
|
//
|
|
|
|
// Makes this actor hate (or like) the same things another actor does.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2008-03-12 02:56:11 +00:00
|
|
|
void AActor::CopyFriendliness (AActor *other, bool changeTarget)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-04-16 13:29:50 +00:00
|
|
|
level.total_monsters -= CountsAsKill();
|
2006-02-24 04:48:15 +00:00
|
|
|
TIDtoHate = other->TIDtoHate;
|
2008-03-12 02:56:11 +00:00
|
|
|
LastLookActor = other->LastLookActor;
|
|
|
|
LastLookPlayerNumber = other->LastLookPlayerNumber;
|
2006-02-24 04:48:15 +00:00
|
|
|
flags = (flags & ~MF_FRIENDLY) | (other->flags & MF_FRIENDLY);
|
|
|
|
flags3 = (flags3 & ~(MF3_NOSIGHTCHECK | MF3_HUNTPLAYERS)) | (other->flags3 & (MF3_NOSIGHTCHECK | MF3_HUNTPLAYERS));
|
|
|
|
flags4 = (flags4 & ~MF4_NOHATEPLAYERS) | (other->flags4 & MF4_NOHATEPLAYERS);
|
|
|
|
FriendPlayer = other->FriendPlayer;
|
2007-09-25 23:49:20 +00:00
|
|
|
if (changeTarget && other->target != NULL && !(other->target->flags3 & MF3_NOTARGET))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-08-01 22:11:49 +00:00
|
|
|
// LastHeard must be set as well so that A_Look can react to the new target if called
|
|
|
|
LastHeard = target = other->target;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2006-04-16 13:29:50 +00:00
|
|
|
level.total_monsters += CountsAsKill();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: ObtainInventory
|
|
|
|
//
|
|
|
|
// Removes the items from the other actor and puts them in this actor's
|
|
|
|
// inventory. The actor receiving the inventory must not have any items.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void AActor::ObtainInventory (AActor *other)
|
|
|
|
{
|
2007-03-14 01:48:19 +00:00
|
|
|
assert (Inventory == NULL);
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
Inventory = other->Inventory;
|
|
|
|
InventoryID = other->InventoryID;
|
|
|
|
other->Inventory = NULL;
|
|
|
|
other->InventoryID = 0;
|
|
|
|
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
if (other->IsKindOf(RUNTIME_CLASS(APlayerPawn)) && this->IsKindOf(RUNTIME_CLASS(APlayerPawn)))
|
|
|
|
{
|
|
|
|
APlayerPawn *you = static_cast<APlayerPawn *>(other);
|
|
|
|
APlayerPawn *me = static_cast<APlayerPawn *>(this);
|
|
|
|
me->InvFirst = you->InvFirst;
|
|
|
|
me->InvSel = you->InvSel;
|
|
|
|
you->InvFirst = NULL;
|
|
|
|
you->InvSel = NULL;
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
AInventory *item = Inventory;
|
|
|
|
while (item != NULL)
|
|
|
|
{
|
|
|
|
item->Owner = this;
|
|
|
|
item = item->Inventory;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: CheckLocalView
|
|
|
|
//
|
|
|
|
// Returns true if this actor is local for the player. Here, local means the
|
|
|
|
// player is either looking out this actor's eyes, or this actor is the player
|
|
|
|
// and the player is looking out the eyes of something non-"sentient."
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
bool AActor::CheckLocalView (int playernum) const
|
|
|
|
{
|
|
|
|
if (players[playernum].camera == this)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if (players[playernum].mo != this || players[playernum].camera == NULL)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (players[playernum].camera->player == NULL &&
|
|
|
|
!(players[playernum].camera->flags3 & MF3_ISMONSTER))
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: ConversationAnimation
|
|
|
|
//
|
|
|
|
// Plays a conversation-related animation:
|
|
|
|
// 0 = greeting
|
|
|
|
// 1 = "yes"
|
|
|
|
// 2 = "no"
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void AActor::ConversationAnimation (int animnum)
|
|
|
|
{
|
2006-10-31 14:53:21 +00:00
|
|
|
FState * state = NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
switch (animnum)
|
|
|
|
{
|
|
|
|
case 0:
|
2006-10-31 14:53:21 +00:00
|
|
|
state = FindState(NAME_Greetings);
|
2006-02-24 04:48:15 +00:00
|
|
|
break;
|
|
|
|
case 1:
|
2006-10-31 14:53:21 +00:00
|
|
|
state = FindState(NAME_Yes);
|
2006-02-24 04:48:15 +00:00
|
|
|
break;
|
|
|
|
case 2:
|
2006-10-31 14:53:21 +00:00
|
|
|
state = FindState(NAME_No);
|
2006-02-24 04:48:15 +00:00
|
|
|
break;
|
|
|
|
}
|
2006-10-31 14:53:21 +00:00
|
|
|
if (state != NULL) SetState(state);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: Touch
|
|
|
|
//
|
|
|
|
// Something just touched this actor. Normally used only for inventory items,
|
|
|
|
// but some Strife monsters also use it.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void AActor::Touch (AActor *toucher)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// AActor :: Massacre
|
|
|
|
//
|
|
|
|
// Called by the massacre cheat to kill monsters. Returns true if the monster
|
|
|
|
// was killed and false if it was already dead.
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
bool AActor::Massacre ()
|
|
|
|
{
|
2006-04-11 08:36:23 +00:00
|
|
|
int prevhealth;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
if (health > 0)
|
|
|
|
{
|
|
|
|
flags |= MF_SHOOTABLE;
|
|
|
|
flags2 &= ~(MF2_DORMANT|MF2_INVULNERABLE);
|
|
|
|
do
|
|
|
|
{
|
2006-04-11 08:36:23 +00:00
|
|
|
prevhealth = health;
|
2006-10-31 14:53:21 +00:00
|
|
|
P_DamageMobj (this, NULL, NULL, 1000000, NAME_Massacre);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2006-04-11 08:36:23 +00:00
|
|
|
while (health != prevhealth && health > 0); //abort if the actor wasn't hurt.
|
2006-02-24 04:48:15 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_ExplodeMissile
|
|
|
|
//
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
|
2006-10-22 10:32:41 +00:00
|
|
|
void P_ExplodeMissile (AActor *mo, line_t *line, AActor *target)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
if (mo->flags3 & MF3_EXPLOCOUNT)
|
|
|
|
{
|
|
|
|
if (++mo->special2 < mo->special1)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mo->momx = mo->momy = mo->momz = 0;
|
|
|
|
mo->effects = 0; // [RH]
|
2006-10-22 10:32:41 +00:00
|
|
|
|
|
|
|
FState *nextstate=NULL;
|
|
|
|
|
2006-10-31 14:53:21 +00:00
|
|
|
if (target != NULL && target->flags & (MF_SHOOTABLE|MF_CORPSE))
|
2006-10-22 10:32:41 +00:00
|
|
|
{
|
2006-10-31 14:53:21 +00:00
|
|
|
if (target->flags & MF_NOBLOOD) nextstate = mo->FindState(NAME_Crash);
|
2006-12-16 14:06:21 +00:00
|
|
|
if (nextstate == NULL) nextstate = mo->FindState(NAME_Death, NAME_Extreme);
|
2006-10-22 10:32:41 +00:00
|
|
|
}
|
2006-10-31 14:53:21 +00:00
|
|
|
if (nextstate == NULL) nextstate = mo->FindState(NAME_Death);
|
2006-10-22 10:32:41 +00:00
|
|
|
mo->SetState (nextstate);
|
|
|
|
|
2008-03-12 02:56:11 +00:00
|
|
|
if (mo->ObjectFlags & OF_EuthanizeMe)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (line != NULL && line->special == Line_Horizon)
|
|
|
|
{
|
|
|
|
// [RH] Don't explode missiles on horizon lines.
|
|
|
|
mo->Destroy ();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (line != NULL && cl_missiledecals)
|
|
|
|
{
|
|
|
|
int side = P_PointOnLineSide (mo->x, mo->y, line);
|
|
|
|
if (line->sidenum[side] == NO_SIDE)
|
|
|
|
side ^= 1;
|
|
|
|
if (line->sidenum[side] != NO_SIDE)
|
|
|
|
{
|
|
|
|
FDecalBase *base = mo->DecalGenerator;
|
|
|
|
if (base != NULL)
|
|
|
|
{
|
|
|
|
// Find the nearest point on the line, and stick a decal there
|
|
|
|
fixed_t x, y, z;
|
|
|
|
SQWORD num, den;
|
|
|
|
|
|
|
|
den = (SQWORD)line->dx*line->dx + (SQWORD)line->dy*line->dy;
|
|
|
|
if (den != 0)
|
|
|
|
{
|
|
|
|
SDWORD frac;
|
|
|
|
|
|
|
|
num = (SQWORD)(mo->x-line->v1->x)*line->dx+(SQWORD)(mo->y-line->v1->y)*line->dy;
|
|
|
|
if (num <= 0)
|
|
|
|
{
|
|
|
|
frac = 0;
|
|
|
|
}
|
|
|
|
else if (num >= den)
|
|
|
|
{
|
|
|
|
frac = 1<<30;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
frac = (SDWORD)(num / (den>>30));
|
|
|
|
}
|
|
|
|
|
|
|
|
x = line->v1->x + MulScale30 (line->dx, frac);
|
|
|
|
y = line->v1->y + MulScale30 (line->dy, frac);
|
|
|
|
z = mo->z;
|
|
|
|
|
2006-04-12 01:50:09 +00:00
|
|
|
DImpactDecal::StaticCreate (base->GetDecal (),
|
2006-02-24 04:48:15 +00:00
|
|
|
x, y, z, sides + line->sidenum[side]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-31 14:53:21 +00:00
|
|
|
if (nextstate != NULL)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
// [RH] Change render style of exploding rockets
|
2006-10-15 20:27:16 +00:00
|
|
|
if (mo->flags5 & MF5_DEHEXPLOSION)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
if (deh.ExplosionStyle == 255)
|
|
|
|
{
|
|
|
|
if (addrocketexplosion)
|
|
|
|
{
|
|
|
|
mo->RenderStyle = STYLE_Add;
|
|
|
|
mo->alpha = FRACUNIT;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mo->RenderStyle = STYLE_Translucent;
|
|
|
|
mo->alpha = FRACUNIT*2/3;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
mo->RenderStyle = ERenderStyle(deh.ExplosionStyle);
|
2006-02-24 04:48:15 +00:00
|
|
|
mo->alpha = deh.ExplosionAlpha;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mo->flags4 & MF4_RANDOMIZE)
|
|
|
|
{
|
|
|
|
mo->tics -= (pr_explodemissile() & 3) * TICRATE / 35;
|
|
|
|
if (mo->tics < 1)
|
|
|
|
mo->tics = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
mo->flags &= ~MF_MISSILE;
|
|
|
|
|
|
|
|
if (mo->DeathSound)
|
|
|
|
{
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (mo, CHAN_VOICE, mo->DeathSound, 1,
|
2006-02-24 04:48:15 +00:00
|
|
|
(mo->flags3 & MF3_FULLVOLDEATH) ? ATTN_NONE : ATTN_NORM);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_FloorBounceMissile
|
|
|
|
//
|
|
|
|
// Returns true if the missile was destroyed
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
bool AActor::FloorBounceMissile (secplane_t &plane)
|
|
|
|
{
|
2006-04-18 22:15:05 +00:00
|
|
|
if (z <= floorz && P_HitFloor (this))
|
|
|
|
{
|
|
|
|
// Landed in some sort of liquid
|
|
|
|
if (flags5 & MF5_EXPLODEONWATER)
|
|
|
|
{
|
2006-10-22 10:32:41 +00:00
|
|
|
P_ExplodeMissile(this, NULL, NULL);
|
2006-04-18 22:15:05 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if (!(flags3 & MF3_CANBOUNCEWATER))
|
|
|
|
{
|
|
|
|
Destroy ();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// The amount of bounces is limited
|
|
|
|
if (bouncecount>0 && --bouncecount==0)
|
|
|
|
{
|
2006-10-22 10:32:41 +00:00
|
|
|
P_ExplodeMissile(this, NULL, NULL);
|
2006-02-24 04:48:15 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
fixed_t dot = TMulScale16 (momx, plane.a, momy, plane.b, momz, plane.c);
|
|
|
|
|
|
|
|
if ((flags2 & MF2_BOUNCETYPE) == MF2_HERETICBOUNCE)
|
|
|
|
{
|
|
|
|
momx -= MulScale15 (plane.a, dot);
|
|
|
|
momy -= MulScale15 (plane.b, dot);
|
|
|
|
momz -= MulScale15 (plane.c, dot);
|
|
|
|
angle = R_PointToAngle2 (0, 0, momx, momy);
|
|
|
|
flags |= MF_INBOUNCE;
|
2006-10-31 14:53:21 +00:00
|
|
|
SetState (FindState(NAME_Death));
|
2006-02-24 04:48:15 +00:00
|
|
|
flags &= ~MF_INBOUNCE;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// The reflected velocity keeps only about 70% of its original speed
|
2006-04-11 16:27:41 +00:00
|
|
|
long bouncescale = 0x4000 * bouncefactor;
|
|
|
|
momx = MulScale30 (momx - MulScale15 (plane.a, dot), bouncescale);
|
|
|
|
momy = MulScale30 (momy - MulScale15 (plane.b, dot), bouncescale);
|
|
|
|
momz = MulScale30 (momz - MulScale15 (plane.c, dot), bouncescale);
|
2006-02-24 04:48:15 +00:00
|
|
|
angle = R_PointToAngle2 (0, 0, momx, momy);
|
|
|
|
|
2006-04-11 16:27:41 +00:00
|
|
|
if (SeeSound && !(flags4 & MF4_NOBOUNCESOUND))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (this, CHAN_VOICE, SeeSound, 1, ATTN_IDLE);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if ((flags2 & MF2_BOUNCETYPE) == MF2_DOOMBOUNCE)
|
|
|
|
{
|
|
|
|
if (!(flags & MF_NOGRAVITY) && (momz < 3*FRACUNIT))
|
|
|
|
{
|
|
|
|
flags2 &= ~MF2_BOUNCETYPE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_ThrustMobj
|
|
|
|
//
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_ThrustMobj (AActor *mo, angle_t angle, fixed_t move)
|
|
|
|
{
|
|
|
|
angle >>= ANGLETOFINESHIFT;
|
|
|
|
mo->momx += FixedMul (move, finecosine[angle]);
|
|
|
|
mo->momy += FixedMul (move, finesine[angle]);
|
|
|
|
}
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// FUNC P_FaceMobj
|
|
|
|
//
|
|
|
|
// Returns 1 if 'source' needs to turn clockwise, or 0 if 'source' needs
|
|
|
|
// to turn counter clockwise. 'delta' is set to the amount 'source'
|
|
|
|
// needs to turn.
|
|
|
|
//
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
int P_FaceMobj (AActor *source, AActor *target, angle_t *delta)
|
|
|
|
{
|
|
|
|
angle_t diff;
|
|
|
|
angle_t angle1;
|
|
|
|
angle_t angle2;
|
|
|
|
|
|
|
|
angle1 = source->angle;
|
|
|
|
angle2 = R_PointToAngle2 (source->x, source->y, target->x, target->y);
|
|
|
|
if (angle2 > angle1)
|
|
|
|
{
|
|
|
|
diff = angle2 - angle1;
|
|
|
|
if (diff > ANGLE_180)
|
|
|
|
{
|
|
|
|
*delta = ANGLE_MAX - diff;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*delta = diff;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
diff = angle1 - angle2;
|
|
|
|
if (diff > ANGLE_180)
|
|
|
|
{
|
|
|
|
*delta = ANGLE_MAX - diff;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*delta = diff;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// FUNC P_SeekerMissile
|
|
|
|
//
|
|
|
|
// The missile's tracer field must be the target. Returns true if
|
|
|
|
// target was tracked, false if not.
|
|
|
|
//
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
bool P_SeekerMissile (AActor *actor, angle_t thresh, angle_t turnMax)
|
|
|
|
{
|
|
|
|
int dir;
|
|
|
|
int dist;
|
|
|
|
angle_t delta;
|
|
|
|
angle_t angle;
|
|
|
|
AActor *target;
|
|
|
|
|
|
|
|
target = actor->tracer;
|
|
|
|
if (target == NULL || actor->Speed == 0)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (!(target->flags & MF_SHOOTABLE))
|
|
|
|
{ // Target died
|
|
|
|
actor->tracer = NULL;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
dir = P_FaceMobj (actor, target, &delta);
|
|
|
|
if (delta > thresh)
|
|
|
|
{
|
|
|
|
delta >>= 1;
|
|
|
|
if (delta > turnMax)
|
|
|
|
{
|
|
|
|
delta = turnMax;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (dir)
|
|
|
|
{ // Turn clockwise
|
|
|
|
actor->angle += delta;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ // Turn counter clockwise
|
|
|
|
actor->angle -= delta;
|
|
|
|
}
|
|
|
|
angle = actor->angle>>ANGLETOFINESHIFT;
|
|
|
|
actor->momx = FixedMul (actor->Speed, finecosine[angle]);
|
|
|
|
actor->momy = FixedMul (actor->Speed, finesine[angle]);
|
|
|
|
if (actor->z + actor->height < target->z ||
|
|
|
|
target->z + target->height < actor->z)
|
|
|
|
{ // Need to seek vertically
|
|
|
|
dist = P_AproxDistance (target->x - actor->x, target->y - actor->y);
|
|
|
|
dist = dist / actor->Speed;
|
|
|
|
if (dist < 1)
|
|
|
|
{
|
|
|
|
dist = 1;
|
|
|
|
}
|
|
|
|
actor->momz = ((target->z+target->height/2) - (actor->z+actor->height/2)) / dist;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_XYMovement
|
|
|
|
//
|
|
|
|
#define STOPSPEED 0x1000
|
|
|
|
#define FRICTION 0xe800
|
|
|
|
#define CARRYSTOPSPEED (STOPSPEED*32/3)
|
|
|
|
|
|
|
|
void P_XYMovement (AActor *mo, fixed_t scrollx, fixed_t scrolly)
|
|
|
|
{
|
|
|
|
bool bForceSlide = scrollx || scrolly;
|
|
|
|
angle_t angle;
|
|
|
|
fixed_t ptryx, ptryy;
|
|
|
|
player_t *player;
|
|
|
|
fixed_t xmove, ymove;
|
|
|
|
bool walkplane;
|
|
|
|
static const int windTab[3] = {2048*5, 2048*10, 2048*25};
|
|
|
|
int steps, step, totalsteps;
|
|
|
|
fixed_t startx, starty;
|
|
|
|
|
2006-05-14 14:30:13 +00:00
|
|
|
fixed_t maxmove = (mo->waterlevel < 1) || (mo->flags & MF_MISSILE) ||
|
|
|
|
(mo->player && mo->player->crouchoffset<-10*FRACUNIT) ? MAXMOVE : MAXMOVE/4;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (mo->flags2 & MF2_WINDTHRUST && mo->waterlevel < 2 && !(mo->flags & MF_NOCLIP))
|
|
|
|
{
|
|
|
|
int special = mo->Sector->special;
|
|
|
|
switch (special)
|
|
|
|
{
|
|
|
|
case 40: case 41: case 42: // Wind_East
|
|
|
|
P_ThrustMobj (mo, 0, windTab[special-40]);
|
|
|
|
break;
|
|
|
|
case 43: case 44: case 45: // Wind_North
|
|
|
|
P_ThrustMobj (mo, ANG90, windTab[special-43]);
|
|
|
|
break;
|
|
|
|
case 46: case 47: case 48: // Wind_South
|
|
|
|
P_ThrustMobj (mo, ANG270, windTab[special-46]);
|
|
|
|
break;
|
|
|
|
case 49: case 50: case 51: // Wind_West
|
|
|
|
P_ThrustMobj (mo, ANG180, windTab[special-49]);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// [RH] No need to clamp these now. However, wall running needs it so
|
|
|
|
// that large thrusts can't propel an actor through a wall, because wall
|
|
|
|
// running depends on the player's original movement continuing even after
|
|
|
|
// it gets blocked.
|
2008-06-25 22:16:04 +00:00
|
|
|
if ((mo->player != NULL && (i_compatflags & COMPATF_WALLRUN)) || (mo->waterlevel >= 1) ||
|
2006-05-14 14:30:13 +00:00
|
|
|
(mo->player != NULL && mo->player->crouchfactor < FRACUNIT*3/4))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-05-14 14:30:13 +00:00
|
|
|
// preserve the direction instead of clamping x and y independently.
|
2006-04-11 08:36:23 +00:00
|
|
|
xmove = clamp (mo->momx, -maxmove, maxmove);
|
|
|
|
ymove = clamp (mo->momy, -maxmove, maxmove);
|
|
|
|
|
|
|
|
fixed_t xfac = FixedDiv(xmove, mo->momx);
|
|
|
|
fixed_t yfac = FixedDiv(ymove, mo->momy);
|
|
|
|
fixed_t fac = MIN(xfac, yfac);
|
|
|
|
|
|
|
|
xmove = mo->momx = FixedMul(mo->momx, fac);
|
|
|
|
ymove = mo->momy = FixedMul(mo->momy, fac);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
xmove = mo->momx;
|
|
|
|
ymove = mo->momy;
|
|
|
|
}
|
|
|
|
// [RH] Carrying sectors didn't work with low speeds in BOOM. This is
|
|
|
|
// because BOOM relied on the speed being fast enough to accumulate
|
|
|
|
// despite friction. If the speed is too low, then its movement will get
|
|
|
|
// cancelled, and it won't accumulate to the desired speed.
|
|
|
|
if (abs(scrollx) > CARRYSTOPSPEED)
|
|
|
|
{
|
|
|
|
scrollx = FixedMul (scrollx, CARRYFACTOR);
|
|
|
|
mo->momx += scrollx;
|
|
|
|
}
|
|
|
|
if (abs(scrolly) > CARRYSTOPSPEED)
|
|
|
|
{
|
|
|
|
scrolly = FixedMul (scrolly, CARRYFACTOR);
|
|
|
|
mo->momy += scrolly;
|
|
|
|
}
|
|
|
|
xmove += scrollx;
|
|
|
|
ymove += scrolly;
|
|
|
|
|
|
|
|
if ((xmove | ymove) == 0)
|
|
|
|
{
|
|
|
|
if (mo->flags & MF_SKULLFLY)
|
|
|
|
{
|
|
|
|
// the skull slammed into something
|
|
|
|
mo->flags &= ~MF_SKULLFLY;
|
|
|
|
mo->momx = mo->momy = mo->momz = 0;
|
- Fixed: EV_Teleport() did not set players to their idle state, so if they
were running when the teleported, they would still be running afterward
even though they weren't moving anywhere. Normally, P_XYMovement() does
this when they stop due to friction.
- Fixed: AActor::TakeSpecialDamage() completely bypassed the standard rules
for target switching on actors with MF5_NODAMAGE set.
- Changed the return values of the ACS spawn, spawnspot, and spawnspotfacing
commands to be the total count of things spawned, rather than a pretty
much useless reference to the actor spawned at the last map spot.
- Fixed: DLevelScript::DoSpawn() takes a byte angle, but DoSpawnSpotFacing()
passed it a full-length angle.
- Fixed: When MF_SKULLFLY is removed because an actor slams into something,
it was set to a see or spawn state, resetting its tic count and bypassing
the effectiveness of the MF2_DORMANT flag. While I was at it, I decided
dormant skulls shouldn't do slamming damage, either.
- Fixed: P_Thing_Spawn() returned success only if all thing instances were
successfully spawned. As long as at least one thing was spawned, it should
be considered a success.
- Fixed: Flipped single rotation sprites were only flipped every other 22.5
degree interval.
SVN r484 (trunk)
2007-02-14 22:47:01 +00:00
|
|
|
if (!(mo->flags2 & MF2_DORMANT))
|
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
if (mo->SeeState != NULL) mo->SetState (mo->SeeState);
|
|
|
|
else mo->SetIdle();
|
- Fixed: EV_Teleport() did not set players to their idle state, so if they
were running when the teleported, they would still be running afterward
even though they weren't moving anywhere. Normally, P_XYMovement() does
this when they stop due to friction.
- Fixed: AActor::TakeSpecialDamage() completely bypassed the standard rules
for target switching on actors with MF5_NODAMAGE set.
- Changed the return values of the ACS spawn, spawnspot, and spawnspotfacing
commands to be the total count of things spawned, rather than a pretty
much useless reference to the actor spawned at the last map spot.
- Fixed: DLevelScript::DoSpawn() takes a byte angle, but DoSpawnSpotFacing()
passed it a full-length angle.
- Fixed: When MF_SKULLFLY is removed because an actor slams into something,
it was set to a see or spawn state, resetting its tic count and bypassing
the effectiveness of the MF2_DORMANT flag. While I was at it, I decided
dormant skulls shouldn't do slamming damage, either.
- Fixed: P_Thing_Spawn() returned success only if all thing instances were
successfully spawned. As long as at least one thing was spawned, it should
be considered a success.
- Fixed: Flipped single rotation sprites were only flipped every other 22.5
degree interval.
SVN r484 (trunk)
2007-02-14 22:47:01 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
mo->SetIdle();
|
- Fixed: EV_Teleport() did not set players to their idle state, so if they
were running when the teleported, they would still be running afterward
even though they weren't moving anywhere. Normally, P_XYMovement() does
this when they stop due to friction.
- Fixed: AActor::TakeSpecialDamage() completely bypassed the standard rules
for target switching on actors with MF5_NODAMAGE set.
- Changed the return values of the ACS spawn, spawnspot, and spawnspotfacing
commands to be the total count of things spawned, rather than a pretty
much useless reference to the actor spawned at the last map spot.
- Fixed: DLevelScript::DoSpawn() takes a byte angle, but DoSpawnSpotFacing()
passed it a full-length angle.
- Fixed: When MF_SKULLFLY is removed because an actor slams into something,
it was set to a see or spawn state, resetting its tic count and bypassing
the effectiveness of the MF2_DORMANT flag. While I was at it, I decided
dormant skulls shouldn't do slamming damage, either.
- Fixed: P_Thing_Spawn() returned success only if all thing instances were
successfully spawned. As long as at least one thing was spawned, it should
be considered a success.
- Fixed: Flipped single rotation sprites were only flipped every other 22.5
degree interval.
SVN r484 (trunk)
2007-02-14 22:47:01 +00:00
|
|
|
mo->tics = -1;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
player = mo->player;
|
|
|
|
|
|
|
|
// [RH] Adjust player movement on sloped floors
|
|
|
|
fixed_t startxmove = xmove;
|
|
|
|
fixed_t startymove = ymove;
|
|
|
|
walkplane = P_CheckSlopeWalk (mo, xmove, ymove);
|
|
|
|
|
|
|
|
// [RH] Take smaller steps when moving faster than the object's size permits.
|
|
|
|
// Moving as fast as the object's "diameter" is bad because it could skip
|
|
|
|
// some lines because the actor could land such that it is just touching the
|
|
|
|
// line. For Doom to detect that the line is there, it needs to actually cut
|
|
|
|
// through the actor.
|
|
|
|
|
|
|
|
{
|
|
|
|
maxmove = mo->radius - FRACUNIT;
|
|
|
|
|
|
|
|
if (maxmove <= 0)
|
|
|
|
{ // gibs can have radius 0, so don't divide by zero below!
|
|
|
|
maxmove = MAXMOVE;
|
|
|
|
}
|
|
|
|
|
|
|
|
const fixed_t xspeed = abs (xmove);
|
|
|
|
const fixed_t yspeed = abs (ymove);
|
|
|
|
|
|
|
|
steps = 1;
|
|
|
|
|
|
|
|
if (xspeed > yspeed)
|
|
|
|
{
|
|
|
|
if (xspeed > maxmove)
|
|
|
|
{
|
|
|
|
steps = 1 + xspeed / maxmove;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (yspeed > maxmove)
|
|
|
|
{
|
|
|
|
steps = 1 + yspeed / maxmove;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// P_SlideMove needs to know the step size before P_CheckSlopeWalk
|
|
|
|
// because it also calls P_CheckSlopeWalk on its clipped steps.
|
|
|
|
fixed_t onestepx = startxmove / steps;
|
|
|
|
fixed_t onestepy = startymove / steps;
|
|
|
|
|
|
|
|
startx = mo->x;
|
|
|
|
starty = mo->y;
|
|
|
|
step = 1;
|
|
|
|
totalsteps = steps;
|
|
|
|
|
|
|
|
// [RH] Instead of doing ripping damage each step, do it each tic.
|
|
|
|
// This makes it compatible with Heretic and Hexen, which only did
|
|
|
|
// one step for their missiles with ripping damage (excluding those
|
|
|
|
// that don't use P_XYMovement). It's also more intuitive since it
|
|
|
|
// makes the damage done dependant on the amount of time the projectile
|
|
|
|
// spends inside a target rather than on the projectile's size. The
|
|
|
|
// last actor ripped through is recorded so that if the projectile
|
|
|
|
// passes through more than one actor this tic, each one takes damage
|
|
|
|
// and not just the first one.
|
|
|
|
|
2008-04-10 14:38:43 +00:00
|
|
|
FCheckPosition tm(!!(mo->flags2 & MF2_RIP));
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
ptryx = startx + Scale (xmove, step, steps);
|
|
|
|
ptryy = starty + Scale (ymove, step, steps);
|
|
|
|
|
|
|
|
/* if (mo->player)
|
|
|
|
Printf ("%d,%d/%d: %d %d %d %d %d %d %d\n", level.time, step, steps, startxmove, Scale(xmove,step,steps), startymove, Scale(ymove,step,steps), mo->x, mo->y, mo->z);
|
|
|
|
*/
|
|
|
|
// [RH] If walking on a slope, stay on the slope
|
|
|
|
// killough 3/15/98: Allow objects to drop off
|
2008-04-08 20:52:49 +00:00
|
|
|
if (!P_TryMove (mo, ptryx, ptryy, true, walkplane, tm))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
// blocked move
|
|
|
|
|
2006-12-23 12:12:06 +00:00
|
|
|
if ((mo->flags2 & (MF2_SLIDE|MF2_BLASTED) || bForceSlide) && !(mo->flags&MF_MISSILE))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
// try to slide along it
|
2008-04-08 20:52:49 +00:00
|
|
|
if (mo->BlockingMobj == NULL)
|
2006-02-24 04:48:15 +00:00
|
|
|
{ // slide against wall
|
2008-04-08 20:52:49 +00:00
|
|
|
if (mo->BlockingLine != NULL &&
|
2006-02-24 04:48:15 +00:00
|
|
|
mo->player && mo->waterlevel && mo->waterlevel < 3 &&
|
|
|
|
(mo->player->cmd.ucmd.forwardmove | mo->player->cmd.ucmd.sidemove) &&
|
2008-04-08 20:52:49 +00:00
|
|
|
mo->BlockingLine->sidenum[1] != NO_SIDE)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
mo->momz = WATER_JUMP_SPEED;
|
|
|
|
}
|
2006-06-03 12:30:11 +00:00
|
|
|
if (player && (i_compatflags & COMPATF_WALLRUN))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
// [RH] Here is the key to wall running: The move is clipped using its full speed.
|
|
|
|
// If the move is done a second time (because it was too fast for one move), it
|
|
|
|
// is still clipped against the wall at its full speed, so you effectively
|
|
|
|
// execute two moves in one tic.
|
|
|
|
P_SlideMove (mo, mo->momx, mo->momy, 1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
P_SlideMove (mo, onestepx, onestepy, totalsteps);
|
|
|
|
}
|
|
|
|
if ((mo->momx | mo->momy) == 0)
|
|
|
|
{
|
|
|
|
steps = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-06-03 12:30:11 +00:00
|
|
|
if (!player || !(i_compatflags & COMPATF_WALLRUN))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
xmove = mo->momx;
|
|
|
|
ymove = mo->momy;
|
|
|
|
onestepx = xmove / steps;
|
|
|
|
onestepy = ymove / steps;
|
|
|
|
P_CheckSlopeWalk (mo, xmove, ymove);
|
|
|
|
}
|
|
|
|
startx = mo->x - Scale (xmove, step, steps);
|
|
|
|
starty = mo->y - Scale (ymove, step, steps);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ // slide against another actor
|
|
|
|
fixed_t tx, ty;
|
|
|
|
tx = 0, ty = onestepy;
|
|
|
|
walkplane = P_CheckSlopeWalk (mo, tx, ty);
|
|
|
|
if (P_TryMove (mo, mo->x + tx, mo->y + ty, true, walkplane))
|
|
|
|
{
|
|
|
|
mo->momx = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tx = onestepx, ty = 0;
|
|
|
|
walkplane = P_CheckSlopeWalk (mo, tx, ty);
|
|
|
|
if (P_TryMove (mo, mo->x + tx, mo->y + ty, true, walkplane))
|
|
|
|
{
|
|
|
|
mo->momy = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mo->momx = mo->momy = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (player && player->mo == mo)
|
|
|
|
{
|
|
|
|
if (mo->momx == 0)
|
|
|
|
player->momx = 0;
|
|
|
|
if (mo->momy == 0)
|
|
|
|
player->momy = 0;
|
|
|
|
}
|
|
|
|
steps = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (mo->flags & MF_MISSILE)
|
|
|
|
{
|
2008-04-08 20:52:49 +00:00
|
|
|
AActor *BlockingMobj = mo->BlockingMobj;
|
2006-02-24 04:48:15 +00:00
|
|
|
steps = 0;
|
|
|
|
if (BlockingMobj)
|
|
|
|
{
|
|
|
|
if (mo->flags2 & MF2_BOUNCE2)
|
|
|
|
{
|
2006-04-18 22:15:05 +00:00
|
|
|
if (mo->flags5&MF5_BOUNCEONACTORS ||
|
|
|
|
(BlockingMobj->flags2 & MF2_REFLECTIVE) ||
|
2006-02-24 04:48:15 +00:00
|
|
|
((!BlockingMobj->player) &&
|
2006-04-18 22:15:05 +00:00
|
|
|
(!(BlockingMobj->flags3 & MF3_ISMONSTER))))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
fixed_t speed;
|
|
|
|
|
|
|
|
angle = R_PointToAngle2 (BlockingMobj->x,
|
|
|
|
BlockingMobj->y, mo->x, mo->y)
|
|
|
|
+ANGLE_1*((pr_bounce()%16)-8);
|
|
|
|
speed = P_AproxDistance (mo->momx, mo->momy);
|
|
|
|
speed = FixedMul (speed, (fixed_t)(0.75*FRACUNIT));
|
|
|
|
mo->angle = angle;
|
|
|
|
angle >>= ANGLETOFINESHIFT;
|
|
|
|
mo->momx = FixedMul (speed, finecosine[angle]);
|
|
|
|
mo->momy = FixedMul (speed, finesine[angle]);
|
2006-04-18 22:15:05 +00:00
|
|
|
if (mo->SeeSound && !(mo->flags4&MF4_NOBOUNCESOUND))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (mo, CHAN_VOICE, mo->SeeSound, 1, ATTN_IDLE);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ // Struck a player/creature
|
2006-10-22 10:32:41 +00:00
|
|
|
P_ExplodeMissile (mo, NULL, BlockingMobj);
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Struck a wall
|
|
|
|
if (P_BounceWall (mo))
|
|
|
|
{
|
|
|
|
if (mo->SeeSound && !(mo->flags3 & MF3_NOWALLBOUNCESND))
|
|
|
|
{
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (mo, CHAN_VOICE, mo->SeeSound, 1, ATTN_IDLE);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (BlockingMobj &&
|
|
|
|
(BlockingMobj->flags2 & MF2_REFLECTIVE))
|
|
|
|
{
|
|
|
|
angle = R_PointToAngle2(BlockingMobj->x,
|
|
|
|
BlockingMobj->y,
|
|
|
|
mo->x, mo->y);
|
|
|
|
|
|
|
|
// Change angle for deflection/reflection
|
|
|
|
if (mo->AdjustReflectionAngle (BlockingMobj, angle))
|
|
|
|
{
|
|
|
|
goto explode;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Reflect the missile along angle
|
|
|
|
mo->angle = angle;
|
|
|
|
angle >>= ANGLETOFINESHIFT;
|
|
|
|
mo->momx = FixedMul (mo->Speed>>1, finecosine[angle]);
|
|
|
|
mo->momy = FixedMul (mo->Speed>>1, finesine[angle]);
|
|
|
|
mo->momz = -mo->momz/2;
|
|
|
|
if (mo->flags2 & MF2_SEEKERMISSILE)
|
|
|
|
{
|
|
|
|
mo->tracer = mo->target;
|
|
|
|
}
|
|
|
|
mo->target = BlockingMobj;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
explode:
|
|
|
|
// explode a missile
|
2008-04-08 20:52:49 +00:00
|
|
|
if (tm.ceilingline &&
|
|
|
|
tm.ceilingline->backsector &&
|
|
|
|
tm.ceilingline->backsector->ceilingpic == skyflatnum &&
|
|
|
|
mo->z >= tm.ceilingline->backsector->ceilingplane.ZatPoint (mo->x, mo->y) && //killough
|
2006-02-24 04:48:15 +00:00
|
|
|
!(mo->flags3 & MF3_SKYEXPLODE))
|
|
|
|
{
|
|
|
|
// Hack to prevent missiles exploding against the sky.
|
|
|
|
// Does not handle sky floors.
|
|
|
|
mo->Destroy ();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// [RH] Don't explode on horizon lines.
|
2008-04-08 20:52:49 +00:00
|
|
|
if (mo->BlockingLine != NULL && mo->BlockingLine->special == Line_Horizon)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
mo->Destroy ();
|
|
|
|
return;
|
|
|
|
}
|
2008-04-08 20:52:49 +00:00
|
|
|
P_ExplodeMissile (mo, mo->BlockingLine, BlockingMobj);
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mo->momx = mo->momy = 0;
|
|
|
|
steps = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (mo->x != ptryx || mo->y != ptryy)
|
|
|
|
{
|
|
|
|
// If the new position does not match the desired position, the player
|
|
|
|
// must have gone through a teleporter, so stop moving right now if it
|
|
|
|
// was a regular teleporter. If it was a line-to-line or fogless teleporter,
|
|
|
|
// the move should continue, but startx and starty need to change.
|
|
|
|
if (mo->momx == 0 && mo->momy == 0)
|
|
|
|
{
|
|
|
|
step = steps;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
startx = mo->x - Scale (xmove, step, steps);
|
|
|
|
starty = mo->y - Scale (ymove, step, steps);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} while (++step <= steps);
|
|
|
|
|
|
|
|
// Friction
|
|
|
|
|
|
|
|
if (player && player->mo == mo && player->cheats & CF_NOMOMENTUM)
|
|
|
|
{ // debug option for no sliding at all
|
|
|
|
mo->momx = mo->momy = 0;
|
|
|
|
player->momx = player->momy = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mo->flags & (MF_MISSILE | MF_SKULLFLY))
|
|
|
|
{ // no friction for missiles
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mo->z > mo->floorz && !(mo->flags2 & MF2_ONMOBJ) &&
|
|
|
|
(!(mo->flags2 & MF2_FLY) || !(mo->flags & MF_NOGRAVITY)) && !mo->waterlevel)
|
|
|
|
{ // [RH] Friction when falling is available for larger aircontrols
|
|
|
|
if (player != NULL && level.airfriction != FRACUNIT)
|
|
|
|
{
|
|
|
|
mo->momx = FixedMul (mo->momx, level.airfriction);
|
|
|
|
mo->momy = FixedMul (mo->momy, level.airfriction);
|
|
|
|
|
|
|
|
if (player->mo == mo) // Not voodoo dolls
|
|
|
|
{
|
|
|
|
player->momx = FixedMul (player->momx, level.airfriction);
|
|
|
|
player->momy = FixedMul (player->momy, level.airfriction);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mo->flags & MF_CORPSE)
|
|
|
|
{ // Don't stop sliding if halfway off a step with some momentum
|
|
|
|
if (mo->momx > FRACUNIT/4 || mo->momx < -FRACUNIT/4
|
|
|
|
|| mo->momy > FRACUNIT/4 || mo->momy < -FRACUNIT/4)
|
|
|
|
{
|
|
|
|
if (mo->floorz > mo->Sector->floorplane.ZatPoint (mo->x, mo->y))
|
2008-05-17 17:57:50 +00:00
|
|
|
{
|
|
|
|
if (mo->dropoffz != mo->floorz) // 3DMidtex or other special cases that must be excluded
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// killough 11/98:
|
|
|
|
// Stop voodoo dolls that have come to rest, despite any
|
|
|
|
// moving corresponding player:
|
|
|
|
if (mo->momx > -STOPSPEED && mo->momx < STOPSPEED
|
|
|
|
&& mo->momy > -STOPSPEED && mo->momy < STOPSPEED
|
|
|
|
&& (!player || (player->mo != mo)
|
|
|
|
|| !(player->cmd.ucmd.forwardmove | player->cmd.ucmd.sidemove)))
|
|
|
|
{
|
|
|
|
// if in a walking frame, stop moving
|
|
|
|
// killough 10/98:
|
|
|
|
// Don't affect main player when voodoo dolls stop:
|
|
|
|
if (player && player->mo == mo && !(player->cheats & CF_PREDICTING))
|
|
|
|
{
|
|
|
|
player->mo->PlayIdle ();
|
|
|
|
}
|
|
|
|
|
|
|
|
mo->momx = mo->momy = 0;
|
|
|
|
|
|
|
|
// killough 10/98: kill any bobbing momentum too (except in voodoo dolls)
|
|
|
|
if (player && player->mo == mo)
|
|
|
|
player->momx = player->momy = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// phares 3/17/98
|
|
|
|
// Friction will have been adjusted by friction thinkers for icy
|
|
|
|
// or muddy floors. Otherwise it was never touched and
|
|
|
|
// remained set at ORIG_FRICTION
|
|
|
|
//
|
|
|
|
// killough 8/28/98: removed inefficient thinker algorithm,
|
|
|
|
// instead using touching_sectorlist in P_GetFriction() to
|
|
|
|
// determine friction (and thus only when it is needed).
|
|
|
|
//
|
|
|
|
// killough 10/98: changed to work with new bobbing method.
|
|
|
|
// Reducing player momentum is no longer needed to reduce
|
|
|
|
// bobbing, so ice works much better now.
|
|
|
|
|
|
|
|
fixed_t friction = P_GetFriction (mo, NULL);
|
|
|
|
|
|
|
|
mo->momx = FixedMul (mo->momx, friction);
|
|
|
|
mo->momy = FixedMul (mo->momy, friction);
|
|
|
|
|
|
|
|
// killough 10/98: Always decrease player bobbing by ORIG_FRICTION.
|
|
|
|
// This prevents problems with bobbing on ice, where it was not being
|
|
|
|
// reduced fast enough, leading to all sorts of kludges being developed.
|
|
|
|
|
|
|
|
if (player && player->mo == mo) // Not voodoo dolls
|
|
|
|
{
|
|
|
|
player->momx = FixedMul (player->momx, ORIG_FRICTION);
|
|
|
|
player->momy = FixedMul (player->momy, ORIG_FRICTION);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Move this to p_inter ***
|
|
|
|
void P_MonsterFallingDamage (AActor *mo)
|
|
|
|
{
|
|
|
|
int damage;
|
|
|
|
int mom;
|
|
|
|
|
2006-04-11 16:27:41 +00:00
|
|
|
if (!(level.flags&LEVEL_MONSTERFALLINGDAMAGE))
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
2008-05-11 21:16:32 +00:00
|
|
|
if (mo->floorsector->Flags & SECF_NOFALLINGDAMAGE)
|
|
|
|
return;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
mom = abs(mo->momz);
|
|
|
|
if (mom > 35*FRACUNIT)
|
|
|
|
{ // automatic death
|
|
|
|
damage = 1000000;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
damage = ((mom - (23*FRACUNIT))*6)>>FRACBITS;
|
|
|
|
}
|
|
|
|
damage = 1000000; // always kill 'em
|
2006-10-31 14:53:21 +00:00
|
|
|
P_DamageMobj (mo, NULL, NULL, damage, NAME_Falling);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_ZMovement
|
|
|
|
//
|
|
|
|
void P_ZMovement (AActor *mo)
|
|
|
|
{
|
|
|
|
fixed_t dist;
|
|
|
|
fixed_t delta;
|
|
|
|
fixed_t oldz = mo->z;
|
|
|
|
|
|
|
|
//
|
|
|
|
// check for smooth step up
|
|
|
|
//
|
|
|
|
if (mo->player && mo->player->mo == mo && mo->z < mo->floorz)
|
|
|
|
{
|
|
|
|
mo->player->viewheight -= mo->floorz - mo->z;
|
2006-04-11 16:27:41 +00:00
|
|
|
mo->player->deltaviewheight = mo->player->GetDeltaViewHeight();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2006-04-11 08:36:23 +00:00
|
|
|
|
|
|
|
if (!(mo->flags2&MF2_FLOATBOB)) mo->z += mo->momz;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
//
|
|
|
|
// apply gravity
|
|
|
|
//
|
|
|
|
if (mo->z > mo->floorz && !(mo->flags & MF_NOGRAVITY))
|
|
|
|
{
|
|
|
|
fixed_t startmomz = mo->momz;
|
|
|
|
|
|
|
|
if (!mo->waterlevel || mo->flags & MF_CORPSE || (mo->player &&
|
|
|
|
!(mo->player->cmd.ucmd.forwardmove | mo->player->cmd.ucmd.sidemove)))
|
|
|
|
{
|
|
|
|
mo->momz -= (fixed_t)(level.gravity * mo->Sector->gravity *
|
2007-01-20 14:27:44 +00:00
|
|
|
FIXED2FLOAT(mo->gravity) * 81.92);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
if (mo->waterlevel > 1)
|
|
|
|
{
|
|
|
|
fixed_t sinkspeed = mo->flags & MF_CORPSE ? -WATER_SINK_SPEED/3 : -WATER_SINK_SPEED;
|
|
|
|
|
|
|
|
if (mo->momz < sinkspeed)
|
|
|
|
{
|
|
|
|
mo->momz = (startmomz < sinkspeed) ? startmomz : sinkspeed;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mo->momz = startmomz + ((mo->momz - startmomz) >>
|
|
|
|
(mo->waterlevel == 1 ? WATER_SINK_SMALL_FACTOR : WATER_SINK_FACTOR));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-04-11 08:36:23 +00:00
|
|
|
|
|
|
|
if (mo->flags2&MF2_FLOATBOB) mo->z += mo->momz;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
//
|
|
|
|
// adjust height
|
|
|
|
//
|
2006-04-16 13:29:50 +00:00
|
|
|
if ((mo->flags & MF_FLOAT) && !(mo->flags2 & MF2_DORMANT) && mo->target)
|
2006-02-24 04:48:15 +00:00
|
|
|
{ // float down towards target if too close
|
|
|
|
if (!(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT))
|
|
|
|
{
|
|
|
|
dist = P_AproxDistance (mo->x - mo->target->x, mo->y - mo->target->y);
|
|
|
|
delta = (mo->target->z + (mo->height>>1)) - mo->z;
|
|
|
|
if (delta < 0 && dist < -(delta*3))
|
2006-05-14 14:30:13 +00:00
|
|
|
mo->z -= mo->FloatSpeed, mo->momz = 0;
|
2006-02-24 04:48:15 +00:00
|
|
|
else if (delta > 0 && dist < (delta*3))
|
2006-05-14 14:30:13 +00:00
|
|
|
mo->z += mo->FloatSpeed, mo->momz = 0;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (mo->player && (mo->flags & MF_NOGRAVITY) && (mo->z > mo->floorz))
|
|
|
|
{
|
|
|
|
mo->z += finesine[(FINEANGLES/80*level.maptime)&FINEMASK]/8;
|
|
|
|
mo->momz = FixedMul (mo->momz, FRICTION_FLY);
|
|
|
|
}
|
|
|
|
if (mo->waterlevel && !(mo->flags & MF_NOGRAVITY))
|
|
|
|
{
|
|
|
|
mo->momz = FixedMul (mo->momz, mo->Sector->friction);
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// clip movement
|
|
|
|
//
|
|
|
|
if (mo->z <= mo->floorz)
|
|
|
|
{ // Hit the floor
|
|
|
|
if ((!mo->player || !(mo->player->cheats & CF_PREDICTING)) &&
|
|
|
|
mo->Sector->SecActTarget != NULL &&
|
|
|
|
mo->Sector->floorplane.ZatPoint (mo->x, mo->y) == mo->floorz)
|
|
|
|
{ // [RH] Let the sector do something to the actor
|
|
|
|
mo->Sector->SecActTarget->TriggerAction (mo, SECSPAC_HitFloor);
|
|
|
|
}
|
|
|
|
// [RH] Need to recheck this because the sector action might have
|
|
|
|
// teleported the actor so it is no longer below the floor.
|
|
|
|
if (mo->z <= mo->floorz)
|
|
|
|
{
|
|
|
|
if ((mo->flags & MF_MISSILE) &&
|
|
|
|
(gameinfo.gametype != GAME_Doom || !(mo->flags & MF_NOCLIP)))
|
|
|
|
{
|
|
|
|
mo->z = mo->floorz;
|
|
|
|
if (mo->flags2 & MF2_BOUNCETYPE)
|
|
|
|
{
|
|
|
|
mo->FloorBounceMissile (mo->floorsector->floorplane);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else if (mo->flags3 & MF3_NOEXPLODEFLOOR)
|
|
|
|
{
|
|
|
|
mo->momz = 0;
|
|
|
|
P_HitFloor (mo);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else if (mo->flags3 & MF3_FLOORHUGGER)
|
|
|
|
{ // Floor huggers can go up steps
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-04-17 13:53:34 +00:00
|
|
|
if (mo->floorpic == skyflatnum && !(mo->flags3 & MF3_SKYEXPLODE))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
// [RH] Just remove the missile without exploding it
|
|
|
|
// if this is a sky floor.
|
|
|
|
mo->Destroy ();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
P_HitFloor (mo);
|
2006-10-22 10:32:41 +00:00
|
|
|
P_ExplodeMissile (mo, NULL, NULL);
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (mo->flags3 & MF3_ISMONSTER) // Blasted mobj falling
|
|
|
|
{
|
|
|
|
if (mo->momz < -(23*FRACUNIT))
|
|
|
|
{
|
|
|
|
P_MonsterFallingDamage (mo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mo->z = mo->floorz;
|
|
|
|
if (mo->momz < 0)
|
|
|
|
{
|
|
|
|
// [RH] avoid integer roundoff by doing comparisons with floats
|
|
|
|
// I can't think of any good reason why this varied with gravity
|
|
|
|
float minmom = 800.f /*level.gravity * mo->Sector->gravity*/ * -655.36f;
|
|
|
|
float mom = (float)mo->momz;
|
|
|
|
|
|
|
|
// Spawn splashes, etc.
|
|
|
|
P_HitFloor (mo);
|
2006-10-31 14:53:21 +00:00
|
|
|
if (mo->DamageType == NAME_Ice && mom < minmom)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
mo->tics = 1;
|
|
|
|
mo->momx = 0;
|
|
|
|
mo->momy = 0;
|
|
|
|
mo->momz = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// Let the actor do something special for hitting the floor
|
|
|
|
mo->HitFloor ();
|
|
|
|
if (mo->player)
|
|
|
|
{
|
|
|
|
mo->player->jumpTics = 7; // delay any jumping for a short while
|
|
|
|
if (mom < minmom && !(mo->flags & MF_NOGRAVITY))
|
|
|
|
{
|
|
|
|
// Squat down.
|
|
|
|
// Decrease viewheight for a moment after hitting the ground (hard),
|
|
|
|
// and utter appropriate sound.
|
|
|
|
PlayerLandedOnThing (mo, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mo->momz = 0;
|
|
|
|
}
|
|
|
|
if (mo->flags & MF_SKULLFLY)
|
|
|
|
{ // The skull slammed into something
|
|
|
|
mo->momz = -mo->momz;
|
|
|
|
}
|
2006-11-29 10:03:35 +00:00
|
|
|
mo->Crash();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mo->flags2 & MF2_FLOORCLIP)
|
|
|
|
{
|
|
|
|
mo->AdjustFloorClip ();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mo->z + mo->height > mo->ceilingz)
|
|
|
|
{ // hit the ceiling
|
|
|
|
if ((!mo->player || !(mo->player->cheats & CF_PREDICTING)) &&
|
|
|
|
mo->Sector->SecActTarget != NULL &&
|
|
|
|
mo->Sector->ceilingplane.ZatPoint (mo->x, mo->y) == mo->ceilingz)
|
|
|
|
{ // [RH] Let the sector do something to the actor
|
|
|
|
mo->Sector->SecActTarget->TriggerAction (mo, SECSPAC_HitCeiling);
|
|
|
|
}
|
|
|
|
// [RH] Need to recheck this because the sector action might have
|
|
|
|
// teleported the actor so it is no longer above the ceiling.
|
|
|
|
if (mo->z + mo->height > mo->ceilingz)
|
|
|
|
{
|
|
|
|
mo->z = mo->ceilingz - mo->height;
|
|
|
|
if (mo->flags2 & MF2_BOUNCETYPE)
|
|
|
|
{ // ceiling bounce
|
2006-04-17 13:53:34 +00:00
|
|
|
mo->FloorBounceMissile (mo->ceilingsector->ceilingplane);
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (mo->momz > 0)
|
|
|
|
mo->momz = 0;
|
|
|
|
if (mo->flags & MF_SKULLFLY)
|
|
|
|
{ // the skull slammed into something
|
|
|
|
mo->momz = -mo->momz;
|
|
|
|
}
|
|
|
|
if (mo->flags & MF_MISSILE &&
|
|
|
|
(gameinfo.gametype != GAME_Doom || !(mo->flags & MF_NOCLIP)))
|
|
|
|
{
|
|
|
|
if (mo->flags3 & MF3_CEILINGHUGGER)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2006-04-17 13:53:34 +00:00
|
|
|
if (mo->ceilingpic == skyflatnum && !(mo->flags3 & MF3_SKYEXPLODE))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
mo->Destroy ();
|
|
|
|
return;
|
|
|
|
}
|
2006-10-22 10:32:41 +00:00
|
|
|
P_ExplodeMissile (mo, NULL, NULL);
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
P_CheckFakeFloorTriggers (mo, oldz);
|
|
|
|
}
|
|
|
|
|
2007-12-09 03:40:02 +00:00
|
|
|
void P_CheckFakeFloorTriggers (AActor *mo, fixed_t oldz, bool oldz_has_viewheight)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
if (mo->player && (mo->player->cheats & CF_PREDICTING))
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
sector_t *sec = mo->Sector;
|
2006-05-19 05:14:37 +00:00
|
|
|
assert (sec != NULL);
|
|
|
|
if (sec == NULL)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
if (sec->heightsec != NULL && sec->SecActTarget != NULL)
|
|
|
|
{
|
|
|
|
sector_t *hs = sec->heightsec;
|
|
|
|
fixed_t waterz = hs->floorplane.ZatPoint (mo->x, mo->y);
|
|
|
|
fixed_t newz;
|
|
|
|
fixed_t viewheight;
|
|
|
|
|
|
|
|
if (mo->player != NULL)
|
|
|
|
{
|
|
|
|
viewheight = mo->player->viewheight;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
viewheight = mo->height / 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (oldz > waterz && mo->z <= waterz)
|
|
|
|
{ // Feet hit fake floor
|
|
|
|
sec->SecActTarget->TriggerAction (mo, SECSPAC_HitFakeFloor);
|
|
|
|
}
|
|
|
|
|
|
|
|
newz = mo->z + viewheight;
|
2007-12-09 03:40:02 +00:00
|
|
|
if (!oldz_has_viewheight)
|
|
|
|
{
|
|
|
|
oldz += viewheight;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (oldz <= waterz && newz > waterz)
|
|
|
|
{ // View went above fake floor
|
|
|
|
sec->SecActTarget->TriggerAction (mo, SECSPAC_EyesSurface);
|
|
|
|
}
|
|
|
|
else if (oldz > waterz && newz <= waterz)
|
|
|
|
{ // View went below fake floor
|
|
|
|
sec->SecActTarget->TriggerAction (mo, SECSPAC_EyesDive);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(hs->MoreFlags & SECF_FAKEFLOORONLY))
|
|
|
|
{
|
|
|
|
waterz = hs->ceilingplane.ZatPoint (mo->x, mo->y);
|
|
|
|
if (oldz <= waterz && newz > waterz)
|
|
|
|
{ // View went above fake ceiling
|
|
|
|
sec->SecActTarget->TriggerAction (mo, SECSPAC_EyesAboveC);
|
|
|
|
}
|
|
|
|
else if (oldz > waterz && newz <= waterz)
|
|
|
|
{ // View went below fake ceiling
|
|
|
|
sec->SecActTarget->TriggerAction (mo, SECSPAC_EyesBelowC);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//===========================================================================
|
|
|
|
//
|
|
|
|
// PlayerLandedOnThing
|
|
|
|
//
|
|
|
|
//===========================================================================
|
|
|
|
|
|
|
|
static void PlayerLandedOnThing (AActor *mo, AActor *onmobj)
|
|
|
|
{
|
|
|
|
bool grunted;
|
|
|
|
|
|
|
|
if (!mo->player)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (mo->player->mo == mo)
|
|
|
|
{
|
|
|
|
mo->player->deltaviewheight = mo->momz>>3;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mo->player->cheats & CF_PREDICTING)
|
|
|
|
return;
|
|
|
|
|
|
|
|
P_FallingDamage (mo);
|
|
|
|
|
|
|
|
// [RH] only make noise if alive
|
|
|
|
if (!mo->player->morphTics && mo->health > 0)
|
|
|
|
{
|
|
|
|
grunted = false;
|
|
|
|
// Why should this number vary by gravity?
|
|
|
|
if (mo->momz < (fixed_t)(800.f /*level.gravity * mo->Sector->gravity*/ * -983.04f) && mo->health > 0)
|
|
|
|
{
|
|
|
|
S_Sound (mo, CHAN_VOICE, "*grunt", 1, ATTN_NORM);
|
|
|
|
grunted = true;
|
|
|
|
}
|
|
|
|
if (onmobj != NULL || !Terrains[P_GetThingFloorType (mo)].IsLiquid)
|
|
|
|
{
|
|
|
|
if (!grunted || !S_AreSoundsEquivalent (mo, "*grunt", "*land"))
|
|
|
|
{
|
|
|
|
S_Sound (mo, CHAN_AUTO, "*land", 1, ATTN_NORM);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// mo->player->centering = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_NightmareRespawn
|
|
|
|
//
|
|
|
|
void P_NightmareRespawn (AActor *mobj)
|
|
|
|
{
|
|
|
|
fixed_t x, y, z;
|
|
|
|
AActor *mo;
|
|
|
|
AActor *info = mobj->GetDefault();
|
|
|
|
|
2008-01-26 16:42:16 +00:00
|
|
|
mobj->skillrespawncount++;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
// spawn the new monster (assume the spawn will be good)
|
|
|
|
if (info->flags & MF_SPAWNCEILING)
|
|
|
|
z = ONCEILINGZ;
|
|
|
|
else if (info->flags2 & MF2_SPAWNFLOAT)
|
|
|
|
z = FLOATRANDZ;
|
|
|
|
else if (info->flags2 & MF2_FLOATBOB)
|
2008-05-08 08:06:26 +00:00
|
|
|
z = mobj->SpawnPoint[2];
|
2006-02-24 04:48:15 +00:00
|
|
|
else
|
|
|
|
z = ONFLOORZ;
|
|
|
|
|
|
|
|
// spawn it
|
2008-05-08 08:06:26 +00:00
|
|
|
x = mobj->SpawnPoint[0];
|
|
|
|
y = mobj->SpawnPoint[1];
|
2006-07-16 09:10:45 +00:00
|
|
|
mo = Spawn (RUNTIME_TYPE(mobj), x, y, z, NO_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (z == ONFLOORZ)
|
2008-05-08 08:06:26 +00:00
|
|
|
mo->z += mo->SpawnPoint[2];
|
2006-02-24 04:48:15 +00:00
|
|
|
else if (z == ONCEILINGZ)
|
2008-05-08 08:06:26 +00:00
|
|
|
mo->z -= mo->SpawnPoint[2];
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// something is occupying its position?
|
|
|
|
if (!P_TestMobjLocation (mo))
|
|
|
|
{
|
2006-04-16 13:29:50 +00:00
|
|
|
//[GrafZahl] MF_COUNTKILL still needs to be checked here.
|
|
|
|
if (mo->CountsAsKill()) level.total_monsters--;
|
2006-02-24 04:48:15 +00:00
|
|
|
mo->Destroy ();
|
|
|
|
return; // no respawn
|
|
|
|
}
|
|
|
|
|
|
|
|
z = mo->z;
|
|
|
|
|
|
|
|
// inherit attributes from deceased one
|
|
|
|
mo->SpawnPoint[0] = mobj->SpawnPoint[0];
|
|
|
|
mo->SpawnPoint[1] = mobj->SpawnPoint[1];
|
|
|
|
mo->SpawnPoint[2] = mobj->SpawnPoint[2];
|
|
|
|
mo->SpawnAngle = mobj->SpawnAngle;
|
|
|
|
mo->SpawnFlags = mobj->SpawnFlags;
|
|
|
|
mo->angle = ANG45 * (mobj->SpawnAngle/45);
|
|
|
|
|
|
|
|
mo->HandleSpawnFlags ();
|
|
|
|
mo->reactiontime = 18;
|
|
|
|
mo->CopyFriendliness (mobj, false);
|
|
|
|
mo->Translation = mobj->Translation;
|
|
|
|
|
2008-01-26 16:42:16 +00:00
|
|
|
mo->skillrespawncount = mobj->skillrespawncount;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
// spawn a teleport fog at old spot because of removal of the body?
|
2006-07-16 09:10:45 +00:00
|
|
|
mo = Spawn ("TeleportFog", mobj->x, mobj->y, mobj->z, ALLOW_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (mo != NULL)
|
|
|
|
{
|
|
|
|
mo->z += TELEFOGHEIGHT;
|
|
|
|
}
|
|
|
|
|
|
|
|
// spawn a teleport fog at the new spot
|
2006-07-16 09:10:45 +00:00
|
|
|
mo = Spawn ("TeleportFog", x, y, z, ALLOW_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (mo != NULL)
|
|
|
|
{
|
|
|
|
mo->z += TELEFOGHEIGHT;
|
|
|
|
}
|
|
|
|
|
|
|
|
// remove the old monster
|
|
|
|
mobj->Destroy ();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
AActor *AActor::TIDHash[128];
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_ClearTidHashes
|
|
|
|
//
|
|
|
|
// Clears the tid hashtable.
|
|
|
|
//
|
|
|
|
|
|
|
|
void AActor::ClearTIDHashes ()
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 128; i++)
|
|
|
|
TIDHash[i] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_AddMobjToHash
|
|
|
|
//
|
|
|
|
// Inserts an mobj into the correct chain based on its tid.
|
|
|
|
// If its tid is 0, this function does nothing.
|
|
|
|
//
|
|
|
|
void AActor::AddToHash ()
|
|
|
|
{
|
|
|
|
if (tid == 0)
|
|
|
|
{
|
|
|
|
iprev = NULL;
|
|
|
|
inext = NULL;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int hash = TIDHASH (tid);
|
|
|
|
|
|
|
|
inext = TIDHash[hash];
|
|
|
|
iprev = &TIDHash[hash];
|
|
|
|
TIDHash[hash] = this;
|
|
|
|
if (inext)
|
|
|
|
{
|
|
|
|
inext->iprev = &inext;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_RemoveMobjFromHash
|
|
|
|
//
|
|
|
|
// Removes an mobj from its hash chain.
|
|
|
|
//
|
|
|
|
void AActor::RemoveFromHash ()
|
|
|
|
{
|
|
|
|
if (tid != 0 && iprev)
|
|
|
|
{
|
|
|
|
*iprev = inext;
|
|
|
|
if (inext)
|
|
|
|
{
|
|
|
|
inext->iprev = iprev;
|
|
|
|
}
|
|
|
|
iprev = NULL;
|
|
|
|
inext = NULL;
|
|
|
|
}
|
|
|
|
tid = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
angle_t AActor::AngleIncrements ()
|
|
|
|
{
|
|
|
|
return ANGLE_45;
|
|
|
|
}
|
|
|
|
|
|
|
|
void AActor::PreExplode ()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void AActor::GetExplodeParms (int &damage, int &dist, bool &hurtSource)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
- Added the ACS commands
ReplaceTextures (str old_texture, str new_texture, optional bool not_lower,
optional bool not_mid, optional bool not_upper, optional bool not_floor,
optional bool not_ceiling); and
SectorDamage (int tag, int amount, str type, bool players_only, bool in_air,
str protection_item, bool subclasses_okay);
- Added the vid_nowidescreen cvar to disable widescreen aspect ratio
correction. When this is enabled, the only display ratio available is 4:3
(and 5:4 if vid_tft is set).
- Added support for setting an actor's damage property to an expression
through decorate. Just enclose it within parentheses, and the expression
will be evaluated exactly as-is without the normal Doom damage calculation.
So if you want something that does exactly 6 damage, use a "Damage (6)"
property. To deal normal Doom missile damage, you can use
"Damage (random(1,8)*6)" instead of "Damage 6".
- Moved InvFirst and InvSel into APlayerPawn so that they can be consistantly
maintained by ObtainInventory.
SVN r288 (trunk)
2006-08-12 02:30:57 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// AActor :: GetMissileDamage
|
|
|
|
//
|
|
|
|
// If the actor's damage amount is an expression, evaluate it and return
|
|
|
|
// the result. Otherwise, return ((random() & mask) + add) * damage.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
int AActor::GetMissileDamage (int mask, int add)
|
|
|
|
{
|
|
|
|
if ((Damage & 0xC0000000) == 0x40000000)
|
|
|
|
{
|
|
|
|
return EvalExpressionI (Damage & 0x3FFFFFFF, this);
|
|
|
|
}
|
|
|
|
if (Damage == 0)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else if (mask == 0)
|
|
|
|
{
|
|
|
|
return add * Damage;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return ((pr_missiledamage() & mask) + add) * Damage;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
void AActor::Howl ()
|
|
|
|
{
|
2006-11-27 00:01:30 +00:00
|
|
|
int howl = GetClass()->Meta.GetMetaInt(AMETA_HowlSound);
|
2006-12-24 23:08:49 +00:00
|
|
|
if (!S_IsActorPlayingSomething(this, CHAN_BODY, howl))
|
2006-11-27 00:01:30 +00:00
|
|
|
{
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (this, CHAN_BODY, howl, 1, ATTN_NORM);
|
2006-11-27 00:01:30 +00:00
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void AActor::NoBlockingSet ()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
fixed_t AActor::GetSinkSpeed ()
|
|
|
|
{
|
|
|
|
return FRACUNIT;
|
|
|
|
}
|
|
|
|
|
|
|
|
fixed_t AActor::GetRaiseSpeed ()
|
|
|
|
{
|
|
|
|
return 2*FRACUNIT;
|
|
|
|
}
|
|
|
|
|
|
|
|
void AActor::HitFloor ()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool AActor::Slam (AActor *thing)
|
|
|
|
{
|
|
|
|
flags &= ~MF_SKULLFLY;
|
|
|
|
momx = momy = momz = 0;
|
2007-07-28 12:38:10 +00:00
|
|
|
if (health > 0)
|
- Fixed: EV_Teleport() did not set players to their idle state, so if they
were running when the teleported, they would still be running afterward
even though they weren't moving anywhere. Normally, P_XYMovement() does
this when they stop due to friction.
- Fixed: AActor::TakeSpecialDamage() completely bypassed the standard rules
for target switching on actors with MF5_NODAMAGE set.
- Changed the return values of the ACS spawn, spawnspot, and spawnspotfacing
commands to be the total count of things spawned, rather than a pretty
much useless reference to the actor spawned at the last map spot.
- Fixed: DLevelScript::DoSpawn() takes a byte angle, but DoSpawnSpotFacing()
passed it a full-length angle.
- Fixed: When MF_SKULLFLY is removed because an actor slams into something,
it was set to a see or spawn state, resetting its tic count and bypassing
the effectiveness of the MF2_DORMANT flag. While I was at it, I decided
dormant skulls shouldn't do slamming damage, either.
- Fixed: P_Thing_Spawn() returned success only if all thing instances were
successfully spawned. As long as at least one thing was spawned, it should
be considered a success.
- Fixed: Flipped single rotation sprites were only flipped every other 22.5
degree interval.
SVN r484 (trunk)
2007-02-14 22:47:01 +00:00
|
|
|
{
|
2007-07-28 12:38:10 +00:00
|
|
|
if (!(flags2 & MF2_DORMANT))
|
|
|
|
{
|
|
|
|
int dam = GetMissileDamage (7, 1);
|
|
|
|
P_DamageMobj (thing, this, this, dam, NAME_Melee);
|
|
|
|
P_TraceBleed (dam, thing, this);
|
2008-04-03 10:49:54 +00:00
|
|
|
if (SeeState != NULL) SetState (SeeState);
|
|
|
|
else SetIdle();
|
2007-07-28 12:38:10 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
SetIdle();
|
2007-07-28 12:38:10 +00:00
|
|
|
tics = -1;
|
|
|
|
}
|
- Fixed: EV_Teleport() did not set players to their idle state, so if they
were running when the teleported, they would still be running afterward
even though they weren't moving anywhere. Normally, P_XYMovement() does
this when they stop due to friction.
- Fixed: AActor::TakeSpecialDamage() completely bypassed the standard rules
for target switching on actors with MF5_NODAMAGE set.
- Changed the return values of the ACS spawn, spawnspot, and spawnspotfacing
commands to be the total count of things spawned, rather than a pretty
much useless reference to the actor spawned at the last map spot.
- Fixed: DLevelScript::DoSpawn() takes a byte angle, but DoSpawnSpotFacing()
passed it a full-length angle.
- Fixed: When MF_SKULLFLY is removed because an actor slams into something,
it was set to a see or spawn state, resetting its tic count and bypassing
the effectiveness of the MF2_DORMANT flag. While I was at it, I decided
dormant skulls shouldn't do slamming damage, either.
- Fixed: P_Thing_Spawn() returned success only if all thing instances were
successfully spawned. As long as at least one thing was spawned, it should
be considered a success.
- Fixed: Flipped single rotation sprites were only flipped every other 22.5
degree interval.
SVN r484 (trunk)
2007-02-14 22:47:01 +00:00
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
return false; // stop moving
|
|
|
|
}
|
|
|
|
|
|
|
|
bool AActor::SpecialBlastHandling (AActor *source, fixed_t strength)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
int AActor::SpecialMissileHit (AActor *victim)
|
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool AActor::AdjustReflectionAngle (AActor *thing, angle_t &angle)
|
|
|
|
{
|
2007-02-24 12:09:36 +00:00
|
|
|
if (flags2 & MF2_DONTREFLECT) return true;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
// Change angle for reflection
|
|
|
|
if (thing->flags4&MF4_SHIELDREFLECT)
|
|
|
|
{
|
|
|
|
// Shield reflection (from the Centaur
|
|
|
|
if (abs (angle - thing->angle)>>24 > 45)
|
|
|
|
return true; // Let missile explode
|
|
|
|
|
|
|
|
if (thing->IsKindOf (RUNTIME_CLASS(AHolySpirit))) // shouldn't this be handled by another flag???
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (pr_reflect () < 128)
|
|
|
|
angle += ANGLE_45;
|
|
|
|
else
|
|
|
|
angle -= ANGLE_45;
|
|
|
|
|
|
|
|
}
|
|
|
|
else if (thing->flags4&MF4_DEFLECT)
|
|
|
|
{
|
|
|
|
// deflect (like the Heresiarch)
|
|
|
|
if(pr_reflect() < 128)
|
|
|
|
angle += ANG45;
|
|
|
|
else
|
|
|
|
angle -= ANG45;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
angle += ANGLE_1 * ((pr_reflect()%16)-8);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void AActor::PlayActiveSound ()
|
|
|
|
{
|
2006-08-31 00:16:12 +00:00
|
|
|
if (ActiveSound && !S_IsActorPlayingSomething (this, CHAN_VOICE, -1))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (this, CHAN_VOICE, ActiveSound, 1,
|
2006-02-24 04:48:15 +00:00
|
|
|
(flags3 & MF3_FULLVOLACTIVE) ? ATTN_NONE : ATTN_IDLE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool AActor::IsOkayToAttack (AActor *link)
|
|
|
|
{
|
|
|
|
if (player) // Minotaur looking around player
|
|
|
|
{
|
|
|
|
if ((link->flags3 & MF3_ISMONSTER) ||
|
|
|
|
(link->player && (link != this)))
|
|
|
|
{
|
|
|
|
if (!(link->flags&MF_SHOOTABLE))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (link->flags2&MF2_DORMANT)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if ((link->IsKindOf (RUNTIME_CLASS(AMinotaur))) &&
|
|
|
|
(link->tracer == this))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (multiplayer && !deathmatch && link->player)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (P_CheckSight (this, link))
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void AActor::SetShade (DWORD rgb)
|
|
|
|
{
|
|
|
|
PalEntry *entry = (PalEntry *)&rgb;
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
fillcolor = rgb | (ColorMatcher.Pick (entry->r, entry->g, entry->b) << 24);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void AActor::SetShade (int r, int g, int b)
|
|
|
|
{
|
- Updated lempar.c to v1.31.
- Added .txt files to the list of types (wad, zip, and pk3) that can be
loaded without listing them after -file.
- Fonts that are created by the ACS setfont command to wrap a texture now
support animated textures.
- FON2 fonts can now use their full palette for CR_UNTRANSLATED when drawn
with the hardware 2D path instead of being restricted to the game palette.
- Fixed: Toggling vid_vsync would reset the displayed fullscreen gamma to 1
on a Radeon 9000.
- Added back the off-by-one palette handling, but in a much more limited
scope than before. The skipped entry is assumed to always be at 248, and
it is assumed that all Shader Model 1.4 cards suffer from this. That's
because all SM1.4 cards are based on variants of the ATI R200 core, and the
RV250 in a Radeon 9000 craps up like this. I see no reason to assume that
other flavors of the R200 are any different. (Interesting note: With the
Radeon 9000, D3DTADDRESS_CLAMP is an invalid address mode when using the
debug Direct3D 9 runtime, but it works perfectly fine with the retail
Direct3D 9 runtime.) (Insight: The R200 probably uses bytes for all its
math inside pixel shaders. That would explain perfectly why I can't use
constants greater than 1 with PS1.4 and why it can't do an exact mapping to
every entry in the color palette.
- Fixed: The software shaded drawer did not work for 2D, because its selected
"color"map was replaced with the identitymap before being used.
- Fixed: I cannot use Printf to output messages before the framebuffer was
completely setup, meaning that Shader Model 1.4 cards could not change
resolution.
- I have decided to let remap palettes specify variable alpha values for
their colors. D3DFB no longer forces them to 255.
- Updated re2c to version 0.12.3.
- Fixed: A_Wander used threshold as a timer, when it should have used
reactiontime.
- Fixed: A_CustomRailgun would not fire at all for actors without a target
when the aim parameter was disabled.
- Made the warp command work in multiplayer, again courtesy of Karate Chris.
- Fixed: Trying to spawn a bot while not in a game made for a crashing time.
(Patch courtesy of Karate Chris.)
- Removed some floating point math from hu_scores.cpp that somebody's GCC
gave warnings for (not mine, though).
- Fixed: The SBarInfo drawbar command crashed if the sprite image was
unavailable.
- Fixed: FString::operator=(const char *) did not release its old buffer when
being assigned to the null string.
- The scanner no longer has an upper limit on the length of strings it
accepts, though short strings will be faster than long ones.
- Moved all the text scanning functions into a class. Mainly, this means that
multiple script scanner states can be stored without being forced to do so
recursively. I think I might be taking advantage of that in the near
future. Possibly. Maybe.
- Removed some potential buffer overflows from the decal parser.
- Applied Blzut3's SBARINFO update #9:
* Fixed: When using even length values in drawnumber it would cap to a 98
value instead of a 99 as intended.
* The SBarInfo parser can now accept negatives for coordinates. This
doesn't allow much right now, but later I plan to add better fullscreen
hud support in which the negatives will be more useful. This also cleans
up the source a bit since all calls for (x, y) coordinates are with the
function getCoordinates().
- Added support for stencilling actors.
- Added support for non-black colors specified with DTA_ColorOverlay to the
software renderer.
- Fixed: The inverse, gold, red, and green fixed colormaps each allocated
space for 32 different colormaps, even though each only used the first one.
- Added two new blending flags to make reverse subtract blending more useful:
STYLEF_InvertSource and STYLEF_InvertOverlay. These invert the color that
gets blended with the background, since that seems like a good idea for
reverse subtraction. They also work with the other two blending operations.
- Added subtract and reverse subtract blending operations to the renderer.
Since the ERenderStyle enumeration was getting rather unwieldy, I converted
it into a new FRenderStyle structure that lets each parameter of the
blending equation be set separately. This simplified the set up for the
blend quite a bit, and it means a number of new combinations are available
by setting the parameters properly.
SVN r710 (trunk)
2008-01-25 23:57:44 +00:00
|
|
|
fillcolor = MAKEARGB(ColorMatcher.Pick (r, g, b), r, g, b);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_MobjThinker
|
|
|
|
//
|
|
|
|
void AActor::Tick ()
|
|
|
|
{
|
|
|
|
// [RH] Data for Heretic/Hexen scrolling sectors
|
2006-09-14 00:02:31 +00:00
|
|
|
static const BYTE HexenScrollDirs[8] = { 64, 0, 192, 128, 96, 32, 224, 160 };
|
|
|
|
static const BYTE HexenSpeedMuls[3] = { 5, 10, 25 };
|
|
|
|
static const SBYTE HexenScrollies[24][2] =
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
{ 0, 1 }, { 0, 2 }, { 0, 4 },
|
|
|
|
{ -1, 0 }, { -2, 0 }, { -4, 0 },
|
|
|
|
{ 0, -1 }, { 0, -2 }, { 0, -4 },
|
|
|
|
{ 1, 0 }, { 2, 0 }, { 4, 0 },
|
|
|
|
{ 1, 1 }, { 2, 2 }, { 4, 4 },
|
|
|
|
{ -1, 1 }, { -2, 2 }, { -4, 4 },
|
|
|
|
{ -1, -1 }, { -2, -2 }, { -4, -4 },
|
|
|
|
{ 1, -1 }, { 2, -2 }, { 4, -4 }
|
|
|
|
};
|
|
|
|
|
2006-09-14 00:02:31 +00:00
|
|
|
static const BYTE HereticScrollDirs[4] = { 6, 9, 1, 4 };
|
|
|
|
static const BYTE HereticSpeedMuls[5] = { 5, 10, 25, 30, 35 };
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
AActor *onmo;
|
|
|
|
int i;
|
|
|
|
|
2006-09-09 01:14:13 +00:00
|
|
|
assert (state != NULL);
|
|
|
|
if (state == NULL)
|
|
|
|
{
|
|
|
|
Destroy();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
PrevX = x;
|
|
|
|
PrevY = y;
|
|
|
|
PrevZ = z;
|
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
if (flags5 & MF5_NOINTERACTION)
|
2007-01-12 15:24:10 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
// only do the minimally necessary things here to save time.
|
|
|
|
UnlinkFromWorld ();
|
|
|
|
flags |= MF_NOBLOCKMAP;
|
|
|
|
x += momx;
|
|
|
|
y += momy;
|
|
|
|
z += momz;
|
|
|
|
LinkToWorld ();
|
2007-01-12 15:24:10 +00:00
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
else
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
AInventory * item = Inventory;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
// Handle powerup effects here so that the order is controlled
|
|
|
|
// by the order in the inventory, not the order in the thinker table
|
|
|
|
while (item != NULL && item->Owner == this)
|
|
|
|
{
|
|
|
|
item->DoEffect();
|
|
|
|
item = item->Inventory;
|
|
|
|
}
|
2007-05-01 15:09:44 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
if (flags & MF_UNMORPHED)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2007-05-01 15:09:44 +00:00
|
|
|
|
2008-04-06 09:24:41 +00:00
|
|
|
if (!(flags5 & MF5_NOTIMEFREEZE))
|
2008-04-03 10:49:54 +00:00
|
|
|
{
|
2008-04-06 09:24:41 +00:00
|
|
|
//Added by MC: Freeze mode.
|
|
|
|
if (bglobal.freeze && !(player && !player->isbot))
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-06 09:24:41 +00:00
|
|
|
// Apply freeze mode.
|
|
|
|
if (( level.flags & LEVEL_FROZEN ) && ( player == NULL || !( player->cheats & CF_TIMEFREEZE )))
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2008-04-04 14:31:20 +00:00
|
|
|
if (cl_rockettrails & 2)
|
|
|
|
{
|
|
|
|
if (effects & FX_ROCKET)
|
|
|
|
{
|
|
|
|
if (++smokecounter==4)
|
|
|
|
{
|
|
|
|
// add some smoke behind the rocket
|
|
|
|
smokecounter = 0;
|
|
|
|
AActor * th = Spawn("RocketSmokeTrail", x-momx, y-momy, z-momz, ALLOW_REPLACE);
|
|
|
|
if (th)
|
|
|
|
{
|
|
|
|
th->tics -= pr_rockettrail()&3;
|
|
|
|
if (th->tics < 1) th->tics = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (effects & FX_GRENADE)
|
|
|
|
{
|
|
|
|
if (++smokecounter==8)
|
|
|
|
{
|
|
|
|
smokecounter = 0;
|
|
|
|
angle_t moveangle = R_PointToAngle2(0,0,momx,momy);
|
|
|
|
AActor * th = Spawn("GrenadeSmokeTrail",
|
|
|
|
x - FixedMul (finecosine[(moveangle)>>ANGLETOFINESHIFT], radius*2) + (pr_rockettrail()<<10),
|
|
|
|
y - FixedMul (finesine[(moveangle)>>ANGLETOFINESHIFT], radius*2) + (pr_rockettrail()<<10),
|
|
|
|
z - (height>>3) * (momz>>16) + (2*height)/3, ALLOW_REPLACE);
|
|
|
|
if (th)
|
|
|
|
{
|
|
|
|
th->tics -= pr_rockettrail()&3;
|
|
|
|
if (th->tics < 1) th->tics = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
|
|
|
|
fixed_t oldz = z;
|
|
|
|
|
|
|
|
// [RH] Give the pain elemental vertical friction
|
|
|
|
// This used to be in APainElemental::Tick but in order to use
|
2008-04-04 14:31:20 +00:00
|
|
|
// A_PainAttack with other monsters it has to be here
|
2008-04-03 10:49:54 +00:00
|
|
|
if (flags4 & MF4_VFRICTION)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
if (health >0)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
if (abs (momz) < FRACUNIT/4)
|
|
|
|
{
|
|
|
|
momz = 0;
|
|
|
|
flags4 &= ~MF4_VFRICTION;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
momz = FixedMul (momz, 0xe800);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
|
|
|
|
// [RH] Pulse in and out of visibility
|
|
|
|
if (effects & FX_VISIBILITYPULSE)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
if (visdir > 0)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
alpha += 0x800;
|
|
|
|
if (alpha >= OPAQUE)
|
|
|
|
{
|
|
|
|
alpha = OPAQUE;
|
|
|
|
visdir = -1;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
else
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
alpha -= 0x800;
|
|
|
|
if (alpha <= TRANSLUC25)
|
|
|
|
{
|
|
|
|
alpha = TRANSLUC25;
|
|
|
|
visdir = 1;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
else if (flags & MF_STEALTH)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
// [RH] Fade a stealth monster in and out of visibility
|
|
|
|
RenderStyle.Flags &= ~STYLEF_Alpha1;
|
|
|
|
if (visdir > 0)
|
|
|
|
{
|
|
|
|
alpha += 2*FRACUNIT/TICRATE;
|
|
|
|
if (alpha > OPAQUE)
|
|
|
|
{
|
|
|
|
alpha = OPAQUE;
|
|
|
|
visdir = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (visdir < 0)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
alpha -= 3*FRACUNIT/TICRATE/2;
|
|
|
|
if (alpha < 0)
|
|
|
|
{
|
|
|
|
alpha = 0;
|
|
|
|
visdir = 0;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
if (bglobal.botnum && consoleplayer == Net_Arbitrator && !demoplayback &&
|
2008-06-25 22:16:04 +00:00
|
|
|
((flags & (MF_SPECIAL|MF_MISSILE)) || (flags3 & MF3_ISMONSTER)))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
clock (BotSupportCycles);
|
|
|
|
bglobal.m_Thinking = true;
|
|
|
|
for (i = 0; i < MAXPLAYERS; i++)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
if (!playeringame[i] || !players[i].isbot)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (flags3 & MF3_ISMONSTER)
|
|
|
|
{
|
|
|
|
if (health > 0
|
|
|
|
&& !players[i].enemy
|
|
|
|
&& player ? !IsTeammate (players[i].mo) : true
|
|
|
|
&& P_AproxDistance (players[i].mo->x-x, players[i].mo->y-y) < MAX_MONSTER_TARGET_DIST
|
|
|
|
&& P_CheckSight (players[i].mo, this, 2))
|
|
|
|
{ //Probably a monster, so go kill it.
|
|
|
|
players[i].enemy = this;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
else if (flags & MF_SPECIAL)
|
|
|
|
{ //Item pickup time
|
|
|
|
//clock (BotWTG);
|
|
|
|
bglobal.WhatToGet (players[i].mo, this);
|
|
|
|
//unclock (BotWTG);
|
|
|
|
BotWTG++;
|
|
|
|
}
|
|
|
|
else if (flags & MF_MISSILE)
|
|
|
|
{
|
|
|
|
if (!players[i].missile && (flags3 & MF3_WARNBOT))
|
|
|
|
{ //warn for incoming missiles.
|
|
|
|
if (target != players[i].mo && bglobal.Check_LOS (players[i].mo, this, ANGLE_90))
|
|
|
|
players[i].missile = this;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
bglobal.m_Thinking = false;
|
|
|
|
unclock (BotSupportCycles);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
//End of MC
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
// [RH] Consider carrying sectors here
|
|
|
|
fixed_t cummx = 0, cummy = 0;
|
|
|
|
if ((level.Scrolls != NULL || player != NULL) && !(flags & MF_NOCLIP) && !(flags & MF_NOSECTOR))
|
|
|
|
{
|
|
|
|
fixed_t height, waterheight; // killough 4/4/98: add waterheight
|
|
|
|
const msecnode_t *node;
|
|
|
|
int countx, county;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
// killough 3/7/98: Carry things on floor
|
|
|
|
// killough 3/20/98: use new sector list which reflects true members
|
|
|
|
// killough 3/27/98: fix carrier bug
|
|
|
|
// killough 4/4/98: Underwater, carry things even w/o gravity
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
// Move objects only if on floor or underwater,
|
|
|
|
// non-floating, and clipped.
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
countx = county = 0;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
for (node = touching_sectorlist; node; node = node->m_tnext)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
const sector_t *sec = node->m_sector;
|
|
|
|
fixed_t scrollx, scrolly;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
if (level.Scrolls != NULL)
|
|
|
|
{
|
|
|
|
const FSectorScrollValues *scroll = &level.Scrolls[sec - sectors];
|
|
|
|
scrollx = scroll->ScrollX;
|
|
|
|
scrolly = scroll->ScrollY;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
scrollx = scrolly = 0;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
if (player != NULL)
|
|
|
|
{
|
|
|
|
int scrolltype = sec->special & 0xff;
|
|
|
|
|
|
|
|
if (scrolltype >= Scroll_North_Slow &&
|
|
|
|
scrolltype <= Scroll_SouthWest_Fast)
|
|
|
|
{ // Hexen scroll special
|
|
|
|
scrolltype -= Scroll_North_Slow;
|
|
|
|
if (i_compatflags&COMPATF_RAVENSCROLL)
|
|
|
|
{
|
|
|
|
angle_t fineangle = HexenScrollDirs[scrolltype / 3] * 32;
|
|
|
|
fixed_t carryspeed = DivScale32 (HexenSpeedMuls[scrolltype % 3], 32*CARRYFACTOR);
|
|
|
|
scrollx += FixedMul (carryspeed, finecosine[fineangle]);
|
|
|
|
scrolly += FixedMul (carryspeed, finesine[fineangle]);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Use speeds that actually match the scrolling textures!
|
|
|
|
scrollx -= HexenScrollies[scrolltype][0] << (FRACBITS-1);
|
|
|
|
scrolly += HexenScrollies[scrolltype][1] << (FRACBITS-1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (scrolltype >= Carry_East5 &&
|
|
|
|
scrolltype <= Carry_West35)
|
|
|
|
{ // Heretic scroll special
|
|
|
|
scrolltype -= Carry_East5;
|
|
|
|
BYTE dir = HereticScrollDirs[scrolltype / 5];
|
|
|
|
fixed_t carryspeed = DivScale32 (HereticSpeedMuls[scrolltype % 5], 32*CARRYFACTOR);
|
|
|
|
if (scrolltype<=Carry_East35 && !(i_compatflags&COMPATF_RAVENSCROLL))
|
|
|
|
{
|
|
|
|
// Use speeds that actually match the scrolling textures!
|
|
|
|
carryspeed = (1 << ((scrolltype%5) + FRACBITS-1));
|
|
|
|
}
|
|
|
|
scrollx += carryspeed * ((dir & 3) - 1);
|
|
|
|
scrolly += carryspeed * (((dir & 12) >> 2) - 1);
|
|
|
|
}
|
|
|
|
else if (scrolltype == dScroll_EastLavaDamage)
|
|
|
|
{ // Special Heretic scroll special
|
|
|
|
if (i_compatflags&COMPATF_RAVENSCROLL)
|
|
|
|
{
|
|
|
|
scrollx += DivScale32 (28, 32*CARRYFACTOR);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Use a speed that actually matches the scrolling texture!
|
|
|
|
scrollx += DivScale32 (12, 32*CARRYFACTOR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (scrolltype == Scroll_StrifeCurrent)
|
|
|
|
{ // Strife scroll special
|
|
|
|
int anglespeed = sec->tag - 100;
|
|
|
|
fixed_t carryspeed = DivScale32 (anglespeed % 10, 16*CARRYFACTOR);
|
|
|
|
angle_t fineangle = (anglespeed / 10) << (32-3);
|
|
|
|
fineangle >>= ANGLETOFINESHIFT;
|
2006-02-24 04:48:15 +00:00
|
|
|
scrollx += FixedMul (carryspeed, finecosine[fineangle]);
|
|
|
|
scrolly += FixedMul (carryspeed, finesine[fineangle]);
|
|
|
|
}
|
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
|
|
|
|
if ((scrollx | scrolly) == 0)
|
|
|
|
{
|
|
|
|
continue;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
if (flags & MF_NOGRAVITY &&
|
|
|
|
(sec->heightsec == NULL || (sec->heightsec->MoreFlags & SECF_IGNOREHEIGHTSEC)))
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
height = sec->floorplane.ZatPoint (x, y);
|
|
|
|
if (z > height)
|
|
|
|
{
|
|
|
|
if (sec->heightsec == NULL || (sec->heightsec->MoreFlags & SECF_IGNOREHEIGHTSEC))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
continue;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
|
|
|
|
waterheight = sec->heightsec->floorplane.ZatPoint (x, y);
|
|
|
|
if (waterheight > height && z >= waterheight)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
continue;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
cummx += scrollx;
|
|
|
|
cummy += scrolly;
|
|
|
|
if (scrollx) countx++;
|
|
|
|
if (scrolly) county++;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
|
|
|
|
// Some levels designed with Boom in mind actually want things to accelerate
|
|
|
|
// at neighboring scrolling sector boundaries. But it is only important for
|
|
|
|
// non-player objects.
|
|
|
|
if (player != NULL || !(i_compatflags & COMPATF_BOOMSCROLL))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
if (countx > 1)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
cummx /= countx;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
if (county > 1)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
cummy /= county;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
// [RH] If standing on a steep slope, fall down it
|
|
|
|
if ((flags & MF_SOLID) && !(flags & (MF_NOCLIP|MF_NOGRAVITY)) &&
|
|
|
|
!(flags & MF_NOBLOCKMAP) &&
|
|
|
|
momz <= 0 &&
|
|
|
|
floorz == z)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
const secplane_t * floorplane = &floorsector->floorplane;
|
|
|
|
if (floorplane->c < STEEPSLOPE &&
|
|
|
|
floorplane->ZatPoint (x, y) <= floorz)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
const msecnode_t *node;
|
|
|
|
bool dopush = true;
|
2006-04-14 16:25:57 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
if (floorplane->c > STEEPSLOPE*2/3)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
for (node = touching_sectorlist; node; node = node->m_tnext)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
const sector_t *sec = node->m_sector;
|
|
|
|
if (sec->floorplane.c >= STEEPSLOPE)
|
2006-04-14 16:25:57 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
if (floorplane->ZatPoint (x, y) >= z - MaxStepHeight)
|
|
|
|
{
|
|
|
|
dopush = false;
|
|
|
|
break;
|
|
|
|
}
|
2006-04-14 16:25:57 +00:00
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
if (dopush)
|
|
|
|
{
|
|
|
|
momx += floorplane->a;
|
|
|
|
momy += floorplane->b;
|
|
|
|
}
|
2006-04-14 16:25:57 +00:00
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
// [RH] Missiles moving perfectly vertical need some X/Y movement, or they
|
|
|
|
// won't hurt anything. Don't do this if damage is 0! That way, you can
|
|
|
|
// still have missiles that go straight up and down through actors without
|
|
|
|
// damaging anything.
|
|
|
|
if ((flags & MF_MISSILE) && (momx|momy) == 0 && Damage != 0)
|
|
|
|
{
|
|
|
|
momx = 1;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
// Handle X and Y momemtums
|
|
|
|
BlockingMobj = NULL;
|
|
|
|
P_XYMovement (this, cummx, cummy);
|
|
|
|
if (ObjectFlags & OF_EuthanizeMe)
|
|
|
|
{ // actor was destroyed
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if ((momx | momy) == 0 && (flags2 & MF2_BLASTED))
|
|
|
|
{ // Reset to not blasted when momentums are gone
|
|
|
|
flags2 &= ~MF2_BLASTED;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
if (flags2 & MF2_FLOATBOB)
|
|
|
|
{ // Floating item bobbing motion
|
|
|
|
z += FloatBobDiffs[(FloatBobPhase + level.maptime) & 63];
|
|
|
|
}
|
|
|
|
if (momz || BlockingMobj ||
|
|
|
|
(z != floorz && (!(flags2 & MF2_FLOATBOB) ||
|
|
|
|
(z - FloatBobOffsets[(FloatBobPhase + level.maptime) & 63] != floorz)
|
|
|
|
)))
|
|
|
|
{ // Handle Z momentum and gravity
|
|
|
|
if (((flags2 & MF2_PASSMOBJ) || (flags & MF_SPECIAL)) && !(i_compatflags & COMPATF_NO_PASSMOBJ))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
if (!(onmo = P_CheckOnmobj (this)))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
P_ZMovement (this);
|
|
|
|
flags2 &= ~MF2_ONMOBJ;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
else
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
if (player)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
if (momz < (fixed_t)(level.gravity * Sector->gravity * -655.36f)
|
|
|
|
&& !(flags&MF_NOGRAVITY))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
PlayerLandedOnThing (this, onmo);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
}
|
|
|
|
if (onmo->z + onmo->height - z <= MaxStepHeight)
|
|
|
|
{
|
|
|
|
if (player && player->mo == this)
|
|
|
|
{
|
|
|
|
player->viewheight -= onmo->z + onmo->height - z;
|
|
|
|
fixed_t deltaview = player->GetDeltaViewHeight();
|
|
|
|
if (deltaview > player->deltaviewheight)
|
|
|
|
{
|
|
|
|
player->deltaviewheight = deltaview;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
z = onmo->z + onmo->height;
|
|
|
|
}
|
|
|
|
flags2 |= MF2_ONMOBJ;
|
|
|
|
momz = 0;
|
|
|
|
Crash();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
P_ZMovement (this);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ObjectFlags & OF_EuthanizeMe)
|
|
|
|
return; // actor was destroyed
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
else if (z <= floorz)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-03 10:49:54 +00:00
|
|
|
Crash();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
UpdateWaterLevel (oldz);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
// [RH] Don't advance if predicting a player
|
|
|
|
if (player && (player->cheats & CF_PREDICTING))
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// cycle through states, calling action functions at transitions
|
|
|
|
if (tics != -1)
|
|
|
|
{
|
|
|
|
tics--;
|
|
|
|
|
|
|
|
// you can cycle through multiple states in a tic
|
|
|
|
// [RH] Use <= 0 instead of == 0 so that spawnstates
|
|
|
|
// of 0 tics work as expected.
|
|
|
|
if (tics <= 0)
|
|
|
|
{
|
2006-09-09 01:14:13 +00:00
|
|
|
assert (state != NULL);
|
|
|
|
if (state == NULL)
|
|
|
|
{
|
|
|
|
Destroy();
|
|
|
|
return;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
if (!SetState (state->GetNextState()))
|
|
|
|
return; // freed itself
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-10-29 22:15:46 +00:00
|
|
|
int respawn_monsters = G_SkillProperty(SKILLP_Respawn);
|
2006-02-24 04:48:15 +00:00
|
|
|
// check for nightmare respawn
|
2008-03-01 16:59:17 +00:00
|
|
|
if (!(flags5 & MF5_ALWAYSRESPAWN))
|
|
|
|
{
|
|
|
|
if (!respawn_monsters || !(flags3 & MF3_ISMONSTER) || (flags2 & MF2_DORMANT) || (flags5 & MF5_NEVERRESPAWN))
|
|
|
|
return;
|
|
|
|
|
|
|
|
int limit = G_SkillProperty (SKILLP_RespawnLimit);
|
|
|
|
if (limit > 0 && skillrespawncount >= limit)
|
|
|
|
return;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
movecount++;
|
|
|
|
|
2007-10-29 22:15:46 +00:00
|
|
|
if (movecount < respawn_monsters)
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (level.time & 31)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (pr_nightmarerespawn() > 4)
|
|
|
|
return;
|
|
|
|
|
|
|
|
P_NightmareRespawn (this);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// AActor::UpdateWaterLevel
|
|
|
|
//
|
|
|
|
// Returns true if actor should splash
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-01-07 09:43:58 +00:00
|
|
|
bool AActor::UpdateWaterLevel (fixed_t oldz, bool dosplash)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-09-14 00:02:31 +00:00
|
|
|
BYTE lastwaterlevel = waterlevel;
|
2007-01-07 09:43:58 +00:00
|
|
|
fixed_t fh=FIXED_MIN;
|
|
|
|
bool reset=false;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
waterlevel = 0;
|
|
|
|
|
|
|
|
if (Sector == NULL)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2008-06-10 09:16:01 +00:00
|
|
|
if (Sector->MoreFlags & SECF_UNDERWATER) // intentionally not SECF_UNDERWATERMASK
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
waterlevel = 3;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const sector_t *hsec = Sector->heightsec;
|
|
|
|
if (hsec != NULL && !(hsec->MoreFlags & SECF_IGNOREHEIGHTSEC))
|
|
|
|
{
|
2007-01-07 09:43:58 +00:00
|
|
|
fh = hsec->floorplane.ZatPoint (x, y);
|
2008-06-10 09:16:01 +00:00
|
|
|
//if (hsec->MoreFlags & SECF_UNDERWATERMASK) // also check Boom-style non-swimmable sectors
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
if (z < fh)
|
|
|
|
{
|
|
|
|
waterlevel = 1;
|
|
|
|
if (z + height/2 < fh)
|
|
|
|
{
|
|
|
|
waterlevel = 2;
|
|
|
|
if ((player && z + player->viewheight <= fh) ||
|
|
|
|
(z + height <= fh))
|
|
|
|
{
|
|
|
|
waterlevel = 3;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (z + height > hsec->ceilingplane.ZatPoint (x, y))
|
|
|
|
{
|
|
|
|
waterlevel = 3;
|
|
|
|
}
|
2007-01-07 09:43:58 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
waterlevel=0;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2007-01-07 09:43:58 +00:00
|
|
|
// even non-swimmable deep water must be checked here to do the splashes correctly
|
2008-06-10 09:16:01 +00:00
|
|
|
// But the water level must be reset when this function returns
|
2007-04-22 07:45:18 +00:00
|
|
|
if (!(hsec->MoreFlags&SECF_UNDERWATERMASK)) reset=true;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-07 09:43:58 +00:00
|
|
|
|
2008-06-10 09:16:01 +00:00
|
|
|
// some additional checks to make deep sectors like Boom's splash without setting
|
2007-01-07 09:43:58 +00:00
|
|
|
// the water flags.
|
|
|
|
if (boomwaterlevel == 0 && waterlevel != 0 && dosplash) P_HitWater(this, Sector, fh);
|
|
|
|
boomwaterlevel=waterlevel;
|
|
|
|
if (reset) waterlevel=lastwaterlevel;
|
|
|
|
return false; // we did the splash ourselves! ;)
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC A_FreeTargMobj
|
|
|
|
//
|
|
|
|
//----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void A_FreeTargMobj (AActor *mo)
|
|
|
|
{
|
|
|
|
mo->momx = mo->momy = mo->momz = 0;
|
|
|
|
mo->z = mo->ceilingz + 4*FRACUNIT;
|
|
|
|
mo->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_SKULLFLY|MF_SOLID);
|
|
|
|
mo->flags |= MF_CORPSE|MF_DROPOFF|MF_NOGRAVITY;
|
2007-01-20 14:27:44 +00:00
|
|
|
mo->flags2 &= ~MF2_PASSMOBJ;
|
|
|
|
mo->gravity = FRACUNIT;
|
2006-02-24 04:48:15 +00:00
|
|
|
mo->player = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// A_GenericFreezeDeath
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void A_GenericFreezeDeath (AActor *actor)
|
|
|
|
{
|
|
|
|
actor->Translation = TRANSLATION(TRANSLATION_Standard, 7);
|
|
|
|
A_FreezeDeath (actor);
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// AActor stuff
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
FState AActor::States[] =
|
|
|
|
{
|
|
|
|
S_NORMAL (TNT1, 'A', -1, NULL, NULL),
|
|
|
|
S_NORMAL (TNT1, 'E', 1050, A_FreeTargMobj, NULL),
|
|
|
|
S_NORMAL (TNT1, 'A', 1, NULL, NULL), // S_NULL
|
|
|
|
|
|
|
|
// Generic freeze death frames. Woo!
|
|
|
|
S_NORMAL (----, 'A', 5, A_GenericFreezeDeath, &States[4]),
|
|
|
|
S_NORMAL (----, 'A', 1, A_FreezeDeathChunks, &States[4])
|
|
|
|
};
|
|
|
|
|
|
|
|
BEGIN_DEFAULTS (AActor, Any, -1, 0)
|
2006-11-14 16:54:02 +00:00
|
|
|
PROP_XScale (FRACUNIT)
|
|
|
|
PROP_YScale (FRACUNIT)
|
2006-02-24 04:48:15 +00:00
|
|
|
PROP_SpawnState (2)
|
|
|
|
PROP_SpawnHealth (1000)
|
|
|
|
PROP_ReactionTime (8)
|
|
|
|
PROP_RadiusFixed (20)
|
|
|
|
PROP_HeightFixed (16)
|
|
|
|
PROP_Mass (100)
|
|
|
|
PROP_RenderStyle (STYLE_Normal)
|
|
|
|
PROP_Alpha (FRACUNIT)
|
|
|
|
PROP_MinMissileChance (200)
|
|
|
|
PROP_MeleeRange(44) // MELEERANGE(64) - 20
|
|
|
|
PROP_MaxDropOffHeight(24)
|
|
|
|
PROP_MaxStepHeight(24)
|
2008-06-12 10:08:50 +00:00
|
|
|
PROP_BounceFactor(FRACUNIT*7/10)
|
|
|
|
PROP_WallBounceFactor(FRACUNIT*3/4)
|
2006-04-18 22:15:05 +00:00
|
|
|
PROP_BounceCount(-1)
|
2006-05-14 14:30:13 +00:00
|
|
|
PROP_FloatSpeed(4)
|
2007-01-20 14:27:44 +00:00
|
|
|
PROP_Gravity(FRACUNIT)
|
2006-02-24 04:48:15 +00:00
|
|
|
END_DEFAULTS
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// P_SpawnMobj
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2006-07-16 09:10:45 +00:00
|
|
|
AActor *AActor::StaticSpawn (const PClass *type, fixed_t ix, fixed_t iy, fixed_t iz, replace_t allowreplacement)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
if (type == NULL)
|
|
|
|
{
|
|
|
|
I_Error ("Tried to spawn a class-less actor\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type->ActorInfo == NULL)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
I_Error ("%s is not an actor\n", type->TypeName.GetChars());
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2006-07-16 09:10:45 +00:00
|
|
|
if (allowreplacement)
|
|
|
|
type = type->ActorInfo->GetReplacement()->Class;
|
|
|
|
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
AActor *actor;
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
actor = static_cast<AActor *>(const_cast<PClass *>(type)->CreateNew ());
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
actor->x = actor->PrevX = ix;
|
|
|
|
actor->y = actor->PrevY = iy;
|
|
|
|
actor->z = actor->PrevZ = iz;
|
2008-06-15 18:36:26 +00:00
|
|
|
actor->picnum.SetInvalid();
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-03-28 00:38:17 +00:00
|
|
|
FRandom &rng = bglobal.m_Thinking ? pr_botspawnmobj : pr_spawnmobj;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2007-10-29 22:15:46 +00:00
|
|
|
if (actor->isFast() && actor->flags3 & MF3_ISMONSTER)
|
2006-02-24 04:48:15 +00:00
|
|
|
actor->reactiontime = 0;
|
|
|
|
|
|
|
|
if (actor->flags3 & MF3_ISMONSTER)
|
|
|
|
{
|
2008-03-12 02:56:11 +00:00
|
|
|
actor->LastLookPlayerNumber = rng() % MAXPLAYERS;
|
2006-02-24 04:48:15 +00:00
|
|
|
actor->TIDtoHate = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the state, but do not use SetState, because action
|
|
|
|
// routines can't be called yet. If the spawnstate has an action
|
|
|
|
// routine, it will not be called.
|
|
|
|
FState *st = actor->SpawnState;
|
|
|
|
actor->state = st;
|
|
|
|
actor->tics = st->GetTics();
|
2006-11-04 13:06:42 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
actor->sprite = st->sprite.index;
|
|
|
|
actor->frame = st->GetFrame();
|
|
|
|
actor->renderflags = (actor->renderflags & ~RF_FULLBRIGHT) | st->GetFullbright();
|
|
|
|
actor->touching_sectorlist = NULL; // NULL head of sector list // phares 3/13/98
|
2007-10-29 22:15:46 +00:00
|
|
|
if (G_SkillProperty(SKILLP_FastMonsters))
|
2006-11-02 07:23:08 +00:00
|
|
|
actor->Speed = actor->GetClass()->Meta.GetMetaFixed(AMETA_FastSpeed, actor->Speed);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// set subsector and/or block links
|
|
|
|
actor->LinkToWorld (SpawningMapThing);
|
|
|
|
if (SpawningMapThing || !type->IsDescendantOf (RUNTIME_CLASS(APlayerPawn)))
|
|
|
|
{
|
|
|
|
actor->dropoffz = // killough 11/98: for tracking dropoffs
|
|
|
|
actor->floorz = actor->Sector->floorplane.ZatPoint (ix, iy);
|
|
|
|
actor->ceilingz = actor->Sector->ceilingplane.ZatPoint (ix, iy);
|
|
|
|
actor->floorsector = actor->Sector;
|
|
|
|
actor->floorpic = actor->floorsector->floorpic;
|
2006-04-17 13:53:34 +00:00
|
|
|
actor->ceilingsector = actor->Sector;
|
|
|
|
actor->ceilingpic = actor->ceilingsector->ceilingpic;
|
2008-05-14 07:45:40 +00:00
|
|
|
// Check if there's something solid to stand on between the current position and the
|
|
|
|
// current sector's floor.
|
|
|
|
P_FindFloorCeiling(actor, true);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
else if (!(actor->flags5 & MF5_NOINTERACTION))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
P_FindFloorCeiling (actor);
|
|
|
|
}
|
2008-04-03 10:49:54 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
actor->floorz = FIXED_MIN;
|
|
|
|
actor->dropoffz = FIXED_MIN;
|
|
|
|
actor->ceilingz = FIXED_MAX;
|
2008-06-15 18:36:26 +00:00
|
|
|
actor->floorpic = actor->Sector->floorpic;
|
2008-04-03 10:49:54 +00:00
|
|
|
actor->floorsector = actor->Sector;
|
2008-06-15 18:36:26 +00:00
|
|
|
actor->ceilingpic = actor->Sector->ceilingpic;
|
2008-04-03 10:49:54 +00:00
|
|
|
actor->ceilingsector = actor->Sector;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-05-08 08:06:26 +00:00
|
|
|
actor->SpawnPoint[0] = ix;
|
|
|
|
actor->SpawnPoint[1] = iy;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (iz == ONFLOORZ)
|
|
|
|
{
|
|
|
|
actor->z = actor->floorz;
|
|
|
|
}
|
|
|
|
else if (iz == ONCEILINGZ)
|
|
|
|
{
|
|
|
|
actor->z = actor->ceilingz - actor->height;
|
|
|
|
}
|
|
|
|
else if (iz == FLOATRANDZ)
|
|
|
|
{
|
|
|
|
fixed_t space = actor->ceilingz - actor->height - actor->floorz;
|
|
|
|
if (space > 48*FRACUNIT)
|
|
|
|
{
|
|
|
|
space -= 40*FRACUNIT;
|
|
|
|
actor->z = MulScale8 (space, rng()) + actor->floorz + 40*FRACUNIT;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
actor->z = actor->floorz;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-05-08 08:06:26 +00:00
|
|
|
actor->SpawnPoint[2] = (actor->z - actor->floorz);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (actor->flags2 & MF2_FLOATBOB)
|
|
|
|
{ // Prime the bobber
|
|
|
|
actor->FloatBobPhase = rng();
|
|
|
|
actor->z += FloatBobOffsets[(actor->FloatBobPhase + level.maptime - 1) & 63];
|
|
|
|
}
|
|
|
|
if (actor->flags2 & MF2_FLOORCLIP)
|
|
|
|
{
|
|
|
|
actor->AdjustFloorClip ();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
actor->floorclip = 0;
|
|
|
|
}
|
2007-01-07 09:43:58 +00:00
|
|
|
actor->UpdateWaterLevel (actor->z, false);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (!SpawningMapThing)
|
|
|
|
{
|
|
|
|
actor->BeginPlay ();
|
2008-03-12 02:56:11 +00:00
|
|
|
if (actor->ObjectFlags & OF_EuthanizeMe)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
2007-07-12 15:15:57 +00:00
|
|
|
if (level.flags & LEVEL_NOALLIES && !actor->player)
|
|
|
|
{
|
|
|
|
actor->flags &= ~MF_FRIENDLY;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
// [RH] Count monsters whenever they are spawned.
|
2006-04-16 13:29:50 +00:00
|
|
|
if (actor->CountsAsKill())
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
level.total_monsters++;
|
|
|
|
}
|
|
|
|
// [RH] Same, for items
|
|
|
|
if (actor->flags & MF_COUNTITEM)
|
|
|
|
{
|
|
|
|
level.total_items++;
|
|
|
|
}
|
|
|
|
return actor;
|
|
|
|
}
|
|
|
|
|
2006-07-31 10:22:53 +00:00
|
|
|
AActor *Spawn (const char *type, fixed_t x, fixed_t y, fixed_t z, replace_t allowreplacement)
|
|
|
|
{
|
|
|
|
const PClass *cls = PClass::FindClass(type);
|
|
|
|
if (cls == NULL)
|
|
|
|
{
|
|
|
|
I_Error("Attempt to spawn actor of unknown type '%s'\n", type);
|
|
|
|
}
|
|
|
|
return AActor::StaticSpawn (cls, x, y, z, allowreplacement);
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
void AActor::LevelSpawned ()
|
|
|
|
{
|
|
|
|
if (tics > 0 && !(flags4 & MF4_SYNCHRONIZED))
|
|
|
|
tics = 1 + (pr_spawnmapthing() % tics);
|
|
|
|
angle_t incs = AngleIncrements ();
|
|
|
|
angle -= angle % incs;
|
|
|
|
flags &= ~MF_DROPPED; // [RH] clear MF_DROPPED flag
|
|
|
|
HandleSpawnFlags ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void AActor::HandleSpawnFlags ()
|
|
|
|
{
|
|
|
|
if (SpawnFlags & MTF_AMBUSH)
|
|
|
|
{
|
|
|
|
flags |= MF_AMBUSH;
|
|
|
|
}
|
|
|
|
if (SpawnFlags & MTF_DORMANT)
|
|
|
|
{
|
|
|
|
Deactivate (NULL);
|
|
|
|
}
|
|
|
|
if (SpawnFlags & MTF_STANDSTILL)
|
|
|
|
{
|
|
|
|
flags4 |= MF4_STANDSTILL;
|
|
|
|
}
|
|
|
|
if (SpawnFlags & MTF_FRIENDLY)
|
|
|
|
{
|
|
|
|
flags |= MF_FRIENDLY;
|
2006-04-17 13:53:34 +00:00
|
|
|
// Friendlies don't count as kills!
|
2006-02-24 04:48:15 +00:00
|
|
|
if (flags & MF_COUNTKILL)
|
|
|
|
{
|
|
|
|
flags &= ~MF_COUNTKILL;
|
|
|
|
level.total_monsters--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (SpawnFlags & MTF_SHADOW)
|
|
|
|
{
|
|
|
|
flags |= MF_SHADOW;
|
|
|
|
RenderStyle = STYLE_Translucent;
|
|
|
|
alpha = TRANSLUC25;
|
|
|
|
}
|
|
|
|
else if (SpawnFlags & MTF_ALTSHADOW)
|
|
|
|
{
|
|
|
|
RenderStyle = STYLE_None;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void AActor::BeginPlay ()
|
|
|
|
{
|
2008-01-16 04:43:50 +00:00
|
|
|
// If the actor is spawned with the dormant flag set, clear it, and use
|
|
|
|
// the normal deactivation logic to make it properly dormant.
|
|
|
|
if (flags2 & MF2_DORMANT)
|
|
|
|
{
|
|
|
|
flags2 &= ~MF2_DORMANT;
|
|
|
|
Deactivate (NULL);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2007-10-29 22:15:46 +00:00
|
|
|
bool AActor::isFast()
|
|
|
|
{
|
|
|
|
if (flags5&MF5_ALWAYSFAST) return true;
|
|
|
|
if (flags5&MF5_NEVERFAST) return false;
|
|
|
|
return !!G_SkillProperty(SKILLP_FastMonsters);
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
void AActor::Activate (AActor *activator)
|
|
|
|
{
|
|
|
|
if ((flags3 & MF3_ISMONSTER) && (health > 0 || (flags & MF_ICECORPSE)))
|
|
|
|
{
|
|
|
|
if (flags2 & MF2_DORMANT)
|
|
|
|
{
|
|
|
|
flags2 &= ~MF2_DORMANT;
|
|
|
|
tics = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void AActor::Deactivate (AActor *activator)
|
|
|
|
{
|
|
|
|
if ((flags3 & MF3_ISMONSTER) && (health > 0 || (flags & MF_ICECORPSE)))
|
|
|
|
{
|
|
|
|
if (!(flags2 & MF2_DORMANT))
|
|
|
|
{
|
|
|
|
flags2 |= MF2_DORMANT;
|
|
|
|
tics = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_RemoveMobj
|
|
|
|
//
|
|
|
|
|
|
|
|
void AActor::Destroy ()
|
|
|
|
{
|
|
|
|
// [RH] Destroy any inventory this actor is carrying
|
2006-06-18 04:10:47 +00:00
|
|
|
DestroyAllInventory ();
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// [RH] Unlink from tid chain
|
|
|
|
RemoveFromHash ();
|
|
|
|
|
|
|
|
// unlink from sector and block lists
|
|
|
|
UnlinkFromWorld ();
|
|
|
|
flags |= MF_NOSECTOR|MF_NOBLOCKMAP;
|
|
|
|
|
|
|
|
// Delete all nodes on the current sector_list phares 3/16/98
|
2006-05-18 04:25:26 +00:00
|
|
|
P_DelSector_List();
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2006-06-18 04:10:47 +00:00
|
|
|
// Transform any playing sound into positioned, non-actor sounds.
|
2006-02-24 04:48:15 +00:00
|
|
|
S_RelinkSound (this, NULL);
|
|
|
|
|
|
|
|
Super::Destroy ();
|
|
|
|
}
|
|
|
|
|
|
|
|
//===========================================================================
|
|
|
|
//
|
|
|
|
// AdjustFloorClip
|
|
|
|
//
|
|
|
|
//===========================================================================
|
|
|
|
|
|
|
|
void AActor::AdjustFloorClip ()
|
|
|
|
{
|
|
|
|
if (flags3 & MF3_SPECIALFLOORCLIP)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
fixed_t oldclip = floorclip;
|
|
|
|
fixed_t shallowestclip = FIXED_MAX;
|
|
|
|
const msecnode_t *m;
|
|
|
|
|
|
|
|
// [RH] clip based on shallowest floor player is standing on
|
|
|
|
// If the sector has a deep water effect, then let that effect
|
|
|
|
// do the floorclipping instead of the terrain type.
|
|
|
|
for (m = touching_sectorlist; m; m = m->m_tnext)
|
|
|
|
{
|
|
|
|
if ((m->m_sector->heightsec == NULL ||
|
|
|
|
m->m_sector->heightsec->MoreFlags & SECF_IGNOREHEIGHTSEC) &&
|
|
|
|
m->m_sector->floorplane.ZatPoint (x, y) == z)
|
|
|
|
{
|
|
|
|
fixed_t clip = Terrains[TerrainTypes[m->m_sector->floorpic]].FootClip;
|
|
|
|
if (clip < shallowestclip)
|
|
|
|
{
|
|
|
|
shallowestclip = clip;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (shallowestclip == FIXED_MAX)
|
|
|
|
{
|
|
|
|
floorclip = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
floorclip = shallowestclip;
|
|
|
|
}
|
|
|
|
if (player && player->mo == this && oldclip != floorclip)
|
|
|
|
{
|
|
|
|
player->viewheight -= oldclip - floorclip;
|
2006-04-11 16:27:41 +00:00
|
|
|
player->deltaviewheight = player->GetDeltaViewHeight();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_SpawnPlayer
|
|
|
|
// Called when a player is spawned on the level.
|
|
|
|
// Most of the player structure stays unchanged between levels.
|
|
|
|
//
|
|
|
|
EXTERN_CVAR (Bool, chasedemo)
|
2007-10-29 22:15:46 +00:00
|
|
|
|
2006-04-16 19:09:36 +00:00
|
|
|
extern bool demonew;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-05-08 08:06:26 +00:00
|
|
|
APlayerPawn *P_SpawnPlayer (FMapThing *mthing, bool tempplayer)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
int playernum;
|
|
|
|
player_t *p;
|
|
|
|
APlayerPawn *mobj, *oldactor;
|
|
|
|
BYTE state;
|
2008-01-09 02:53:38 +00:00
|
|
|
fixed_t spawn_x, spawn_y;
|
|
|
|
angle_t spawn_angle;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// [RH] Things 4001-? are also multiplayer starts. Just like 1-4.
|
|
|
|
// To make things simpler, figure out which player is being
|
|
|
|
// spawned here.
|
|
|
|
if (mthing->type <= 4 || gameinfo.gametype == GAME_Strife) // don't forget Strife's starts 5-8 here!
|
|
|
|
{
|
|
|
|
playernum = mthing->type - 1;
|
|
|
|
}
|
|
|
|
else if (gameinfo.gametype != GAME_Hexen)
|
|
|
|
{
|
|
|
|
playernum = mthing->type - 4001 + 4;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
playernum = mthing->type - 9100 + 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
// not playing?
|
|
|
|
if (playernum >= MAXPLAYERS || !playeringame[playernum])
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
p = &players[playernum];
|
|
|
|
|
|
|
|
if (p->cls == NULL)
|
|
|
|
{
|
2006-07-13 10:17:56 +00:00
|
|
|
// [GRB] Pick a class from player class list
|
|
|
|
if (PlayerClasses.Size () > 1)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
int type;
|
|
|
|
|
|
|
|
if (!deathmatch || !multiplayer)
|
|
|
|
{
|
|
|
|
type = SinglePlayerClass[playernum];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
type = p->userinfo.PlayerClass;
|
|
|
|
if (type < 0)
|
|
|
|
{
|
2006-07-13 10:17:56 +00:00
|
|
|
type = pr_multiclasschoice() % PlayerClasses.Size ();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
p->CurrentPlayerClass = type;
|
|
|
|
}
|
2006-07-13 10:17:56 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
p->CurrentPlayerClass = 0;
|
|
|
|
}
|
|
|
|
p->cls = PlayerClasses[p->CurrentPlayerClass].Type;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2008-02-05 23:32:49 +00:00
|
|
|
if (( dmflags2 & DF2_SAME_SPAWN_SPOT ) &&
|
|
|
|
( p->playerstate == PST_REBORN ) &&
|
|
|
|
( deathmatch == false ) &&
|
|
|
|
( gameaction != ga_worlddone ) &&
|
|
|
|
( p->mo != NULL ))
|
|
|
|
{
|
|
|
|
spawn_x = p->mo->x;
|
|
|
|
spawn_y = p->mo->y;
|
|
|
|
spawn_angle = p->mo->angle;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-05-08 08:06:26 +00:00
|
|
|
spawn_x = mthing->x;
|
|
|
|
spawn_y = mthing->y;
|
2008-02-05 23:32:49 +00:00
|
|
|
spawn_angle = ANG45 * (mthing->angle/45);
|
|
|
|
}
|
2008-01-09 02:53:38 +00:00
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
mobj = static_cast<APlayerPawn *>
|
2008-01-09 02:53:38 +00:00
|
|
|
(Spawn (p->cls, spawn_x, spawn_y, ONFLOORZ, NO_REPLACE));
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
mobj->FriendPlayer = playernum + 1; // [RH] players are their own friends
|
|
|
|
oldactor = p->mo;
|
|
|
|
p->mo = mobj;
|
|
|
|
mobj->player = p;
|
|
|
|
state = p->playerstate;
|
|
|
|
if (state == PST_REBORN || state == PST_ENTER)
|
|
|
|
{
|
|
|
|
G_PlayerReborn (playernum);
|
|
|
|
}
|
2006-10-03 03:14:28 +00:00
|
|
|
else if (oldactor != NULL && oldactor->player == p && !tempplayer)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
// Move the voodoo doll's inventory to the new player.
|
|
|
|
mobj->ObtainInventory (oldactor);
|
2006-09-17 10:43:51 +00:00
|
|
|
FBehavior::StaticStopMyScripts (oldactor); // cancel all ENTER/RESPAWN scripts for the voodoo doll
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2006-07-13 10:17:56 +00:00
|
|
|
// [GRB] Reset skin
|
|
|
|
p->userinfo.skin = R_FindSkin (skins[p->userinfo.skin].name, p->CurrentPlayerClass);
|
|
|
|
StatusBar->SetFace (&skins[p->userinfo.skin]);
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
// [RH] Be sure the player has the right translation
|
|
|
|
R_BuildPlayerTranslation (playernum);
|
|
|
|
|
|
|
|
// [RH] set color translations for player sprites
|
|
|
|
mobj->Translation = TRANSLATION(TRANSLATION_Players,playernum);
|
|
|
|
|
2008-01-09 02:53:38 +00:00
|
|
|
mobj->angle = spawn_angle;
|
2006-02-24 04:48:15 +00:00
|
|
|
mobj->pitch = mobj->roll = 0;
|
|
|
|
mobj->health = p->health;
|
|
|
|
|
|
|
|
//Added by MC: Identification (number in the players[MAXPLAYERS] array)
|
|
|
|
mobj->id = playernum;
|
|
|
|
|
|
|
|
// [RH] Set player sprite based on skin
|
2006-07-13 10:17:56 +00:00
|
|
|
mobj->sprite = skins[p->userinfo.skin].sprite;
|
2008-04-27 22:33:19 +00:00
|
|
|
mobj->scaleX = skins[p->userinfo.skin].ScaleX;
|
|
|
|
mobj->scaleY = skins[p->userinfo.skin].ScaleY;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
p->DesiredFOV = p->FOV = 90.f;
|
|
|
|
p->camera = p->mo;
|
|
|
|
p->playerstate = PST_LIVE;
|
|
|
|
p->refire = 0;
|
|
|
|
p->damagecount = 0;
|
|
|
|
p->bonuscount = 0;
|
|
|
|
p->morphTics = 0;
|
2008-04-06 17:33:43 +00:00
|
|
|
p->MorphedPlayerClass = 0;
|
2008-04-08 08:53:42 +00:00
|
|
|
p->MorphStyle = 0;
|
|
|
|
p->MorphExitFlash = NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
p->extralight = 0;
|
|
|
|
p->fixedcolormap = 0;
|
2006-07-13 10:17:56 +00:00
|
|
|
p->viewheight = mobj->ViewHeight;
|
2006-02-24 04:48:15 +00:00
|
|
|
p->inconsistant = 0;
|
|
|
|
p->attacker = NULL;
|
|
|
|
p->spreecount = 0;
|
|
|
|
p->multicount = 0;
|
|
|
|
p->lastkilltime = 0;
|
|
|
|
p->BlendR = p->BlendG = p->BlendB = p->BlendA = 0.f;
|
2007-02-04 00:22:56 +00:00
|
|
|
p->mo->ResetAirSupply();
|
2006-05-14 14:30:13 +00:00
|
|
|
p->Uncrouch();
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
p->momx = p->momy = 0; // killough 10/98: initialize bobbing to 0.
|
|
|
|
|
|
|
|
if (players[consoleplayer].camera == oldactor)
|
|
|
|
{
|
|
|
|
players[consoleplayer].camera = mobj;
|
|
|
|
}
|
|
|
|
|
|
|
|
// [RH] Allow chasecam for demo watching
|
|
|
|
if ((demoplayback || demonew) && chasedemo)
|
|
|
|
p->cheats = CF_CHASECAM;
|
|
|
|
|
|
|
|
// setup gun psprite
|
2006-10-03 03:14:28 +00:00
|
|
|
if (!tempplayer)
|
2006-05-27 10:27:51 +00:00
|
|
|
{
|
|
|
|
// This can also start a script so don't do it for
|
|
|
|
// the dummy player.
|
|
|
|
P_SetupPsprites (p);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (deathmatch)
|
2006-06-18 04:10:47 +00:00
|
|
|
{ // Give all cards in death match mode.
|
|
|
|
p->mo->GiveDeathmatchInventory ();
|
|
|
|
}
|
2008-02-19 01:34:15 +00:00
|
|
|
else if ((multiplayer || (level.flags & LEVEL_ALLOWRESPAWN)) && state == PST_REBORN && oldactor != NULL)
|
2006-06-18 04:10:47 +00:00
|
|
|
{ // Special inventory handling for respawning in coop
|
|
|
|
p->mo->FilterCoopRespawnInventory (oldactor);
|
|
|
|
}
|
|
|
|
if (oldactor != NULL)
|
|
|
|
{ // Remove any inventory left from the old actor. Coop handles
|
|
|
|
// it above, but the other modes don't.
|
|
|
|
oldactor->DestroyAllInventory();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-06-15 03:46:04 +00:00
|
|
|
// [BC] Handle temporary invulnerability when respawned
|
|
|
|
if ((state == PST_REBORN || state == PST_ENTER) &&
|
|
|
|
(dmflags2 & DF2_YES_RESPAWN_INVUL) &&
|
|
|
|
(multiplayer || alwaysapplydmflags))
|
|
|
|
{
|
|
|
|
APowerup *invul = static_cast<APowerup*>(p->mo->GiveInventoryType (RUNTIME_CLASS(APowerInvulnerable)));
|
|
|
|
invul->EffectTics = 3*TICRATE;
|
|
|
|
invul->BlendColor = 0; // don't mess with the view
|
|
|
|
p->mo->effects |= FX_RESPAWNINVUL; // [RH] special effect
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (StatusBar != NULL && (playernum == consoleplayer || StatusBar->GetPlayer() == playernum))
|
|
|
|
{
|
|
|
|
StatusBar->AttachToPlayer (p);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (multiplayer)
|
|
|
|
{
|
2008-05-30 06:56:50 +00:00
|
|
|
unsigned an = mobj->angle >> ANGLETOFINESHIFT;
|
2006-07-16 09:10:45 +00:00
|
|
|
Spawn ("TeleportFog", mobj->x+20*finecosine[an], mobj->y+20*finesine[an], mobj->z + TELEFOGHEIGHT, ALLOW_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// "Fix" for one of the starts on exec.wad MAP01: If you start inside the ceiling,
|
|
|
|
// drop down below it, even if that means sinking into the floor.
|
|
|
|
if (mobj->z + mobj->height > mobj->ceilingz)
|
|
|
|
{
|
|
|
|
mobj->z = mobj->ceilingz - mobj->height;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// [BC] Do script stuff
|
2006-10-03 03:14:28 +00:00
|
|
|
if (!tempplayer)
|
2006-05-17 01:38:07 +00:00
|
|
|
{
|
2006-05-27 10:27:51 +00:00
|
|
|
if (state == PST_ENTER || (state == PST_LIVE && !savegamerestore))
|
|
|
|
{
|
|
|
|
FBehavior::StaticStartTypedScripts (SCRIPT_Enter, p->mo, true);
|
|
|
|
}
|
|
|
|
else if (state == PST_REBORN)
|
|
|
|
{
|
2006-10-03 03:14:28 +00:00
|
|
|
assert (oldactor != NULL);
|
2008-03-01 13:12:33 +00:00
|
|
|
|
|
|
|
// before relocating all pointers to the player all sound targets
|
|
|
|
// pointing to the old actor have to be NULLed. Otherwise all
|
|
|
|
// monsters who last targeted this player will wake up immediately
|
|
|
|
// after the player has respawned.
|
|
|
|
AActor *th;
|
|
|
|
TThinkerIterator<AActor> it;
|
|
|
|
while ((th = it.Next()))
|
|
|
|
{
|
|
|
|
if (th->LastHeard == oldactor) th->LastHeard = NULL;
|
|
|
|
}
|
|
|
|
for(int i = 0; i < numsectors; i++)
|
|
|
|
{
|
|
|
|
if (sectors[i].SoundTarget == oldactor) sectors[i].SoundTarget = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-03-12 16:27:47 +00:00
|
|
|
DObject::StaticPointerSubstitution (oldactor, p->mo);
|
2006-11-25 04:26:04 +00:00
|
|
|
// PointerSubstitution() will also affect the bodyque, so undo that now.
|
|
|
|
for (int ii=0; ii < BODYQUESIZE; ++ii)
|
|
|
|
if (bodyque[ii] == p->mo)
|
|
|
|
bodyque[ii] = oldactor;
|
2006-05-27 10:27:51 +00:00
|
|
|
FBehavior::StaticStartTypedScripts (SCRIPT_Respawn, p->mo, true);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-04 14:31:20 +00:00
|
|
|
return mobj;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_SpawnMapThing
|
|
|
|
// The fields of the mapthing should
|
|
|
|
// already be in host byte order.
|
|
|
|
//
|
|
|
|
// [RH] position is used to weed out unwanted start spots
|
2008-05-08 08:06:26 +00:00
|
|
|
AActor *P_SpawnMapThing (FMapThing *mthing, int position)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *i;
|
2006-02-24 04:48:15 +00:00
|
|
|
int mask;
|
|
|
|
AActor *mobj;
|
|
|
|
fixed_t x, y, z;
|
|
|
|
|
|
|
|
if (mthing->type == 0 || mthing->type == -1)
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// count deathmatch start positions
|
|
|
|
if (mthing->type == 11)
|
|
|
|
{
|
|
|
|
deathmatchstarts.Push (*mthing);
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Convert Strife starts to Hexen-style starts
|
|
|
|
if (gameinfo.gametype == GAME_Strife && mthing->type >= 118 && mthing->type <= 127)
|
|
|
|
{
|
|
|
|
mthing->args[0] = mthing->type - 117;
|
|
|
|
mthing->type = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// [RH] Record polyobject-related things
|
|
|
|
if (gameinfo.gametype == GAME_Hexen)
|
|
|
|
{
|
|
|
|
switch (mthing->type)
|
|
|
|
{
|
|
|
|
case PO_HEX_ANCHOR_TYPE:
|
|
|
|
mthing->type = PO_ANCHOR_TYPE;
|
|
|
|
break;
|
|
|
|
case PO_HEX_SPAWN_TYPE:
|
|
|
|
mthing->type = PO_SPAWN_TYPE;
|
|
|
|
break;
|
|
|
|
case PO_HEX_SPAWNCRUSH_TYPE:
|
|
|
|
mthing->type = PO_SPAWNCRUSH_TYPE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mthing->type == PO_ANCHOR_TYPE ||
|
|
|
|
mthing->type == PO_SPAWN_TYPE ||
|
|
|
|
mthing->type == PO_SPAWNCRUSH_TYPE ||
|
|
|
|
mthing->type == PO_SPAWNHURT_TYPE)
|
|
|
|
{
|
|
|
|
polyspawns_t *polyspawn = new polyspawns_t;
|
|
|
|
polyspawn->next = polyspawns;
|
2008-05-08 08:06:26 +00:00
|
|
|
polyspawn->x = mthing->x;
|
|
|
|
polyspawn->y = mthing->y;
|
2006-02-24 04:48:15 +00:00
|
|
|
polyspawn->angle = mthing->angle;
|
|
|
|
polyspawn->type = mthing->type;
|
|
|
|
polyspawns = polyspawn;
|
|
|
|
if (mthing->type != PO_ANCHOR_TYPE)
|
|
|
|
po_NumPolyobjs++;
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// check for players specially
|
|
|
|
int pnum = -1;
|
|
|
|
|
|
|
|
if (mthing->type <= 4 && mthing->type > 0)
|
|
|
|
{
|
|
|
|
pnum = mthing->type - 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const int base = (gameinfo.gametype == GAME_Strife) ? 5 :
|
|
|
|
(gameinfo.gametype == GAME_Hexen) ? 9100 : 4001;
|
|
|
|
|
|
|
|
if (mthing->type >= base && mthing->type < base + MAXPLAYERS - 4)
|
|
|
|
{
|
|
|
|
pnum = mthing->type - base + 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pnum == -1 || (level.flags & LEVEL_FILTERSTARTS))
|
|
|
|
{
|
|
|
|
// check for appropriate game type
|
|
|
|
if (deathmatch)
|
|
|
|
{
|
|
|
|
mask = MTF_DEATHMATCH;
|
|
|
|
}
|
|
|
|
else if (multiplayer)
|
|
|
|
{
|
|
|
|
mask = MTF_COOPERATIVE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
mask = MTF_SINGLE;
|
|
|
|
}
|
|
|
|
if (!(mthing->flags & mask))
|
|
|
|
{
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2007-10-29 22:15:46 +00:00
|
|
|
mask = G_SkillProperty(SKILLP_SpawnFilter);
|
2008-05-11 21:16:32 +00:00
|
|
|
if (!(mthing->SkillFilter & mask))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2006-07-13 10:17:56 +00:00
|
|
|
// Check class spawn masks. Now with player classes available
|
|
|
|
// this is enabled for all games.
|
|
|
|
if (!multiplayer)
|
|
|
|
{ // Single player
|
|
|
|
int spawnmask = players[consoleplayer].GetSpawnClass();
|
2008-05-11 21:16:32 +00:00
|
|
|
if (spawnmask != 0 && (mthing->ClassFilter & spawnmask) == 0)
|
2006-07-13 10:17:56 +00:00
|
|
|
{ // Not for current class
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2006-07-13 10:17:56 +00:00
|
|
|
}
|
|
|
|
else if (!deathmatch)
|
|
|
|
{ // Cooperative
|
|
|
|
mask = 0;
|
|
|
|
for (int i = 0; i < MAXPLAYERS; i++)
|
|
|
|
{
|
|
|
|
if (playeringame[i])
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-07-13 10:17:56 +00:00
|
|
|
int spawnmask = players[i].GetSpawnClass();
|
|
|
|
if (spawnmask != 0)
|
|
|
|
mask |= spawnmask;
|
|
|
|
else
|
|
|
|
mask = -1;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
2006-07-13 10:17:56 +00:00
|
|
|
if (mask != -1 && (mthing->flags & mask) == 0)
|
|
|
|
{
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-07-13 10:17:56 +00:00
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pnum != -1)
|
|
|
|
{
|
|
|
|
// [RH] Only spawn spots that match position.
|
|
|
|
if (mthing->args[0] != position)
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// save spots for respawning in network games
|
|
|
|
playerstarts[pnum] = *mthing;
|
|
|
|
if (!deathmatch)
|
2008-04-04 14:31:20 +00:00
|
|
|
return P_SpawnPlayer (mthing);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// [RH] sound sequence overriders
|
|
|
|
if (mthing->type >= 1400 && mthing->type < 1410)
|
|
|
|
{
|
2008-05-08 08:06:26 +00:00
|
|
|
P_PointInSector (mthing->x, mthing->y)->seqType = mthing->type - 1400;
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
else if (mthing->type == 1411)
|
|
|
|
{
|
|
|
|
int type;
|
|
|
|
|
|
|
|
if (mthing->args[0] == 255)
|
|
|
|
type = -1;
|
|
|
|
else
|
|
|
|
type = mthing->args[0];
|
|
|
|
|
|
|
|
if (type > 63)
|
|
|
|
{
|
|
|
|
Printf ("Sound sequence %d out of range\n", type);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-05-08 08:06:26 +00:00
|
|
|
P_PointInSector (mthing->x, mthing->y)->seqType = type;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// [RH] Determine if it is an old ambient thing, and if so,
|
|
|
|
// map it to MT_AMBIENT with the proper parameter.
|
|
|
|
if (mthing->type >= 14001 && mthing->type <= 14064)
|
|
|
|
{
|
|
|
|
mthing->args[0] = mthing->type - 14000;
|
|
|
|
mthing->type = 14065;
|
|
|
|
i = RUNTIME_CLASS(AAmbientSound);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// find which type to spawn
|
|
|
|
i = DoomEdMap.FindType (mthing->type);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i == NULL)
|
|
|
|
{
|
|
|
|
// [RH] Don't die if the map tries to spawn an unknown thing
|
|
|
|
Printf ("Unknown type %i at (%i, %i)\n",
|
|
|
|
mthing->type,
|
2008-05-08 08:06:26 +00:00
|
|
|
mthing->x>>FRACBITS, mthing->y>>FRACBITS);
|
2006-12-02 15:38:50 +00:00
|
|
|
i = PClass::FindClass("Unknown");
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
// [RH] If the thing's corresponding sprite has no frames, also map
|
|
|
|
// it to the unknown thing.
|
|
|
|
else
|
|
|
|
{
|
2006-07-16 09:10:45 +00:00
|
|
|
// Handle decorate replacements explicitly here
|
|
|
|
// to check for missing frames in the replacement object.
|
2006-07-13 03:34:50 +00:00
|
|
|
i = i->ActorInfo->GetReplacement()->Class;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
const AActor *defaults = GetDefaultByType (i);
|
|
|
|
if (defaults->SpawnState == NULL ||
|
|
|
|
sprites[defaults->SpawnState->sprite.index].numframes == 0)
|
|
|
|
{
|
|
|
|
Printf ("%s at (%i, %i) has no frames\n",
|
2008-05-08 08:06:26 +00:00
|
|
|
i->TypeName.GetChars(), mthing->x>>FRACBITS, mthing->y>>FRACBITS);
|
2006-12-02 15:38:50 +00:00
|
|
|
i = PClass::FindClass("Unknown");
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const AActor *info = GetDefaultByType (i);
|
|
|
|
|
|
|
|
// don't spawn keycards and players in deathmatch
|
|
|
|
if (deathmatch && info->flags & MF_NOTDMATCH)
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2006-04-11 16:27:41 +00:00
|
|
|
// [RH] don't spawn extra weapons in coop if so desired
|
2006-06-22 02:19:43 +00:00
|
|
|
if (multiplayer && !deathmatch && (dmflags & DF_NO_COOP_WEAPON_SPAWN))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
if (i->IsDescendantOf (RUNTIME_CLASS(AWeapon)))
|
|
|
|
{
|
|
|
|
if ((mthing->flags & (MTF_DEATHMATCH|MTF_SINGLE)) == MTF_DEATHMATCH)
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// don't spawn any monsters if -nomonsters
|
2007-11-08 09:22:06 +00:00
|
|
|
if (((level.flags & LEVEL_NOMONSTERS) || (dmflags & DF_NO_MONSTERS)) && info->flags3 & MF3_ISMONSTER )
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// [RH] Other things that shouldn't be spawned depending on dmflags
|
|
|
|
if (deathmatch || alwaysapplydmflags)
|
|
|
|
{
|
|
|
|
if (dmflags & DF_NO_HEALTH)
|
|
|
|
{
|
|
|
|
if (i->IsDescendantOf (RUNTIME_CLASS(AHealth)))
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-05-10 02:40:43 +00:00
|
|
|
if (i->TypeName == NAME_Berserk)
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-05-10 02:40:43 +00:00
|
|
|
if (i->TypeName == NAME_Megasphere)
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
if (dmflags & DF_NO_ITEMS)
|
|
|
|
{
|
|
|
|
// if (i->IsDescendantOf (RUNTIME_CLASS(AArtifact)))
|
|
|
|
// return;
|
|
|
|
}
|
|
|
|
if (dmflags & DF_NO_ARMOR)
|
|
|
|
{
|
|
|
|
if (i->IsDescendantOf (RUNTIME_CLASS(AArmor)))
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-05-10 02:40:43 +00:00
|
|
|
if (i->TypeName == NAME_Megasphere)
|
2008-04-04 14:31:20 +00:00
|
|
|
return NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// spawn it
|
2008-05-08 08:06:26 +00:00
|
|
|
x = mthing->x;
|
|
|
|
y = mthing->y;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (info->flags & MF_SPAWNCEILING)
|
|
|
|
z = ONCEILINGZ;
|
|
|
|
else if (info->flags2 & MF2_SPAWNFLOAT)
|
|
|
|
z = FLOATRANDZ;
|
|
|
|
else
|
|
|
|
z = ONFLOORZ;
|
|
|
|
|
|
|
|
SpawningMapThing = true;
|
2006-07-16 09:10:45 +00:00
|
|
|
mobj = Spawn (i, x, y, z, NO_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
SpawningMapThing = false;
|
|
|
|
|
|
|
|
if (z == ONFLOORZ)
|
2008-05-08 08:06:26 +00:00
|
|
|
mobj->z += mthing->z;
|
2006-02-24 04:48:15 +00:00
|
|
|
else if (z == ONCEILINGZ)
|
2008-05-08 08:06:26 +00:00
|
|
|
mobj->z -= mthing->z;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
mobj->SpawnPoint[0] = mthing->x;
|
|
|
|
mobj->SpawnPoint[1] = mthing->y;
|
|
|
|
mobj->SpawnPoint[2] = mthing->z;
|
|
|
|
mobj->SpawnAngle = mthing->angle;
|
|
|
|
mobj->SpawnFlags = mthing->flags;
|
2008-05-17 17:57:50 +00:00
|
|
|
P_FindFloorCeiling(mobj, true);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2006-12-02 15:38:50 +00:00
|
|
|
if (!(mobj->flags2 & MF2_ARGSDEFINED))
|
|
|
|
{
|
|
|
|
// [RH] Set the thing's special
|
|
|
|
mobj->special = mthing->special;
|
|
|
|
for(int j=0;j<5;j++) mobj->args[j]=mthing->args[j];
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// [RH] Add ThingID to mobj and link it in with the others
|
|
|
|
mobj->tid = mthing->thingid;
|
|
|
|
mobj->AddToHash ();
|
|
|
|
|
|
|
|
mobj->angle = (DWORD)((mthing->angle * UCONST64(0x100000000)) / 360);
|
|
|
|
mobj->BeginPlay ();
|
2008-04-05 12:14:33 +00:00
|
|
|
if (!(mobj->ObjectFlags & OF_EuthanizeMe))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-05 12:14:33 +00:00
|
|
|
mobj->LevelSpawned ();
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-04 14:31:20 +00:00
|
|
|
return mobj;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// GAME SPAWN FUNCTIONS
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// P_SpawnPuff
|
|
|
|
//
|
|
|
|
|
2008-04-04 14:31:20 +00:00
|
|
|
AActor *P_SpawnPuff (const PClass *pufftype, fixed_t x, fixed_t y, fixed_t z, angle_t dir, int updown, int flags)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
AActor *puff;
|
|
|
|
|
|
|
|
z += pr_spawnpuff.Random2 () << 10;
|
|
|
|
|
2006-07-16 09:10:45 +00:00
|
|
|
puff = Spawn (pufftype, x, y, z, ALLOW_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// If a puff has a crash state and an actor was not hit,
|
|
|
|
// it will enter the crash state. This is used by the StrifeSpark
|
|
|
|
// and BlasterPuff.
|
2006-10-31 14:53:21 +00:00
|
|
|
FState *crashstate;
|
2008-04-04 14:31:20 +00:00
|
|
|
if (!(flags & PF_HITTHING) && (crashstate = puff->FindState(NAME_Crash)) != NULL)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-10-31 14:53:21 +00:00
|
|
|
puff->SetState (crashstate);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-04 14:31:20 +00:00
|
|
|
else if ((flags & PF_MELEERANGE) && puff->MeleeState != NULL)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
// handle the hard coded state jump of Doom's bullet puff
|
|
|
|
// in a more flexible manner.
|
|
|
|
puff->SetState (puff->MeleeState);
|
|
|
|
}
|
|
|
|
|
2008-04-04 14:31:20 +00:00
|
|
|
if (!(flags & PF_TEMPORARY))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-04-04 14:31:20 +00:00
|
|
|
if (cl_pufftype && updown != 3 && (puff->flags4 & MF4_ALLOWPARTICLES))
|
|
|
|
{
|
|
|
|
P_DrawSplash2 (32, x, y, z, dir, updown, 1);
|
|
|
|
puff->renderflags |= RF_INVISIBLE;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-04-04 14:31:20 +00:00
|
|
|
if ((flags & PF_HITTHING) && puff->SeeSound)
|
2008-02-12 05:54:03 +00:00
|
|
|
{ // Hit thing sound
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (puff, CHAN_BODY, puff->SeeSound, 1, ATTN_NORM);
|
2008-02-12 05:54:03 +00:00
|
|
|
}
|
|
|
|
else if (puff->AttackSound)
|
|
|
|
{
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (puff, CHAN_BODY, puff->AttackSound, 1, ATTN_NORM);
|
2008-02-12 05:54:03 +00:00
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return puff;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-11-29 10:03:35 +00:00
|
|
|
//---------------------------------------------------------------------------
|
2006-02-24 04:48:15 +00:00
|
|
|
//
|
|
|
|
// P_SpawnBlood
|
|
|
|
//
|
2006-11-29 10:03:35 +00:00
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
void P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, angle_t dir, int damage, AActor *originator)
|
|
|
|
{
|
2006-11-29 10:03:35 +00:00
|
|
|
AActor *th;
|
2006-02-24 04:48:15 +00:00
|
|
|
PalEntry bloodcolor = (PalEntry)originator->GetClass()->Meta.GetMetaInt(AMETA_BloodColor);
|
2006-11-29 10:03:35 +00:00
|
|
|
const PClass *bloodcls = PClass::FindClass((ENamedName)originator->GetClass()->Meta.GetMetaInt(AMETA_BloodType, NAME_Blood));
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2006-11-29 10:03:35 +00:00
|
|
|
if (bloodcls!=NULL && cl_bloodtype <= 1)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
z += pr_spawnblood.Random2 () << 10;
|
2006-11-29 10:03:35 +00:00
|
|
|
th = Spawn (bloodcls, x, y, z, ALLOW_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
th->momz = FRACUNIT*2;
|
|
|
|
th->angle = dir;
|
|
|
|
if (gameinfo.gametype == GAME_Doom)
|
|
|
|
{
|
|
|
|
th->tics -= pr_spawnblood() & 3;
|
|
|
|
|
|
|
|
if (th->tics < 1)
|
|
|
|
th->tics = 1;
|
|
|
|
}
|
2006-11-29 10:03:35 +00:00
|
|
|
// colorize the blood
|
|
|
|
if (bloodcolor != 0 && !(th->flags2 & MF2_DONTTRANSLATE))
|
2006-08-17 00:19:26 +00:00
|
|
|
{
|
|
|
|
th->Translation = TRANSLATION(TRANSLATION_Blood, bloodcolor.a);
|
|
|
|
}
|
2006-11-29 10:03:35 +00:00
|
|
|
|
|
|
|
// Moved out of the blood actor so that replacing blood is easier
|
|
|
|
if (gameinfo.gametype & GAME_DoomStrife)
|
|
|
|
{
|
|
|
|
if (gameinfo.gametype == GAME_Strife)
|
|
|
|
{
|
|
|
|
if (damage > 13)
|
|
|
|
{
|
|
|
|
FState *state = th->FindState(NAME_Spray);
|
|
|
|
if (state != NULL) th->SetState (state);
|
|
|
|
}
|
|
|
|
else damage+=2;
|
|
|
|
}
|
|
|
|
if (damage <= 12 && damage >= 9)
|
|
|
|
{
|
|
|
|
th->SetState (th->SpawnState + 1);
|
|
|
|
}
|
|
|
|
else if (damage < 9)
|
|
|
|
{
|
|
|
|
th->SetState (th->SpawnState + 2);
|
|
|
|
}
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (cl_bloodtype >= 1)
|
|
|
|
P_DrawSplash2 (40, x, y, z, dir, 2, bloodcolor);
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_BloodSplatter
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_BloodSplatter (fixed_t x, fixed_t y, fixed_t z, AActor *originator)
|
|
|
|
{
|
|
|
|
PalEntry bloodcolor = (PalEntry)originator->GetClass()->Meta.GetMetaInt(AMETA_BloodColor);
|
2006-11-29 10:03:35 +00:00
|
|
|
const PClass *bloodcls = PClass::FindClass((ENamedName)originator->GetClass()->Meta.GetMetaInt(AMETA_BloodType2, NAME_BloodSplatter));
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2006-11-29 10:03:35 +00:00
|
|
|
if (bloodcls!=NULL && cl_bloodtype <= 1)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
AActor *mo;
|
|
|
|
|
2006-11-29 10:03:35 +00:00
|
|
|
mo = Spawn(bloodcls, x, y, z, ALLOW_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
mo->target = originator;
|
|
|
|
mo->momx = pr_splatter.Random2 () << 10;
|
|
|
|
mo->momy = pr_splatter.Random2 () << 10;
|
|
|
|
mo->momz = 3*FRACUNIT;
|
|
|
|
|
|
|
|
// colorize the blood!
|
2006-11-29 10:03:35 +00:00
|
|
|
if (bloodcolor!=0 && !(mo->flags2 & MF2_DONTTRANSLATE))
|
|
|
|
{
|
|
|
|
mo->Translation = TRANSLATION(TRANSLATION_Blood, bloodcolor.a);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
if (cl_bloodtype >= 1)
|
|
|
|
{
|
|
|
|
P_DrawSplash2 (40, x, y, z, R_PointToAngle2 (x, y, originator->x, originator->y), 2, bloodcolor);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-11-29 10:03:35 +00:00
|
|
|
//===========================================================================
|
|
|
|
//
|
|
|
|
// P_BloodSplatter2
|
|
|
|
//
|
|
|
|
//===========================================================================
|
|
|
|
|
|
|
|
void P_BloodSplatter2 (fixed_t x, fixed_t y, fixed_t z, AActor *originator)
|
|
|
|
{
|
|
|
|
PalEntry bloodcolor = (PalEntry)originator->GetClass()->Meta.GetMetaInt(AMETA_BloodColor);
|
|
|
|
const PClass *bloodcls = PClass::FindClass((ENamedName)originator->GetClass()->Meta.GetMetaInt(AMETA_BloodType3, NAME_AxeBlood));
|
|
|
|
|
|
|
|
if (bloodcls!=NULL && cl_bloodtype <= 1)
|
|
|
|
{
|
|
|
|
AActor *mo;
|
|
|
|
|
|
|
|
x += ((pr_splat()-128)<<11);
|
|
|
|
y += ((pr_splat()-128)<<11);
|
|
|
|
|
|
|
|
mo = Spawn (bloodcls, x, y, z, ALLOW_REPLACE);
|
|
|
|
mo->target = originator;
|
|
|
|
|
|
|
|
// colorize the blood!
|
|
|
|
if (bloodcolor != 0 && !(mo->flags2 & MF2_DONTTRANSLATE))
|
|
|
|
{
|
|
|
|
mo->Translation = TRANSLATION(TRANSLATION_Blood, bloodcolor.a);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (cl_bloodtype >= 1)
|
|
|
|
{
|
|
|
|
P_DrawSplash2 (100, x, y, z, R_PointToAngle2 (0, 0, originator->x - x, originator->y - y), 2, bloodcolor);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// PROC P_RipperBlood
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_RipperBlood (AActor *mo, AActor *bleeder)
|
|
|
|
{
|
|
|
|
fixed_t x, y, z;
|
|
|
|
PalEntry bloodcolor = (PalEntry)bleeder->GetClass()->Meta.GetMetaInt(AMETA_BloodColor);
|
2006-11-29 10:03:35 +00:00
|
|
|
const PClass *bloodcls = PClass::FindClass((ENamedName)bleeder->GetClass()->Meta.GetMetaInt(AMETA_BloodType, NAME_Blood));
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
x = mo->x + (pr_ripperblood.Random2 () << 12);
|
|
|
|
y = mo->y + (pr_ripperblood.Random2 () << 12);
|
|
|
|
z = mo->z + (pr_ripperblood.Random2 () << 12);
|
2006-11-29 10:03:35 +00:00
|
|
|
if (bloodcls!=NULL && cl_bloodtype <= 1)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
AActor *th;
|
2006-11-29 10:03:35 +00:00
|
|
|
th = Spawn (bloodcls, x, y, z, ALLOW_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (gameinfo.gametype == GAME_Heretic)
|
|
|
|
th->flags |= MF_NOGRAVITY;
|
|
|
|
th->momx = mo->momx >> 1;
|
|
|
|
th->momy = mo->momy >> 1;
|
|
|
|
th->tics += pr_ripperblood () & 3;
|
|
|
|
|
|
|
|
// colorize the blood!
|
2006-11-29 10:03:35 +00:00
|
|
|
if (bloodcolor!=0 && !(th->flags2 & MF2_DONTTRANSLATE))
|
|
|
|
{
|
|
|
|
th->Translation = TRANSLATION(TRANSLATION_Blood, bloodcolor.a);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
if (cl_bloodtype >= 1)
|
|
|
|
{
|
|
|
|
P_DrawSplash2 (28, x, y, z, 0, 0, bloodcolor);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// FUNC P_GetThingFloorType
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
int P_GetThingFloorType (AActor *thing)
|
|
|
|
{
|
2008-06-15 18:36:26 +00:00
|
|
|
if (thing->floorpic.isValid())
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
return TerrainTypes[thing->floorpic];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return TerrainTypes[thing->Sector->floorpic];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// FUNC P_HitWater
|
|
|
|
//
|
|
|
|
// Returns true if hit liquid and splashed, false if not.
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
2007-01-07 09:43:58 +00:00
|
|
|
bool P_HitWater (AActor * thing, sector_t * sec, fixed_t z)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
if (thing->flags2 & MF2_FLOATBOB || thing->flags3 & MF3_DONTSPLASH)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (thing->player && (thing->player->cheats & CF_PREDICTING))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
AActor *mo = NULL;
|
|
|
|
FSplashDef *splash;
|
|
|
|
int terrainnum;
|
|
|
|
|
2007-01-07 09:43:58 +00:00
|
|
|
if (z==FIXED_MIN) z=thing->z;
|
|
|
|
// don't splash above the object
|
|
|
|
else if (z>thing->z+(thing->height>>1)) return false;
|
2006-02-24 04:48:15 +00:00
|
|
|
if (sec->heightsec == NULL ||
|
|
|
|
//!sec->heightsec->waterzone ||
|
|
|
|
(sec->heightsec->MoreFlags & SECF_IGNOREHEIGHTSEC) ||
|
|
|
|
!(sec->heightsec->MoreFlags & SECF_CLIPFAKEPLANES))
|
|
|
|
{
|
|
|
|
terrainnum = TerrainTypes[sec->floorpic];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
terrainnum = TerrainTypes[sec->heightsec->floorpic];
|
|
|
|
}
|
|
|
|
|
|
|
|
int splashnum = Terrains[terrainnum].Splash;
|
|
|
|
bool smallsplash = false;
|
|
|
|
const secplane_t *plane;
|
|
|
|
|
|
|
|
if (splashnum == -1)
|
|
|
|
return Terrains[terrainnum].IsLiquid;
|
|
|
|
|
2007-01-07 09:43:58 +00:00
|
|
|
// don't splash when touching an underwater floor
|
|
|
|
if (thing->waterlevel>=1 && z<=thing->floorz) return Terrains[terrainnum].IsLiquid;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
plane = (sec->heightsec != NULL &&
|
|
|
|
//sec->heightsec->waterzone &&
|
|
|
|
!(sec->heightsec->MoreFlags & SECF_IGNOREHEIGHTSEC))
|
|
|
|
? &sec->heightsec->floorplane : &sec->floorplane;
|
2007-01-07 09:43:58 +00:00
|
|
|
|
|
|
|
// Don't splash for living things with small vertical velocities.
|
|
|
|
// There are levels where the constant splashing from the monsters gets extremely annoying
|
|
|
|
if ((thing->flags3&MF3_ISMONSTER || thing->player) && thing->momz>=-5*FRACUNIT) return Terrains[terrainnum].IsLiquid;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
splash = &Splashes[splashnum];
|
|
|
|
|
|
|
|
// Small splash for small masses
|
|
|
|
if (thing->Mass < 10)
|
|
|
|
smallsplash = true;
|
|
|
|
|
|
|
|
if (smallsplash && splash->SmallSplash)
|
|
|
|
{
|
2006-07-16 09:10:45 +00:00
|
|
|
mo = Spawn (splash->SmallSplash, thing->x, thing->y, z, ALLOW_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (mo) mo->floorclip += splash->SmallSplashClip;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (splash->SplashChunk)
|
|
|
|
{
|
2006-07-16 09:10:45 +00:00
|
|
|
mo = Spawn (splash->SplashChunk, thing->x, thing->y, z, ALLOW_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
mo->target = thing;
|
|
|
|
if (splash->ChunkXVelShift != 255)
|
|
|
|
{
|
|
|
|
mo->momx = pr_chunk.Random2() << splash->ChunkXVelShift;
|
|
|
|
}
|
|
|
|
if (splash->ChunkYVelShift != 255)
|
|
|
|
{
|
|
|
|
mo->momy = pr_chunk.Random2() << splash->ChunkYVelShift;
|
|
|
|
}
|
|
|
|
mo->momz = splash->ChunkBaseZVel + (pr_chunk() << splash->ChunkZVelShift);
|
|
|
|
}
|
|
|
|
if (splash->SplashBase)
|
|
|
|
{
|
2006-07-16 09:10:45 +00:00
|
|
|
mo = Spawn (splash->SplashBase, thing->x, thing->y, z, ALLOW_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
if (thing->player && !splash->NoAlert)
|
|
|
|
{
|
|
|
|
P_NoiseAlert (thing, thing, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (mo)
|
|
|
|
{
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (mo, CHAN_ITEM, smallsplash ?
|
2006-02-24 04:48:15 +00:00
|
|
|
splash->SmallSplashSound : splash->NormalSplashSound,
|
|
|
|
1, ATTN_IDLE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (thing->x, thing->y, z, CHAN_ITEM, smallsplash ?
|
2006-02-24 04:48:15 +00:00
|
|
|
splash->SmallSplashSound : splash->NormalSplashSound,
|
|
|
|
1, ATTN_IDLE);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Don't let deep water eat missiles
|
|
|
|
return plane == &sec->floorplane ? Terrains[terrainnum].IsLiquid : false;
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// FUNC P_HitFloor
|
|
|
|
//
|
|
|
|
// Returns true if hit liquid and splashed, false if not.
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
bool P_HitFloor (AActor *thing)
|
|
|
|
{
|
|
|
|
const msecnode_t *m;
|
|
|
|
|
|
|
|
if (thing->flags2 & MF2_FLOATBOB || thing->flags3 & MF3_DONTSPLASH)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// don't splash if landing on the edge above water/lava/etc....
|
|
|
|
for (m = thing->touching_sectorlist; m; m = m->m_tnext)
|
|
|
|
{
|
|
|
|
if (thing->z == m->m_sector->floorplane.ZatPoint (thing->x, thing->y))
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (m == NULL ||
|
|
|
|
(m->m_sector->heightsec != NULL &&
|
|
|
|
!(m->m_sector->heightsec->MoreFlags & SECF_IGNOREHEIGHTSEC)))
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return P_HitWater (thing, m->m_sector);
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// FUNC P_CheckMissileSpawn
|
|
|
|
//
|
|
|
|
// Returns true if the missile is at a valid spawn point, otherwise
|
|
|
|
// explodes it and returns false.
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
bool P_CheckMissileSpawn (AActor* th)
|
|
|
|
{
|
2006-12-31 11:27:39 +00:00
|
|
|
// [RH] Don't decrement tics if they are already less than 1
|
|
|
|
if ((th->flags4 & MF4_RANDOMIZE) && th->tics > 0)
|
|
|
|
{
|
|
|
|
th->tics -= pr_checkmissilespawn() & 3;
|
|
|
|
if (th->tics < 1)
|
|
|
|
th->tics = 1;
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
// move a little forward so an angle can be computed if it immediately explodes
|
|
|
|
if (th->Speed >= 100*FRACUNIT)
|
|
|
|
{ // Ultra-fast ripper spawning missile
|
|
|
|
th->x += th->momx>>3;
|
|
|
|
th->y += th->momy>>3;
|
|
|
|
th->z += th->momz>>3;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ // Normal missile
|
|
|
|
th->x += th->momx>>1;
|
|
|
|
th->y += th->momy>>1;
|
|
|
|
th->z += th->momz>>1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// killough 3/15/98: no dropoff (really = don't care for missiles)
|
|
|
|
|
|
|
|
if (!P_TryMove (th, th->x, th->y, false))
|
|
|
|
{
|
|
|
|
// [RH] Don't explode ripping missiles that spawn inside something
|
2008-04-08 20:52:49 +00:00
|
|
|
if (th->BlockingMobj == NULL || !(th->flags2 & MF2_RIP) || (th->BlockingMobj->flags5 & MF5_DONTRIP))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-11-10 12:13:37 +00:00
|
|
|
// If this is a monster spawned by A_CustomMissile subtract it from the counter.
|
|
|
|
if (th->CountsAsKill())
|
|
|
|
{
|
|
|
|
th->flags&=~MF_COUNTKILL;
|
|
|
|
level.total_monsters--;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
// [RH] Don't explode missiles that spawn on top of horizon lines
|
2008-04-08 20:52:49 +00:00
|
|
|
if (th->BlockingLine != NULL && th->BlockingLine->special == Line_Horizon)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
th->Destroy ();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-04-08 20:52:49 +00:00
|
|
|
P_ExplodeMissile (th, NULL, th->BlockingMobj);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-11-25 12:25:05 +00:00
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// FUNC P_PlaySpawnSound
|
|
|
|
//
|
|
|
|
// Plays a missiles spawn sound. Location depends on the
|
|
|
|
// MF_SPAWNSOUNDSOURCE flag.
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void P_PlaySpawnSound(AActor *missile, AActor *spawner)
|
|
|
|
{
|
|
|
|
if (missile->SeeSound != 0)
|
|
|
|
{
|
|
|
|
if (!(missile->flags & MF_SPAWNSOUNDSOURCE))
|
|
|
|
{
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (missile, CHAN_VOICE, missile->SeeSound, 1, ATTN_NORM);
|
2006-11-25 12:25:05 +00:00
|
|
|
}
|
|
|
|
else if (spawner != NULL)
|
|
|
|
{
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (spawner, CHAN_WEAPON, missile->SeeSound, 1, ATTN_NORM);
|
2006-11-25 12:25:05 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// If there is no spawner use the spawn position.
|
|
|
|
// But not in a silenced sector.
|
2008-05-11 21:16:32 +00:00
|
|
|
if (!(missile->Sector->Flags & SECF_SILENT))
|
2008-07-01 04:06:56 +00:00
|
|
|
S_Sound (missile->x, missile->y, missile->z, CHAN_WEAPON, missile->SeeSound, 1, ATTN_NORM);
|
2006-11-25 12:25:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// FUNC P_SpawnMissile
|
|
|
|
//
|
|
|
|
// Returns NULL if the missile exploded immediately, otherwise returns
|
|
|
|
// a mobj_t pointer to the missile.
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
AActor *P_SpawnMissile (AActor *source, AActor *dest, const PClass *type)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
return P_SpawnMissileXYZ (source->x, source->y, source->z + 32*FRACUNIT,
|
|
|
|
source, dest, type);
|
|
|
|
}
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
AActor *P_SpawnMissileZ (AActor *source, fixed_t z, AActor *dest, const PClass *type)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
return P_SpawnMissileXYZ (source->x, source->y, z, source, dest, type);
|
|
|
|
}
|
|
|
|
|
|
|
|
AActor *P_SpawnMissileXYZ (fixed_t x, fixed_t y, fixed_t z,
|
2006-05-10 02:40:43 +00:00
|
|
|
AActor *source, AActor *dest, const PClass *type)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-11-21 05:43:34 +00:00
|
|
|
if (dest == NULL)
|
|
|
|
{
|
|
|
|
Printf ("P_SpawnMissilyXYZ: Tried to shoot %s from %s with no dest\n",
|
|
|
|
type->TypeName.GetChars(), source->GetClass()->TypeName.GetChars());
|
|
|
|
return NULL;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
int defflags3 = GetDefaultByType (type)->flags3;
|
|
|
|
|
|
|
|
if (defflags3 & MF3_FLOORHUGGER)
|
|
|
|
{
|
|
|
|
z = ONFLOORZ;
|
|
|
|
}
|
|
|
|
else if (defflags3 & MF3_CEILINGHUGGER)
|
|
|
|
{
|
|
|
|
z = ONCEILINGZ;
|
|
|
|
}
|
|
|
|
else if (z != ONFLOORZ)
|
|
|
|
{
|
|
|
|
z -= source->floorclip;
|
|
|
|
}
|
|
|
|
|
2006-07-16 09:10:45 +00:00
|
|
|
AActor *th = Spawn (type, x, y, z, ALLOW_REPLACE);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2006-11-25 12:25:05 +00:00
|
|
|
P_PlaySpawnSound(th, source);
|
2006-02-24 04:48:15 +00:00
|
|
|
th->target = source; // record missile's originator
|
|
|
|
|
|
|
|
float speed = (float)(th->Speed);
|
|
|
|
|
|
|
|
// [RH]
|
|
|
|
// Hexen calculates the missile velocity based on the source's location.
|
|
|
|
// Would it be more useful to base it on the actual position of the
|
2007-03-07 17:31:40 +00:00
|
|
|
// missile?
|
|
|
|
// Answer: No, because this way, you can set up sets of parallel missiles.
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2007-01-19 02:00:39 +00:00
|
|
|
FVector3 velocity(dest->x - source->x, dest->y - source->y, dest->z - source->z);
|
2006-02-24 04:48:15 +00:00
|
|
|
// Floor and ceiling huggers should never have a vertical component to their velocity
|
|
|
|
if (defflags3 & (MF3_FLOORHUGGER|MF3_CEILINGHUGGER))
|
|
|
|
{
|
2007-01-19 02:00:39 +00:00
|
|
|
velocity.Z = 0;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2007-03-07 17:31:40 +00:00
|
|
|
// [RH] Adjust the trajectory if the missile will go over the target's head.
|
2006-02-24 04:48:15 +00:00
|
|
|
else if (z - source->z >= dest->height)
|
|
|
|
{
|
2007-01-19 02:00:39 +00:00
|
|
|
velocity.Z += dest->height - z + source->z;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2007-01-19 02:00:39 +00:00
|
|
|
velocity.Resize (speed);
|
|
|
|
th->momx = (fixed_t)(velocity.X);
|
|
|
|
th->momy = (fixed_t)(velocity.Y);
|
|
|
|
th->momz = (fixed_t)(velocity.Z);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// invisible target: rotate velocity vector in 2D
|
|
|
|
if (dest->flags & MF_SHADOW)
|
|
|
|
{
|
|
|
|
angle_t an = pr_spawnmissile.Random2 () << 20;
|
|
|
|
an >>= ANGLETOFINESHIFT;
|
|
|
|
|
|
|
|
fixed_t newx = DMulScale16 (th->momx, finecosine[an], -th->momy, finesine[an]);
|
|
|
|
fixed_t newy = DMulScale16 (th->momx, finesine[an], th->momy, finecosine[an]);
|
|
|
|
th->momx = newx;
|
|
|
|
th->momy = newy;
|
|
|
|
}
|
|
|
|
|
|
|
|
th->angle = R_PointToAngle2 (0, 0, th->momx, th->momy);
|
|
|
|
|
|
|
|
return P_CheckMissileSpawn (th) ? th : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// FUNC P_SpawnMissileAngle
|
|
|
|
//
|
|
|
|
// Returns NULL if the missile exploded immediately, otherwise returns
|
|
|
|
// a mobj_t pointer to the missile.
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
AActor *P_SpawnMissileAngle (AActor *source, const PClass *type,
|
2006-02-24 04:48:15 +00:00
|
|
|
angle_t angle, fixed_t momz)
|
|
|
|
{
|
|
|
|
return P_SpawnMissileAngleZSpeed (source, source->z + 32*FRACUNIT,
|
|
|
|
type, angle, momz, GetDefaultByType (type)->Speed);
|
|
|
|
}
|
|
|
|
|
|
|
|
AActor *P_SpawnMissileAngleZ (AActor *source, fixed_t z,
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *type, angle_t angle, fixed_t momz)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
return P_SpawnMissileAngleZSpeed (source, z, type, angle, momz,
|
|
|
|
GetDefaultByType (type)->Speed);
|
|
|
|
}
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
AActor *P_SpawnMissileZAimed (AActor *source, fixed_t z, AActor *dest, const PClass *type)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
angle_t an;
|
|
|
|
fixed_t dist;
|
|
|
|
fixed_t speed;
|
|
|
|
fixed_t momz;
|
|
|
|
|
|
|
|
an = source->angle;
|
|
|
|
|
|
|
|
if (dest->flags & MF_SHADOW)
|
|
|
|
{
|
|
|
|
an += pr_spawnmissile.Random2() << 20;
|
|
|
|
}
|
|
|
|
dist = P_AproxDistance (dest->x - source->x, dest->y - source->y);
|
|
|
|
speed = GetDefaultByType (type)->Speed;
|
|
|
|
dist /= speed;
|
|
|
|
momz = dist != 0 ? (dest->z - source->z)/dist : speed;
|
|
|
|
return P_SpawnMissileAngleZSpeed (source, z, type, an, momz, speed);
|
|
|
|
}
|
|
|
|
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
//
|
|
|
|
// FUNC P_SpawnMissileAngleSpeed
|
|
|
|
//
|
|
|
|
// Returns NULL if the missile exploded immediately, otherwise returns
|
|
|
|
// a mobj_t pointer to the missile.
|
|
|
|
//
|
|
|
|
//---------------------------------------------------------------------------
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
AActor *P_SpawnMissileAngleSpeed (AActor *source, const PClass *type,
|
2006-02-24 04:48:15 +00:00
|
|
|
angle_t angle, fixed_t momz, fixed_t speed)
|
|
|
|
{
|
|
|
|
return P_SpawnMissileAngleZSpeed (source, source->z + 32*FRACUNIT,
|
|
|
|
type, angle, momz, speed);
|
|
|
|
}
|
|
|
|
|
|
|
|
AActor *P_SpawnMissileAngleZSpeed (AActor *source, fixed_t z,
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *type, angle_t angle, fixed_t momz, fixed_t speed, AActor *owner)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
AActor *mo;
|
|
|
|
int defflags3 = GetDefaultByType (type)->flags3;
|
|
|
|
|
|
|
|
if (defflags3 & MF3_FLOORHUGGER)
|
|
|
|
{
|
|
|
|
z = ONFLOORZ;
|
|
|
|
}
|
|
|
|
else if (defflags3 & MF3_CEILINGHUGGER)
|
|
|
|
{
|
|
|
|
z = ONCEILINGZ;
|
|
|
|
}
|
|
|
|
if (z != ONFLOORZ)
|
|
|
|
{
|
|
|
|
z -= source->floorclip;
|
|
|
|
}
|
2006-07-16 09:10:45 +00:00
|
|
|
mo = Spawn (type, source->x, source->y, z, ALLOW_REPLACE);
|
2006-11-25 12:25:05 +00:00
|
|
|
P_PlaySpawnSound(mo, source);
|
2006-02-24 04:48:15 +00:00
|
|
|
mo->target = owner != NULL ? owner : source; // Originator
|
|
|
|
mo->angle = angle;
|
|
|
|
angle >>= ANGLETOFINESHIFT;
|
|
|
|
mo->momx = FixedMul (speed, finecosine[angle]);
|
|
|
|
mo->momy = FixedMul (speed, finesine[angle]);
|
|
|
|
mo->momz = momz;
|
|
|
|
return P_CheckMissileSpawn(mo) ? mo : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
================
|
|
|
|
=
|
|
|
|
= P_SpawnPlayerMissile
|
|
|
|
=
|
|
|
|
= Tries to aim at a nearby monster
|
|
|
|
================
|
|
|
|
*/
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
AActor *P_SpawnPlayerMissile (AActor *source, const PClass *type)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2007-03-07 17:31:40 +00:00
|
|
|
return P_SpawnPlayerMissile (source, 0, 0, 0, type, source->angle);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
AActor *P_SpawnPlayerMissile (AActor *source, const PClass *type, angle_t angle)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2007-03-07 17:31:40 +00:00
|
|
|
return P_SpawnPlayerMissile (source, 0, 0, 0, type, angle);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
AActor *P_SpawnPlayerMissile (AActor *source, fixed_t x, fixed_t y, fixed_t z,
|
2008-04-10 14:38:43 +00:00
|
|
|
const PClass *type, angle_t angle, AActor **pLineTarget, AActor **pMissileActor)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
static const int angdiff[3] = { -1<<26, 1<<26, 0 };
|
|
|
|
int i;
|
|
|
|
angle_t an;
|
|
|
|
angle_t pitch;
|
2008-04-10 14:38:43 +00:00
|
|
|
AActor *linetarget;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// see which target is to be aimed at
|
|
|
|
i = 2;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
an = angle + angdiff[i];
|
2008-04-10 14:38:43 +00:00
|
|
|
pitch = P_AimLineAttack (source, an, 16*64*FRACUNIT, &linetarget);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (source->player != NULL &&
|
2007-12-11 04:03:40 +00:00
|
|
|
level.IsFreelookAllowed() &&
|
2006-02-24 04:48:15 +00:00
|
|
|
source->player->userinfo.aimdist <= ANGLE_1/2)
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} while (linetarget == NULL && --i >= 0);
|
|
|
|
|
|
|
|
if (linetarget == NULL)
|
|
|
|
{
|
|
|
|
an = angle;
|
|
|
|
}
|
2008-04-10 14:38:43 +00:00
|
|
|
if (pLineTarget) *pLineTarget = linetarget;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
i = GetDefaultByType (type)->flags3;
|
|
|
|
|
|
|
|
if (i & MF3_FLOORHUGGER)
|
|
|
|
{
|
|
|
|
z = ONFLOORZ;
|
|
|
|
}
|
|
|
|
else if (i & MF3_CEILINGHUGGER)
|
|
|
|
{
|
|
|
|
z = ONCEILINGZ;
|
|
|
|
}
|
|
|
|
if (z != ONFLOORZ && z != ONCEILINGZ)
|
|
|
|
{
|
2007-03-07 17:31:40 +00:00
|
|
|
// Doom spawns missiles 4 units lower than hitscan attacks for players.
|
|
|
|
z += source->z + (source->height>>1) - source->floorclip;
|
|
|
|
if (source->player != NULL) // Considering this is for player missiles, it better not be NULL.
|
|
|
|
{
|
|
|
|
z += FixedMul (source->player->mo->AttackZOffset - 4*FRACUNIT, source->player->crouchfactor);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
z += 4*FRACUNIT;
|
|
|
|
}
|
|
|
|
// Do not fire beneath the floor.
|
|
|
|
if (z < source->floorz)
|
|
|
|
{
|
|
|
|
z = source->floorz;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-04-10 14:38:43 +00:00
|
|
|
AActor *MissileActor = Spawn (type, source->x + x, source->y + y, z, ALLOW_REPLACE);
|
|
|
|
if (pMissileActor) *pMissileActor = MissileActor;
|
2006-11-25 12:25:05 +00:00
|
|
|
P_PlaySpawnSound(MissileActor, source);
|
2006-02-24 04:48:15 +00:00
|
|
|
MissileActor->target = source;
|
|
|
|
MissileActor->angle = an;
|
|
|
|
|
|
|
|
fixed_t vx, vy, vz, speed;
|
|
|
|
|
|
|
|
vx = FixedMul (finecosine[pitch>>ANGLETOFINESHIFT], finecosine[an>>ANGLETOFINESHIFT]);
|
|
|
|
vy = FixedMul (finecosine[pitch>>ANGLETOFINESHIFT], finesine[an>>ANGLETOFINESHIFT]);
|
|
|
|
vz = -finesine[pitch>>ANGLETOFINESHIFT];
|
|
|
|
speed = MissileActor->Speed;
|
|
|
|
|
|
|
|
MissileActor->momx = FixedMul (vx, speed);
|
|
|
|
MissileActor->momy = FixedMul (vy, speed);
|
|
|
|
MissileActor->momz = FixedMul (vz, speed);
|
|
|
|
|
|
|
|
if (P_CheckMissileSpawn (MissileActor))
|
|
|
|
{
|
|
|
|
return MissileActor;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool AActor::IsTeammate (AActor *other)
|
|
|
|
{
|
|
|
|
if (!player || !other || !other->player)
|
|
|
|
return false;
|
|
|
|
if (!deathmatch)
|
|
|
|
return true;
|
|
|
|
if (teamplay && other->player->userinfo.team != TEAM_None &&
|
|
|
|
player->userinfo.team == other->player->userinfo.team)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2006-03-03 03:57:01 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// AActor :: GetSpecies
|
|
|
|
//
|
|
|
|
// Species is defined as the lowest base class that is a monster
|
|
|
|
// with no non-monster class in between. This is virtualized, so special
|
|
|
|
// monsters can change this behavior if they like.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *AActor::GetSpecies()
|
2006-03-03 03:57:01 +00:00
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *thistype = GetClass();
|
2006-03-03 03:57:01 +00:00
|
|
|
|
|
|
|
if (GetDefaultByType(thistype)->flags3 & MF3_ISMONSTER)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
while (thistype->ParentClass)
|
2006-03-03 03:57:01 +00:00
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
if (GetDefaultByType(thistype->ParentClass)->flags3 & MF3_ISMONSTER)
|
|
|
|
thistype = thistype->ParentClass;
|
2006-03-03 03:57:01 +00:00
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return thistype;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// AActor :: IsFriend
|
|
|
|
//
|
|
|
|
// Checks if two monsters have to be considered friendly.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
bool AActor::IsFriend (AActor *other)
|
|
|
|
{
|
|
|
|
if (flags & other->flags & MF_FRIENDLY)
|
|
|
|
{
|
|
|
|
return !deathmatch ||
|
|
|
|
FriendPlayer == other->FriendPlayer ||
|
|
|
|
FriendPlayer == 0 ||
|
|
|
|
other->FriendPlayer == 0;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// AActor :: IsHostile
|
|
|
|
//
|
|
|
|
// Checks if two monsters have to be considered hostile under any circumstances
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
- Fixed: ActorFlagSetOrReset() wasn't receiving the + or - character from
ParseActorProperties().
- Fixed: The decorate FindFlag() function returned flags from ActorFlags
instead of the passed flags set.
- Fixed: The CHT_CHAINSAW, CHT_POWER, CHT_HEALTH, and CHT_RESSURECT needed
NULL player->mo checks.
- Fixed: The "give all" command didn't give the backpack in Doom, and it
must give the backpack before giving ammo.
- Fixed: P_SetPsprite() must not call the action function if the player is
not attached to an actor. This can happen, for instance, if the level is
destroyed while the player is holding a powered-up Phoenix Rod. As part
of its EndPowerup() function, it sets the psprite to the regular version,
but the player actor has already been destroyed.
- Fixed: FinishThingdef() needs to check for valid names, because weapons
could have inherited valid pointers from their superclass.
- Fixed: fuglyname didn't work.
- Fixed: Redefining $ambient sounds leaked memory.
- Added Jim's crashcatcher.c fix for better shell support.
- VC7.1 seems to have no trouble distinguishing between passing a (const
TypeInfo *) reference to operator<< and the generic, templated (object *)
version, so a few places that can benefit from it now use it. I believe
VC6 had problems with this, which is why I didn't do it all along. The
function's implementation was also moved out of dobject.cpp and into
farchive.cpp.
- Fixed: UnpackPixels() unpacked all chunks in a byte, which is wrong for the
last byte in a row if the image width is not an even multiple of the number
pixels per byte.
- Fixed: P_TranslateLineDef() should only clear monster activation for secret
useable lines, not crossable lines.
- Fixed: Some leftover P_IsHostile() calls still needed to be rewritten.
- Fixed: AWeaponHolder::Serialize() wrote the class type in all circumstances.
SVN r20 (trunk)
2006-03-14 06:11:39 +00:00
|
|
|
bool AActor::IsHostile (AActor *other)
|
2006-03-03 03:57:01 +00:00
|
|
|
{
|
|
|
|
// Both monsters are non-friendlies so hostilities depend on infighting settings
|
|
|
|
if (!((flags | other->flags) & MF_FRIENDLY)) return false;
|
|
|
|
|
|
|
|
// Both monsters are friendly and belong to the same player if applicable.
|
|
|
|
if (flags & other->flags & MF_FRIENDLY)
|
|
|
|
{
|
|
|
|
return deathmatch &&
|
- Fixed: ActorFlagSetOrReset() wasn't receiving the + or - character from
ParseActorProperties().
- Fixed: The decorate FindFlag() function returned flags from ActorFlags
instead of the passed flags set.
- Fixed: The CHT_CHAINSAW, CHT_POWER, CHT_HEALTH, and CHT_RESSURECT needed
NULL player->mo checks.
- Fixed: The "give all" command didn't give the backpack in Doom, and it
must give the backpack before giving ammo.
- Fixed: P_SetPsprite() must not call the action function if the player is
not attached to an actor. This can happen, for instance, if the level is
destroyed while the player is holding a powered-up Phoenix Rod. As part
of its EndPowerup() function, it sets the psprite to the regular version,
but the player actor has already been destroyed.
- Fixed: FinishThingdef() needs to check for valid names, because weapons
could have inherited valid pointers from their superclass.
- Fixed: fuglyname didn't work.
- Fixed: Redefining $ambient sounds leaked memory.
- Added Jim's crashcatcher.c fix for better shell support.
- VC7.1 seems to have no trouble distinguishing between passing a (const
TypeInfo *) reference to operator<< and the generic, templated (object *)
version, so a few places that can benefit from it now use it. I believe
VC6 had problems with this, which is why I didn't do it all along. The
function's implementation was also moved out of dobject.cpp and into
farchive.cpp.
- Fixed: UnpackPixels() unpacked all chunks in a byte, which is wrong for the
last byte in a row if the image width is not an even multiple of the number
pixels per byte.
- Fixed: P_TranslateLineDef() should only clear monster activation for secret
useable lines, not crossable lines.
- Fixed: Some leftover P_IsHostile() calls still needed to be rewritten.
- Fixed: AWeaponHolder::Serialize() wrote the class type in all circumstances.
SVN r20 (trunk)
2006-03-14 06:11:39 +00:00
|
|
|
FriendPlayer != other->FriendPlayer &&
|
|
|
|
FriendPlayer !=0 &&
|
2006-03-03 03:57:01 +00:00
|
|
|
other->FriendPlayer != 0;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
int AActor::DoSpecialDamage (AActor *target, int damage)
|
|
|
|
{
|
|
|
|
if (target->player && target->player->mo == target && damage < 1000 &&
|
|
|
|
(target->player->cheats & CF_GODMODE))
|
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-05-07 00:27:22 +00:00
|
|
|
if (target->player)
|
|
|
|
{
|
|
|
|
int poisondamage = GetClass()->Meta.GetMetaInt(AMETA_PoisonDamage);
|
|
|
|
if (poisondamage > 0)
|
|
|
|
{
|
|
|
|
P_PoisonPlayer (target->player, this, this->target, poisondamage);
|
|
|
|
damage >>= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
return damage;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-31 14:53:21 +00:00
|
|
|
int AActor::TakeSpecialDamage (AActor *inflictor, AActor *source, int damage, FName damagetype)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
// If the actor does not have a corresponding death state, then it does not take damage.
|
|
|
|
// Note that DeathState matches every kind of damagetype, so if an actor has that, it can
|
|
|
|
// be hurt with any type of damage. Exception: Massacre damage always succeeds, because
|
|
|
|
// it needs to work.
|
|
|
|
FState *death;
|
|
|
|
|
2006-05-07 00:27:22 +00:00
|
|
|
if (flags5 & MF5_NODAMAGE)
|
|
|
|
{
|
- Fixed: EV_Teleport() did not set players to their idle state, so if they
were running when the teleported, they would still be running afterward
even though they weren't moving anywhere. Normally, P_XYMovement() does
this when they stop due to friction.
- Fixed: AActor::TakeSpecialDamage() completely bypassed the standard rules
for target switching on actors with MF5_NODAMAGE set.
- Changed the return values of the ACS spawn, spawnspot, and spawnspotfacing
commands to be the total count of things spawned, rather than a pretty
much useless reference to the actor spawned at the last map spot.
- Fixed: DLevelScript::DoSpawn() takes a byte angle, but DoSpawnSpotFacing()
passed it a full-length angle.
- Fixed: When MF_SKULLFLY is removed because an actor slams into something,
it was set to a see or spawn state, resetting its tic count and bypassing
the effectiveness of the MF2_DORMANT flag. While I was at it, I decided
dormant skulls shouldn't do slamming damage, either.
- Fixed: P_Thing_Spawn() returned success only if all thing instances were
successfully spawned. As long as at least one thing was spawned, it should
be considered a success.
- Fixed: Flipped single rotation sprites were only flipped every other 22.5
degree interval.
SVN r484 (trunk)
2007-02-14 22:47:01 +00:00
|
|
|
return 0;
|
2006-05-07 00:27:22 +00:00
|
|
|
}
|
|
|
|
|
2006-10-31 14:53:21 +00:00
|
|
|
// If the actor does not have a corresponding death state, then it does not take damage.
|
|
|
|
// Note that DeathState matches every kind of damagetype, so an actor has that, it can
|
|
|
|
// be hurt with any type of damage. Exception: Massacre damage always succeeds, because
|
|
|
|
// it needs to work.
|
|
|
|
|
|
|
|
// Always kill if there is a regular death state or no death states at all.
|
2006-10-31 21:49:45 +00:00
|
|
|
if (FindState (NAME_Death) != NULL || !HasSpecialDeathStates())
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
return damage;
|
|
|
|
}
|
2006-10-31 14:53:21 +00:00
|
|
|
if (damagetype == NAME_Ice)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-12-16 14:06:21 +00:00
|
|
|
death = FindState (NAME_Death, NAME_Ice, true);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (death == NULL && !deh.NoAutofreeze && !(flags4 & MF4_NOICEDEATH) &&
|
|
|
|
(player || (flags3 & MF3_ISMONSTER)))
|
|
|
|
{
|
|
|
|
death = &AActor::States[S_GENERICFREEZEDEATH];
|
|
|
|
}
|
2006-10-31 14:53:21 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-12-16 14:06:21 +00:00
|
|
|
death = FindState (NAME_Death, damagetype);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
return (death == NULL) ? -1 : damage;
|
|
|
|
}
|
|
|
|
|
2006-11-29 10:03:35 +00:00
|
|
|
void AActor::Crash()
|
|
|
|
{
|
|
|
|
if ((flags & MF_CORPSE) &&
|
|
|
|
!(flags3 & MF3_CRASHED) &&
|
|
|
|
!(flags & MF_ICECORPSE))
|
|
|
|
{
|
2008-03-04 00:56:22 +00:00
|
|
|
FState *crashstate = NULL;
|
2006-11-29 10:03:35 +00:00
|
|
|
|
|
|
|
if (DamageType != NAME_None)
|
|
|
|
{
|
2006-12-16 14:06:21 +00:00
|
|
|
crashstate = FindState(NAME_Crash, DamageType, true);
|
2006-11-29 10:03:35 +00:00
|
|
|
}
|
|
|
|
if (crashstate == NULL)
|
|
|
|
{
|
|
|
|
int gibhealth = -abs(GetClass()->Meta.GetMetaInt (AMETA_GibHealth,
|
|
|
|
gameinfo.gametype == GAME_Doom ? -GetDefault()->health : -GetDefault()->health/2));
|
|
|
|
|
2008-03-04 00:56:22 +00:00
|
|
|
if (health < gibhealth)
|
2006-11-29 10:03:35 +00:00
|
|
|
{ // Extreme death
|
2006-12-16 14:06:21 +00:00
|
|
|
crashstate = FindState (NAME_Crash, NAME_Extreme);
|
2006-11-29 10:03:35 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{ // Normal death
|
|
|
|
crashstate = FindState (NAME_Crash);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (crashstate != NULL) SetState(crashstate);
|
|
|
|
// Set MF3_CRASHED regardless of the presence of a crash state
|
|
|
|
// so this code doesn't have to be executed repeatedly.
|
|
|
|
flags3 |= MF3_CRASHED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-04-03 10:49:54 +00:00
|
|
|
void AActor::SetIdle()
|
|
|
|
{
|
|
|
|
FState *idle = FindState (NAME_Idle);
|
|
|
|
if (idle == NULL) idle = SpawnState;
|
|
|
|
SetState(idle);
|
|
|
|
}
|