Commit Graph

32 Commits

Author SHA1 Message Date
GhostIsSpooky
68ed19911a
General - Change object config lookups to configOf (#8795)
* configOf lookups

* forEach, missed configOf

* revert handcuff distance change

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* optimize condition

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* capitalization

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* use object in getVehicleIcon

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* add return comment

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* remove extra brackets

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* add missing brackets

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* add return comment pt2

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* revert to cursorTarget

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-03-08 21:41:21 -06:00
GhostIsSpooky
998f86f034
General - Move to CBA Settings (#8461)
* first pass

* second pass

* third pass

* final pass

* missing commas

* newlines

* switch to cba eventhandler

* newlines, formatting

* laser - movedToSQF

* add logging to ace_common_fnc_cbaSettings_loadFromConfig

* Update initSettings.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-11 15:48:30 -05:00
Dedmen Miller
d034324e88 More trivial code cleanup (#6859)
* Added a3 include pboprefix

* Add defineDIKCodes header

* defineDIKCodes include case correct

* Use ui_f dikcodes

* Fix fnc_checkfiles macro and dll condition

* Incorrect macro usage in fnc_getVehiclePos

* Incorrect macro usage in fnc_getVehiclePosComplex

* Add defineResincl ui_f include

* Remove include guard from defineResincl

* Incorrect macro usage in fnc_handleMouseButton

* Incorrect macro usage in fnc_setMarkerJIP

* Semicolon after include

* Add defineResinclDesign ui_f include

* Incorrect macro usage fnc_rearmSuccessLocal

* Incorrect macro usage fnc_rearmSuccessLocal

* Stray backslash in fnc_camshake

* Incorrect macro usage in fnc_startNozzleInHandsPFH

* Incorrect amcro usage in fnc_tag

* Incorrect macro usage in fnc_moduleGlobalSetSkill

* Reenable linux checkFiles

* Non-captialized requiredAddons

* Non-captialized requiredAddons
2019-03-21 08:52:32 -05:00
C0kkie
ca71375259 Captives - Use the doApplyHandcuffs function for keybind (#6843)
* Use the doApplyHandcuffs function that cabletie

* Update XEH_postInit.sqf
2019-03-05 09:40:10 -06:00
Dystopian
03ade05611 Add parentheses to GETVAR macros 2017-12-30 16:38:45 +03:00
PabstMirror
b2ceeb9936
Captives - Fix handcuff keybind distance check (#5823) 2017-11-26 22:43:45 -06:00
Christian Klemm
3d340bb0ef Added captive hotkey (#5529)
* added captive hotkey

* Removed toggling + distance check

* adjusts

player -> ace_player
interact check
stringtable adjust

* Update XEH_postInit.sqf

* Update XEH_postInit.sqf

* Removed dots

* Removed comment

* Use targetEvent
2017-09-25 23:22:10 -05:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323)
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
2016-09-04 16:44:22 +02:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
Glowbal
694503c01b Fix medical events 2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156 Fix medical related events 2016-06-03 20:22:34 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
jonpas
4f515ec4e1 QGVAR captives, interaction 2016-05-25 20:23:53 +02:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
PabstMirror
4826a89ef5 Fix captivity system on dedicated
Fix #3532
2016-03-04 11:45:38 -06:00
commy2
f43e88ff25 replace zeusDisplayChanged with DisplayLoad event 2016-02-21 22:16:12 +01:00
esteldunedain
6523b715fe Delay captivity until 0.05s after settings are initialized 2016-02-20 11:57:47 -03:00
PabstMirror
16b1244b0a Global Event for "CaptiveStatusChange" 2015-09-29 10:17:17 -05:00
PabstMirror
c62ea5e406 Fix some nil functions 2015-09-18 13:47:19 -05:00
PabstMirror
c35fc35eb3 Captive FFV stuff 2015-08-14 21:29:01 -05:00
jaynus
8e7763af08 Removed: systemChat debug in captive 2015-05-11 13:50:24 -07:00
PabstMirror
638433614c Some missing private defines. 2015-04-16 12:36:16 -05:00
commy2
2744f46bd2 spelling 2015-03-15 16:12:37 +01:00
commy2
0064f5739c manual merge 2015-03-15 09:30:26 +01:00
commy2
4dab0b73d5 add conditions on post init 2015-03-15 09:26:16 +01:00
PabstMirror
3f32627d61 Implement Unconc Event Handler 2015-03-10 11:08:15 -05:00
PabstMirror
dc82e50d72 fix 2015-02-16 18:30:35 -06:00
PabstMirror
eee4b256cd More Changes and add EH 2015-02-16 18:03:09 -06:00
PabstMirror
dec34b4b30 Surrender Fixes
Remove XEH GetIn and use vehicleChanged Event
Handle Zeus (showHUD)
Attempt to handle failed animation change
2015-02-15 14:55:17 -06:00
PabstMirror
7a3029b9fd replace spawns 2015-02-06 03:38:27 -06:00