mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-11 15:21:51 +00:00
- Fixed: If AInventory::SpecialDropAction returns true the item should be destroyed.
- Fixed: Building with SSE disabled triggered an error. SVN r4028 (trunk)
This commit is contained in:
parent
de65ae809f
commit
3e1aa40461
2 changed files with 4 additions and 0 deletions
|
@ -1116,12 +1116,14 @@ int ClassifyLineBackpatchC (node_t &node, const FSimpleVert *v1, const FSimpleVe
|
|||
#endif
|
||||
// printf ("Patching for SSE %d @ %p %d\n", SSELevel, calleroffset, *calleroffset);
|
||||
|
||||
#ifndef DISABLE_SSE
|
||||
if (CPU.bSSE2)
|
||||
{
|
||||
func = ClassifyLineSSE2;
|
||||
diff = int((char *)ClassifyLineSSE2 - (char *)calleroffset);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
func = ClassifyLine2;
|
||||
diff = int((char *)ClassifyLine2 - (char *)calleroffset);
|
||||
|
|
|
@ -3069,6 +3069,8 @@ AInventory *P_DropItem (AActor *source, const PClass *type, int dropamount, int
|
|||
ModifyDropAmount(inv, dropamount);
|
||||
if (inv->SpecialDropAction (source))
|
||||
{
|
||||
// The special action indicates that the item should not spawn
|
||||
inv->Destroy();
|
||||
return NULL;
|
||||
}
|
||||
return inv;
|
||||
|
|
Loading…
Reference in a new issue