Refactor private ARRAY to private keyword #5598

dedmen · 2017-10-06T21:28:10Z

#5566 (review)
#5566 (comment)
This PR does what the titel says.
Also it fixed a typo _atached to _attached
and fixes a minor bug from #5566

PabstMirror · 2017-10-07T01:13:27Z

addons/goggles/functions/fnc_handleFired.sqf


-_cloudType = "";
+private private _cloudType = "";


double private

If I got a double private there it means I forgot a private below.. Sometimes I would click a pixel to far left and hit the line number instead of the text... Atom is somewhat crap I guess.

Jup. _surface on line 51 was missing

PabstMirror · 2017-10-07T01:14:21Z

addons/vector/functions/fnc_convertToTexturesFOS.sqf

-
-_number = _this select 0;
-_coordinate = _this select 1;
+params ["_number", "_coordinate"]


missing end semi-colon ;

PabstMirror · 2017-10-07T01:14:43Z

addons/dagr/functions/fnc_handleRangeFinderData.sqf

@@ -19,7 +19,7 @@

 #define EMP_RF_ACC 5 // Rangefinder Accuracy

-PARAMS_3(_slopeDistance,_azimuth,_inclination);
+params ["_slopeDistance", "_azimuth", "_inclination"]


missing end semi-colon ;

commy2 · 2017-10-07T04:00:22Z

Did you make sure this doesn't break anything? Sometimes you need a variable in main scope and setting it to private in a then-block or something would make it nil there later.

dedmen · 2017-10-07T10:33:26Z

@commy2 I payed attention to that. That's why I initialized some variables in main scope with objNull or controlNull or even scriptNull in one case.
I already noticed some missing semicolons.. But then it was already too late.. My regex skills weren't enough to find them for me. SQF validator from build script found one so I thought the rest was also correct...

I'll do a full build and deploy it to my group. We'll test it on todays mission.

dedmen · 2017-10-07T10:42:09Z

Turns out project file regex search in Atom is horribly broken.. Notepad++ found the missing semicolons just fine

bux · 2017-10-07T10:59:46Z

Atom

https://code.visualstudio.com/

dedmen · 2017-10-07T11:19:38Z

No compilation errors. Running around a bit and taking some AB shots no errors anywhere.
Will have to wait till after the mission this evening.

dedmen · 2017-10-07T11:31:10Z

Wow. isNull NUMBER -> script error... GG Arma.

commy2 · 2017-10-07T14:24:38Z

addons/advanced_ballistics/functions/fnc_handleFired.sqf

@@ -103,7 +103,7 @@ if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then {

 private _stabilityFactor = 1.5;
 if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) then {
-    if (isNull _temperature) then {
+    if (_temperature isEqualTo scriptNull) then {//isNull doesn't work with Numbers


Elaborate? SCRIPT type is different from NUMBER. Although isNull does indeed not work with NUMBER, it should work with SCRIPT just fine.
https://community.bistudio.com/wiki/isNull
Therefore, _temperature isEqualTo scriptNull should be isNull _temperature, if _temperature actually is a SCRIPT that is. If it's a NUMBER, then it will never be a null script though.

I expect to have isNull check if variable contains a null type. And return false if it's not null. But instead of returning false on a number it just errors.
_temperature is by default set to scriptNull. So here I just check if it's still default(undefined)

commy2 · 2017-10-07T16:55:34Z

addons/advanced_ballistics/functions/fnc_handleFired.sqf

 if (GVAR(barrelLengthInfluenceEnabled)) then {
    _barrelVelocityShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, _muzzleVelocity] call FUNC(calculateBarrelLengthVelocityShift);
 };

-_ammoTemperatureVelocityShift = 0;
+private _ammoTemperatureVelocityShift = 0;
+private _temperature = scriptNull; //Need the variable in this scope. So we need to init it here.


I get it now. Can you just use:

private "_temperature";

or

private _temperature = nil;

Instead? This is really ugly.

I was told _temperature = nil; works. But I wasn't sure. And didn't have time to test

If it works then sure.
private "_temperature" would be as bad as private ARRAY

Just tested. It works. Atleast in debug console.. Might break in scheduled but handleFired is unscheduled anyway

commy2 · 2017-10-07T16:56:20Z

addons/advanced_ballistics/functions/fnc_handleFired.sqf

 if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) then {
-    if (isNil "_temperature") then {
+    if (_temperature isEqualTo scriptNull) then {//isNull doesn't work with Numbers


And revert this change of course.

dedmen · 2017-10-07T21:11:05Z

Just played 3 hours no errors.
Though without the new change for _temperature.

commy2 · 2017-10-07T21:42:12Z

I can vouch for those two lines^^

PabstMirror · 2017-10-09T16:28:05Z

addons/explosives/ExplosivesUI.hpp

@@ -80,7 +80,7 @@ class RscACE_SelectTimeUI {
            y = 0.06;
            w = 0.49;
            h = 0.025;
-            onSliderPosChanged = "private ['_mins', '_secs'];_mins = floor((_this select 1)/60);_secs=floor((_this select 1) - (_mins*60));ctrlSetText [8870, format[localize 'STR_ACE_Explosives_TimerMenu',_mins, _secs]];";
+            onSliderPosChanged = "_mins = floor((_this select 1)/60);_secs=floor((_this select 1) - (_mins*60));ctrlSetText [8870, format[localize 'STR_ACE_Explosives_TimerMenu',_mins, _secs]];";


I guess these aren't private, but I don't think it matters for BIS event handlers as there shouldn't be any upper scope variables (I hope)

They should still be privatized.

Exactly why I removed that. There is no upper scope. So private does nothing in this case. Besides making the string longer. Thus increasing compileTime. And as this is a string eventhandler that get's compiled before every usage...

PabstMirror · 2017-10-09T16:33:58Z

addons/hellfire/CfgMagazines.hpp

@@ -24,7 +24,7 @@ class CfgMagazines {
        count = 1;
        mass = 85;
        pylonWeapon = QGVAR(launcher);
-        hardpoints[] = {"B_MISSILE_PYLON", "SCALPEL_1RND_EJECTOR", "B_ASRRAM_EJECTOR", "UNI_SCALPEL", "CUP_NATO_HELO_SMALL", "CUP_NATO_HELO_LARGE", "RHS_HP_MELB"};


Whats going on here?

Fixed. And I just skimmed over all changes again and it looks like only my changes are left.

make sure to push the changes

XD I did push... But I didn't commit before
Pushed now.. I will go to bed now..

PabstMirror

looked over all changes,
fix the hellfire magazines (probably was just a merge conflcit)
and this should be ok to merge

dedmen · 2017-10-09T17:40:25Z

addons/optionsmenu/functions/fnc_onServerSaveInputField.sqf

@@ -16,11 +16,9 @@

 #include "script_component.hpp"

-private ["_settingIndex", "_inputText", "_setting", "_settingName", "_convertedValue"];
+private _inputText = ctrlText 414;  //Index of right drop down


Sometimes the diffing algo is confused....

Everything

681a36e

dedmen force-pushed the privatize branch from bc6de1a to 681a36e Compare October 6, 2017 21:36

Fixed missing ;

3498c9f

jonpas added the kind/cleanup Release Notes: **CHANGED:** label Oct 6, 2017

jonpas added this to the 3.11.0 milestone Oct 6, 2017

PabstMirror reviewed Oct 7, 2017

View reviewed changes

Fix missing ; and double private

d260089

Fixed cannot isNull on number

6b1a881

commy2 reviewed Oct 7, 2017

View reviewed changes

Turn _temparture back to isNil

5bfd711

PabstMirror reviewed Oct 9, 2017

View reviewed changes

PabstMirror requested changes Oct 9, 2017

View reviewed changes

dedmen commented Oct 9, 2017

View reviewed changes

Fix error from merge

cb71815

PabstMirror approved these changes Oct 9, 2017

View reviewed changes

PabstMirror merged commit 81e02a7 into acemod:master Oct 10, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor private ARRAY to private keyword #5598

Refactor private ARRAY to private keyword #5598

dedmen commented Oct 6, 2017 •

edited

Loading

PabstMirror Oct 7, 2017

dedmen Oct 7, 2017

dedmen Oct 7, 2017

PabstMirror Oct 7, 2017

PabstMirror Oct 7, 2017

commy2 commented Oct 7, 2017

dedmen commented Oct 7, 2017 •

edited

Loading

dedmen commented Oct 7, 2017

bux commented Oct 7, 2017

dedmen commented Oct 7, 2017

dedmen commented Oct 7, 2017

commy2 Oct 7, 2017 •

edited

Loading

dedmen Oct 7, 2017

commy2 Oct 7, 2017 •

edited

Loading

dedmen Oct 7, 2017

dedmen Oct 7, 2017

dedmen Oct 7, 2017

commy2 Oct 7, 2017

dedmen commented Oct 7, 2017 •

edited

Loading

commy2 commented Oct 7, 2017

PabstMirror Oct 9, 2017

jonpas Oct 9, 2017

dedmen Oct 9, 2017

PabstMirror Oct 9, 2017

dedmen Oct 9, 2017

dedmen Oct 9, 2017

PabstMirror Oct 9, 2017

dedmen Oct 9, 2017

PabstMirror left a comment

dedmen Oct 9, 2017

Refactor private ARRAY to private keyword #5598

Refactor private ARRAY to private keyword #5598

Conversation

dedmen commented Oct 6, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

commy2 commented Oct 7, 2017

dedmen commented Oct 7, 2017 • edited Loading

dedmen commented Oct 7, 2017

bux commented Oct 7, 2017

dedmen commented Oct 7, 2017

dedmen commented Oct 7, 2017

commy2 Oct 7, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

commy2 Oct 7, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dedmen commented Oct 7, 2017 • edited Loading

commy2 commented Oct 7, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PabstMirror left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dedmen commented Oct 6, 2017 •

edited

Loading

dedmen commented Oct 7, 2017 •

edited

Loading

commy2 Oct 7, 2017 •

edited

Loading

commy2 Oct 7, 2017 •

edited

Loading

dedmen commented Oct 7, 2017 •

edited

Loading