zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 20:43:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2017-05-26 18:17:35 -04:00
commit 40bbb70799
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/b_think.cpp
View file

@ -395,10 +395,12 @@ void DBot::WhatToGet (AActor *item)
else if (item->GetClass()->TypeName == NAME_Megasphere || item->IsKindOf(NAME_Health))
{
// do the test with the health item that's actually given.
if (item->GetClass()->TypeName == NAME_Megasphere) item = GetDefaultByName("MegasphereHealth");
if (item != nullptr)
AActor* const testItem = NAME_Megasphere == item->GetClass()->TypeName
? GetDefaultByName("MegasphereHealth")
: item;
if (nullptr != testItem)
{
int maxhealth = P_GetRealMaxHealth(player->mo, item->IntVar(NAME_MaxAmount));
const int maxhealth = P_GetRealMaxHealth(player->mo, testItem->IntVar(NAME_MaxAmount));
if (player->mo->health >= maxhealth)
return;
}