From 7e17ff7ff432143406b32c62ef8deb55c5e80569 Mon Sep 17 00:00:00 2001 From: DudeMcDude Date: Tue, 19 Apr 2016 00:30:46 +0300 Subject: [PATCH] Trip AoO off by default --- TemplePlus/condition.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TemplePlus/condition.cpp b/TemplePlus/condition.cpp index 8335497e2..3d3cdc1e8 100644 --- a/TemplePlus/condition.cpp +++ b/TemplePlus/condition.cpp @@ -650,7 +650,7 @@ int GenericCallbacks::TripAooRadial(DispatcherCallbackArgs args){ // limit this option to characters with Improved Trip, to prevent AoOs during AoOs if (!feats.HasFeatCountByClass(args.objHndCaller, FEAT_IMPROVED_TRIP)) return 0; - RadialMenuEntryToggle radEntry(5117, args.GetCondArgPtr(0), "TAG_TRIP_ATTACK_OF_OPPORTUNITY" ); + RadialMenuEntryToggle radEntry(5117, args.GetCondArgPtr(1), "TAG_TRIP_ATTACK_OF_OPPORTUNITY" ); radEntry.AddChildToStandard(args.objHndCaller, RadialMenuStandardNode::Options); return 0; } @@ -658,7 +658,7 @@ int GenericCallbacks::TripAooRadial(DispatcherCallbackArgs args){ int GenericCallbacks::TripAooQuery(DispatcherCallbackArgs args) { auto dispIo = dispatch.DispIoCheckIoType7(args.dispIO); - if (args.GetCondArg(0)){ + if (args.GetCondArg(1)){ dispIo->return_val = 1; }