mmo-ref/gdle
1
0
Fork 0
mirror of https://gitlab.com/Scribble/gdlenhanced.git synced 2026-08-17 14:23:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fixes bug where you can't open a corpse that's just out of range

Browse source 
* Fixes bug where you wouldn't walk in to a portal if using it
* Fixes bug where food/potions that affected HP would give you tons of HP
This commit is contained in:
plunderdog 2018-07-01 16:55:53 +01:00
parent 95f6175eae
commit fd84fbacad
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Food.cpp
View file

@ -84,7 +84,7 @@ int CFoodWeenie::DoUseResponse(std::shared_ptr<CWeenieObject> other)
if (other->AsPlayer() && statType == HEALTH_ATTRIBUTE_2ND)
{
other->AdjustHealth(currentStat);
other->AdjustHealth(boost_value);
other->NotifyAttribute2ndStatUpdated(statType);
}
else

16
Source/UseManager.cpp
View file

@ -102,9 +102,16 @@ void CUseEventData::MoveToUse()
_move_to = true;
MovementParameters params;
params.min_distance = _max_use_distance + 0.25f; //a little leeway on item move to range
params.min_distance = _max_use_distance;
params.action_stamp = ++pWeenie->m_wAnimSequence;
pWeenie->last_move_was_autonomous = false;
if (std::shared_ptr<CWeenieObject> target = GetTarget())
{
if (target->AsPortal())
{
params.use_spheres = 0; // if we're using a portal we want to get to the center of it, not collide with it's sphere
}
}
pWeenie->MoveToObject(_target_id, &params);
}
@ -159,7 +166,10 @@ double CUseEventData::DistanceToTarget()
std::shared_ptr<CWeenieObject> target = GetTarget();
if (!target)
return FLT_MAX;
if (target->AsPortal())
{
return pWeenie->DistanceTo(target, false);
}
return pWeenie->DistanceTo(target, true);
}
@ -195,7 +205,7 @@ bool CUseEventData::InUseRange()
if (target && (pWeenie->IsContainedWithinViewable(target->GetID())))
return true;
if ((_max_use_distance + F_EPSILON) < (DistanceToTarget() - 0.25f)) //a little leeway on item use range
if ((_max_use_distance + F_EPSILON) < DistanceToTarget())
return false;
return true;