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

disable pain effect in zeus camera #1779

Merged
merged 2 commits into from
Jul 3, 2015
Merged

disable pain effect in zeus camera #1779

merged 2 commits into from
Jul 3, 2015

Conversation

SzwedzikPL
Copy link
Contributor

No description provided.

@nicolasbadano
Copy link
Contributor

👍 We had something almost exactly like this on AGM

@nicolasbadano nicolasbadano added the kind/enhancement Release Notes: **IMPROVED:** label Jul 2, 2015
@nicolasbadano nicolasbadano added this to the 3.2.0 milestone Jul 2, 2015
[{
GVAR(effectPainCA) ppEffectAdjust [(_this select 0), (_this select 0), false];
// Pain effect, no pain effect in zeus camera
if (isNull (findDisplay 312)) then {
Copy link
Member

Choose a reason for hiding this comment

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

Do you think it's worth changing this to isNull curatorCamera to be consistent throughout ACE?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

First i wanted to use curatorCamera but i saw if (!(isNull (findDisplay 312)) or !(alive ACE_player)) exitWith { in ace_medical postinit so i used this.

@nicolasbadano
Copy link
Contributor

Great

thojkooi added a commit that referenced this pull request Jul 3, 2015
@thojkooi thojkooi merged commit 57c4bc4 into acemod:master Jul 3, 2015
@SzwedzikPL SzwedzikPL deleted the zeus_no_paineffect branch July 25, 2015 20:05
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