mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-24 13:11:33 +00:00
Revert "- removed STAT_INVENTORY."
This reverts commit 5ff0abe568
.
- use STAT_INVENTORY only for held items.
Seems this was causing some strange issues with hubs, but for items placed in the world it still cannot be allowed to have them in a different statnum.
This commit is contained in:
parent
48430d9b1a
commit
9ca6764556
3 changed files with 4 additions and 2 deletions
|
@ -1280,7 +1280,7 @@ void G_FinishTravel ()
|
||||||
|
|
||||||
for (inv = pawn->Inventory; inv != NULL; inv = inv->Inventory)
|
for (inv = pawn->Inventory; inv != NULL; inv = inv->Inventory)
|
||||||
{
|
{
|
||||||
inv->ChangeStatNum (STAT_DEFAULT);
|
inv->ChangeStatNum (STAT_INVENTORY);
|
||||||
inv->LinkToWorld ();
|
inv->LinkToWorld ();
|
||||||
inv->Travelled ();
|
inv->Travelled ();
|
||||||
}
|
}
|
||||||
|
|
|
@ -821,6 +821,7 @@ void AInventory::BecomeItem ()
|
||||||
}
|
}
|
||||||
RemoveFromHash ();
|
RemoveFromHash ();
|
||||||
flags &= ~MF_SPECIAL;
|
flags &= ~MF_SPECIAL;
|
||||||
|
ChangeStatNum(STAT_INVENTORY);
|
||||||
SetState (FindState("Held"));
|
SetState (FindState("Held"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -847,6 +848,7 @@ void AInventory::BecomePickup ()
|
||||||
}
|
}
|
||||||
flags = (GetDefault()->flags | MF_DROPPED) & ~MF_COUNTITEM;
|
flags = (GetDefault()->flags | MF_DROPPED) & ~MF_COUNTITEM;
|
||||||
renderflags &= ~RF_INVISIBLE;
|
renderflags &= ~RF_INVISIBLE;
|
||||||
|
ChangeStatNum(STAT_DEFAULT);
|
||||||
SetState (SpawnState);
|
SetState (SpawnState);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ enum
|
||||||
STAT_BOSSTARGET, // A boss brain target
|
STAT_BOSSTARGET, // A boss brain target
|
||||||
STAT_LIGHTNING, // The lightning thinker
|
STAT_LIGHTNING, // The lightning thinker
|
||||||
STAT_DECALTHINKER, // An object that thinks for a decal
|
STAT_DECALTHINKER, // An object that thinks for a decal
|
||||||
UNUSED_STAT_INVENTORY, // An inventory item (value kept for savegame compatibility.)
|
STAT_INVENTORY, // An inventory item
|
||||||
STAT_LIGHT, // A sector light effect
|
STAT_LIGHT, // A sector light effect
|
||||||
STAT_LIGHTTRANSFER, // A sector light transfer. These must be ticked after the light effects!!!
|
STAT_LIGHTTRANSFER, // A sector light transfer. These must be ticked after the light effects!!!
|
||||||
STAT_EARTHQUAKE, // Earthquake actors
|
STAT_EARTHQUAKE, // Earthquake actors
|
||||||
|
|
Loading…
Reference in a new issue