Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sitting Framework #2620

Merged
merged 7 commits into from
Oct 18, 2015
Merged

Sitting Framework #2620

merged 7 commits into from
Oct 18, 2015

Conversation

jonpas
Copy link
Member

@jonpas jonpas commented Sep 26, 2015

  • Cleaned up rotation left-overs (now handled by config)
  • Implemented better sitting framework in terms of interactions (only config values and XEH_ENABLED; must now be added) while sacrificing a bit of init performance as InitPost happens on class All changed to class ThingX
  • Integrated 1 GVAR and 1 setVariable into a single setVariable
  • Added carrying to chairs

Framework documentation coming if this gets merged.


if (_actionID != -1) then {
_player removeAction _actionID;
};
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@commy2 Why was/is L30-L34 needed? I don't see how it can happen that the action stays, FUNC(Stand) is called from all cases of standing up.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These lines are needed to prevent duplicate actions from being added. Could possibly happen in certain selectPlayer / multiple Zeus scenarious. I'd add that back in.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You never remove QGVAR(StandUpActionID) variable though, there is always something in it, it just changes as you sit next time.

@jonpas jonpas mentioned this pull request Sep 27, 2015
@PabstMirror PabstMirror added the kind/enhancement Release Notes: **IMPROVED:** label Sep 27, 2015
@PabstMirror PabstMirror added this to the 3.4.0 milestone Sep 27, 2015
@jonpas
Copy link
Member Author

jonpas commented Oct 16, 2015

Status?

thojkooi added a commit that referenced this pull request Oct 18, 2015
@thojkooi thojkooi merged commit f57eb08 into acemod:master Oct 18, 2015
@jonpas jonpas deleted the sittingFramework branch October 18, 2015 10:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants