zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 13:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: The backpack didn't give extra ammo in baby and nightmare modes.

Browse source 
SVN r387 (trunk)
This commit is contained in:
Randy Heit 2006-11-25 04:47:42 +00:00
parent 4b7b95663e
commit 824fa1a557
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/rh-log.txt
View file

@ -1,4 +1,5 @@
November 24, 2006
- Fixed: The backpack didn't give extra ammo in baby and nightmare modes.
- Fixed: When P_SpawnPlayer() calls DObject::PointerSubstitution() to
redirect player pointers, it affects the bodyque too. That meant that in
multiplayer games, once the bodyque filled up, anybody was in danger of

24
src/g_shared/a_pickups.cpp
View file

@ -1920,10 +1920,19 @@ AInventory *ABackpack::CreateCopy (AActor *other)
((AAmmo *)GetDefaultByType (type))->BackpackAmount > 0)
{
AAmmo *ammo = static_cast<AAmmo *>(other->FindInventory (type));
int amount = static_cast<AAmmo *>(GetDefaultByType(type))->BackpackAmount;
// extra ammo in baby mode and nightmare mode
if (gameskill == sk_baby || (gameskill == sk_nightmare && gameinfo.gametype != GAME_Strife))
{
if (gameinfo.gametype & (GAME_Doom|GAME_Strife))
amount <<= 1;
else
amount += amount >> 1;
}
if (ammo == NULL)
{ // The player did not have the ammo. Add it.
ammo = static_cast<AAmmo *>(Spawn (type, 0, 0, 0, NO_REPLACE));
ammo->Amount = bDepleted ? 0 : ammo->BackpackAmount;
ammo->Amount = bDepleted ? 0 : amount;
ammo->MaxAmount = ammo->BackpackMaxAmount;
ammo->AttachToOwner (other);
}
@ -1935,7 +1944,7 @@ AInventory *ABackpack::CreateCopy (AActor *other)
}
if (!bDepleted && ammo->Amount < ammo->MaxAmount)
{
ammo->Amount += static_cast<AAmmo*>(ammo->GetDefault())->BackpackAmount;
ammo->Amount += amount;
if (ammo->Amount > ammo->MaxAmount)
{
ammo->Amount = ammo->MaxAmount;
@ -1969,7 +1978,16 @@ bool ABackpack::HandlePickup (AInventory *item)
{
if (probe->Amount < probe->MaxAmount)
{
probe->Amount += static_cast<AAmmo*>(probe->GetDefault())->BackpackAmount;
int amount = static_cast<AAmmo*>(probe->GetDefault())->BackpackAmount;
// extra ammo in baby mode and nightmare mode
if (gameskill == sk_baby || (gameskill == sk_nightmare && gameinfo.gametype != GAME_Strife))
{
if (gameinfo.gametype & (GAME_Doom|GAME_Strife))
amount <<= 1;
else
amount += amount >> 1;
}
probe->Amount += amount;
if (probe->Amount > probe->MaxAmount)
{
probe->Amount = probe->MaxAmount;