1
0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-23 02:42:39 +01:00

Merge pull request #226 from haphzd/mingw-fix-1

Fix mingw build
This commit is contained in:
Daniel Evans 2016-08-31 23:06:48 +01:00 committed by GitHub
commit 789d76c76b

View File

@ -108,9 +108,9 @@ inline bool objectInRadius(const ScriptArguments& args, const Tobj& object, cons
return preconditions && objectInSphere(object, center, radius); return preconditions && objectInSphere(object, center, radius);
} }
template <class Tvec> template <class Tvec>
inline bool objectInRadiusNear(const ScriptArguments& args, GameObject* object, GameObject* near, const Tvec& radius, bool marker, bool preconditions = true) inline bool objectInRadiusNear(const ScriptArguments& args, GameObject* object, GameObject* obj_near, const Tvec& radius, bool marker, bool preconditions = true)
{ {
Tvec center (near->getPosition()); Tvec center (obj_near->getPosition());
if (marker) { if (marker) {
drawAreaIndicator(args, center, radius); drawAreaIndicator(args, center, radius);
} }