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

More trivial code cleanup #6859

Merged
merged 22 commits into from
Mar 21, 2019
Merged

More trivial code cleanup #6859

merged 22 commits into from
Mar 21, 2019

Conversation

dedmen
Copy link
Contributor

@dedmen dedmen commented Mar 11, 2019

Related to #6858
pboprefixes are for both compile and for armake (as armake can also scan for pboprefix, atleast armake++)

@dedmen
Copy link
Contributor Author

dedmen commented Mar 11, 2019

defineResincl.inc required by map/functions/fnc_initMainMap.sqf

@bux bux added kind/cleanup Release Notes: **CHANGED:** ignore-changelog Release Notes: Excluded labels Mar 11, 2019
@dedmen
Copy link
Contributor Author

dedmen commented Mar 11, 2019

defineResinclDesign.inc
optionsmenu/init_loadMainMenu.sqf

@dedmen
Copy link
Contributor Author

dedmen commented Mar 11, 2019

All typos/bugs/errors detected by my script profiler.
We should run that on CI.
I'll add a argument to recursively compile a folder with multithreading. Should only take a couple seconds for whole ace.

Too many small commits:
SQUASH & MERGE

@dedmen dedmen changed the title WIP: More trivial code cleanup More trivial code cleanup Mar 12, 2019
@dedmen
Copy link
Contributor Author

dedmen commented Mar 12, 2019

SQF-VM can now compile all of ace without errors, besides one file in zeus that's really just a redirect to a vanilla file, because the include is not available. And I won't copy that script file into our includes as it doesn't make sense.

Copy link
Member

@jonpas jonpas left a comment

Choose a reason for hiding this comment

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

Looks solid.

@PabstMirror PabstMirror added this to the 3.12.7 milestone Mar 21, 2019
@PabstMirror PabstMirror merged commit d034324 into acemod:master Mar 21, 2019
@PabstMirror PabstMirror modified the milestones: 3.12.7, 3.13.0 Jul 5, 2019
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ignore-changelog Release Notes: Excluded kind/cleanup Release Notes: **CHANGED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants