- Added Martin Howe's morph system update.
- Added support for defining composite textures in HIRESTEX. It is not fully tested and right now can't do much more than the old TEXTUREx method. - Added a few NULL pointer checks to the texture code. - Made duplicate class names in DECORATE non-fatal. There is really no stability concern here and the worst that can happen is that the wrong actor is spawned. This was a constant hassle when testing with WADs that contain duplicate resources. SVN r905 (trunk)
This commit is contained in:
parent
b340f9c762
commit
6b2a7b8b03
19 changed files with 277 additions and 47 deletions
|
|
@ -1227,6 +1227,14 @@ bool AInventory::TryPickup (AActor *toucher)
|
|||
{
|
||||
return false;
|
||||
}
|
||||
// Some powerups cannot activate absolutely, for
|
||||
// example, PowerMorph; fail the pickup if so.
|
||||
if (copy->ItemFlags & IF_INITEFFECTFAILED)
|
||||
{
|
||||
if (copy != this) copy->Destroy();
|
||||
else ItemFlags &= ~IF_INITEFFECTFAILED;
|
||||
return false;
|
||||
}
|
||||
// Handle owner-changing powerups
|
||||
if (copy->ItemFlags & IF_CREATECOPYMOVED)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue