Map - Fix effects breaking mid mission #6566
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BaerMitUmlaut
changed the title
BaerMitUmlaut
approved these changes
Sep 6, 2018
Dystopian
reviewed
Sep 7, 2018
| #include "script_component.hpp" | ||
|
|
||
| params ["_display"]; | ||
| private _control = _display displayCtrl 51; |
mharis001
reviewed
Sep 10, 2018
addons/map/config.cpp
Outdated
| @@ -89,6 +89,11 @@ class RscDisplayMainMap { | |||
| onDraw = QUOTE([ctrlParent (_this select 0)] call DFUNC(onDrawMap)); | |||
| #include "MapTweaks.hpp" | |||
| }; | |||
| class InitScript: RscText { | |||
| onLoad = QUOTE(ctrlParent (_this select 0) call (uiNamespace getVariable 'FUNC(initMainMap)')); | |||
There was a problem hiding this comment.
Use Extended_DisplayLoad_EventHandlers, AFAIK RscDisplayMainMap uses BIS_fnc_initDisplay
There was a problem hiding this comment.
True. It's called RscDiary there however, so I should filter all idd != 12 (IDD_MAIN_MAP) though.
|
|
||
| //get mouse position on map | ||
| _control ctrlAddEventHandler ["MouseMoving", { | ||
| GVAR(mousePos) = (_this select 0) ctrlMapScreenToWorld [_this select 1, _this select 2]; |
There was a problem hiding this comment.
Rather than 3x select, use params?
There was a problem hiding this comment.
True. The orig didn't use it either, but could be updated.
| GVAR(mousePos) = (_this select 0) ctrlMapScreenToWorld [_this select 1, _this select 2]; | ||
| }]; | ||
| _control ctrlAddEventHandler ["MouseHolding", { | ||
| GVAR(mousePos) = (_this select 0) ctrlMapScreenToWorld [_this select 1, _this select 2]; |
…ACE3 into fix-map-effects-breaking
PabstMirror
reviewed
Oct 21, 2018
|
|
||
| _control ctrlAddEventHandler ["Draw", {_this call FUNC(updateMapEffects)}]; | ||
| _control ctrlAddEventHandler ["MouseMoving", { | ||
| params ["_control", "_x", "_y"]; |
There was a problem hiding this comment.
could move inside the if
There was a problem hiding this comment.
Don't think that's worth it, tbh.
PabstMirror
changed the title
PabstMirror
reviewed
Oct 21, 2018
addons/map/CfgEventHandlers.hpp
Outdated
|
|
||
| class Extended_DisplayLoad_EventHandlers { | ||
| class RscDiary { | ||
| GVAR(initMainMap) = QUOTE(ctrlParent (_this select 0) call (uiNamespace getVariable 'FUNC(initMainMap)')); |
There was a problem hiding this comment.
Error in expression <ctrlParent (_this select 0) call (uiName>
Error position: <ctrlParent (_this select 0) call (uiName>
Error ctrlparent: Type Display (dialog), expected Control
PabstMirror
reviewed
Oct 21, 2018
PabstMirror
approved these changes
Oct 21, 2018
BaerMitUmlaut
pushed a commit
that referenced
this pull request
Aug 5, 2019
* fix map effects breaking mid mission * avoid magic numbers * params a function * XEH DisplayLoad instead of dummy display * formatting, parentheses * fix a thing * skip effects in briefing
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When merged this pull request will:
The map effects are only applied once, but if the map display is destroyed mid mission (loaded savegame, respawn etc.) the effects are never added again.