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

Weather - Use apparent temp in displayAirTemp #8544

Merged
merged 1 commit into from
Oct 22, 2021
Merged

Weather - Use apparent temp in displayAirTemp #8544

merged 1 commit into from
Oct 22, 2021

Conversation

PabstMirror
Copy link
Contributor

@PabstMirror PabstMirror commented Oct 17, 2021

Uses param temp as I think was the original intention
displayTextPicture was called twice, first one used undefined _color var

https://github.com/acemod/ACE3/blob/master/addons/weather/functions/fnc_getApproximateAirTemp.sqf
is the only thing that calls this func

edit: Tag @LorenLuke for review

@PabstMirror PabstMirror added kind/bug-fix Release Notes: **FIXED:** impact/trivial labels Oct 17, 2021
@PabstMirror PabstMirror added this to the 3.14.1 milestone Oct 17, 2021
@LorenLuke
Copy link
Contributor

Looks good to me. Was L44 just an extra instance of L72?

@PabstMirror
Copy link
Contributor Author

yeah there were 2 calls, the first on L44 had a nil _color (so default of [1,1,1,1] would be used)
so they both did the same thing

@jonpas jonpas merged commit 3c5d47e into master Oct 22, 2021
@jonpas jonpas deleted the weatherTemp branch October 22, 2021 13:21
AndreasBrostrom pushed a commit to AndreasBrostrom/ACE3 that referenced this pull request Dec 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
impact/trivial kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants