Fixed megasphere item selection in bot code

https://forum.zdoom.org/viewtopic.php?t=56604
This commit is contained in:
alexey.lysiuk 2017-05-26 11:54:42 +03:00
parent d633e8afc1
commit 67d313cf25
1 changed files with 5 additions and 3 deletions

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;
}