zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-21 02:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-19 01:02:30 +02:00
commit 8b35c08aa0
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_enemy.cpp
View file

@ -2856,6 +2856,10 @@ void A_Face(AActor *self, AActor *other, DAngle max_turn, DAngle max_pitch, DAng
{
target_z = other->Center();
}
if (source_z >= self->Top())
{
source_z = self->Center();
}
//Note there is no +32 on purpose. This is for customization sake.
//If one doesn't want this behavior, just don't use FAF_BOTTOM.

9
wadsrc/static/language.enu
View file

@ -869,6 +869,15 @@ TAG_SKULLROD = "Hellstaff";
TAG_PHOENIXROD = "Phoenix Rod";
TAG_MACE = "Firemace";
TAG_STAFFP = "Staff";
TAG_GAUNTLETSP = "Gauntlets of the Necromancer";
TAG_GOLDWANDP = "Elven Wand";
TAG_CROSSBOWP = "Ethereal Crossbow";
TAG_BLASTERP = "Dragon Claw";
TAG_SKULLRODP = "Hellstaff";
TAG_PHOENIXRODP = "Phoenix Rod";
TAG_MACEP = "Firemace";
// Item tags: Heretic artifacts
TAG_ARTIEGG = "Morph Ovum";
TAG_ARTIFIREBOMB = "Timebomb of the Ancients";