-
Notifications
You must be signed in to change notification settings - Fork 740
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Maptools cleanup * Changed conditions to check * Minor cleanup + fix
- Loading branch information
Showing
17 changed files
with
134 additions
and
119 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
|
||
class Extended_PreStart_EventHandlers { | ||
class ADDON { | ||
init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); | ||
|
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,22 @@ | ||
#include "..\script_component.hpp" | ||
/* | ||
* Author: esteldunedain | ||
* Returns the equivalent of 100m in screen coordinates | ||
* Returns the equivalent of 100m in screen coordinates. | ||
* | ||
* Arguments: | ||
* None | ||
* | ||
* Return Value: | ||
* None | ||
* Map scale <NUMBER> | ||
* | ||
* Example: | ||
* call ACE_maptools_fnc_calculateMapScale | ||
* call ace_maptools_fnc_calculateMapScale | ||
* | ||
* Public: No | ||
*/ | ||
|
||
private _pos = ((findDisplay 12) displayCtrl 51) ctrlMapScreenToWorld [0.5, 0.5]; | ||
private _screenOffset = ((findDisplay 12) displayCtrl 51) posWorldToScreen [(_pos select 0) + 100, (_pos select 1)]; | ||
private _mapCtrl = (findDisplay 12) displayCtrl 51; | ||
private _pos = _mapCtrl ctrlMapScreenToWorld [0.5, 0.5]; | ||
private _screenOffset = _mapCtrl posWorldToScreen (_pos vectorAdd [100, 0]); | ||
|
||
(_screenOffset select 0) - 0.5 |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
#include "..\script_component.hpp" | ||
/* | ||
* Author: esteldunedain | ||
* canUseMapTools | ||
* Returns if the map tools can be used. | ||
* | ||
* Arguments: | ||
* None | ||
* | ||
* Return Value: | ||
* Boolean <BOOL> | ||
* Map tools can be used <BOOL> | ||
* | ||
* Example: | ||
* call ACE_maptools_fnc_canUseMapTools | ||
* call ace_maptools_fnc_canUseMapTools | ||
* | ||
* Public: No | ||
*/ | ||
|
||
visibleMap && | ||
{alive ACE_player} && | ||
{"ACE_MapTools" in (ACE_player call EFUNC(common,uniqueItems))} && | ||
{!GVAR(mapTool_isDragging)} && | ||
{!GVAR(mapTool_isRotating)} && | ||
{getUnitLoadout ACE_player param [9, []] param [0, ""] != ""} | ||
{ACE_player getSlotItemName TYPE_MAP != ""} && | ||
{[ACE_player, "ACE_MapTools"] call EFUNC(common,hasItem)} |
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
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
Oops, something went wrong.