OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added A_Mushroom compatibility option for Dehacked.

Browse source 
- Added Gez's submission for interhubamount DECORATE property.


SVN r1747 (trunk)
This commit is contained in:
Christoph Oelckers 2009-08-02 15:54:34 +00:00
commit 356e4a0fcc
13 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/g_game.cpp
View file

@ -1181,7 +1181,7 @@ void G_PlayerFinishLevel (int player, EFinishLevelType mode, bool resetinventory
while (item != NULL)
{
next = item->Inventory;
if (item->ItemFlags & IF_INTERHUBSTRIP)
if (item->InterHubAmount < 1)
{
item->Destroy ();
}
@ -1190,14 +1190,13 @@ void G_PlayerFinishLevel (int player, EFinishLevelType mode, bool resetinventory
}
if (mode == FINISH_NoHub && !(level.flags2 & LEVEL2_KEEPFULLINVENTORY))
{ // Reduce all owned (visible) inventory to 1 item each
{ // Reduce all owned (visible) inventory to defined maximum interhub amount
for (item = p->mo->Inventory; item != NULL; item = item->Inventory)
{
// There may be depletable items with an amount of 0.
// Those need to stay at 0; the rest get dropped to 1.
if (item->ItemFlags & IF_INVBAR && item->Amount > 1)
// If the player is carrying more samples of an item than allowed, reduce amount accordingly
if (item->ItemFlags & IF_INVBAR && item->Amount > item->InterHubAmount)
{
item->Amount = 1;
item->Amount = item->InterHubAmount;
}
}
}