zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 12:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Item tossing did not work anymore.

Browse source 
SVN r1502 (trunk)
This commit is contained in:
Christoph Oelckers 2009-03-24 07:51:15 +00:00
parent e4da63e9f3
commit 218fc5018e
3 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/rh-log.txt
View file

@ -1,4 +1,7 @@
March 23, 2009 (Changes by Graf Zahl)
March 24, 2009 (Changes by Graf Zahl)
- Fixed: Item tossing did not work anymore.
March 23, 2009 (Changes by Graf Zahl)
- Changed: Making the gameinfo customizable by MAPINFO requires different
checks for map specific border flats.

1
src/CMakeLists.txt
View file

@ -507,6 +507,7 @@ add_executable( zdoom WIN32
nodebuild_extract.cpp
nodebuild_gl.cpp
nodebuild_utility.cpp
p_3dfloors.cpp
p_3dmidtex.cpp
p_acs.cpp
p_buildmap.cpp

29
src/p_enemy.cpp
View file

@ -2507,23 +2507,26 @@ AInventory *P_DropItem (AActor *source, const PClass *type, int dropamount, int
}
}
mo = Spawn (type, source->x, source->y, spawnz, ALLOW_REPLACE);
mo->flags |= MF_DROPPED;
mo->flags &= ~MF_NOGRAVITY; // [RH] Make sure it is affected by gravity
if (mo->IsKindOf (RUNTIME_CLASS(AInventory)))
if (mo != NULL)
{
AInventory * inv = static_cast<AInventory *>(mo);
ModifyDropAmount(inv, dropamount);
if (inv->SpecialDropAction (source))
mo->flags |= MF_DROPPED;
mo->flags &= ~MF_NOGRAVITY; // [RH] Make sure it is affected by gravity
if (!(i_compatflags & COMPATF_NOTOSSDROPS))
{
return NULL;
P_TossItem (mo);
}
return inv;
if (mo->IsKindOf (RUNTIME_CLASS(AInventory)))
{
AInventory * inv = static_cast<AInventory *>(mo);
ModifyDropAmount(inv, dropamount);
if (inv->SpecialDropAction (source))
{
return NULL;
}
return inv;
}
// we can't really return an AInventory pointer to a non-inventory item here, can we?
}
if (!(i_compatflags & COMPATF_NOTOSSDROPS))
{
P_TossItem (mo);
}
// we can't really return an AInventory pointer to a non-inventory item here, can we?
}
return NULL;
}