-
Notifications
You must be signed in to change notification settings - Fork 149
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
Add support for building with HEMTT v1.0+ #1565
Conversation
@BrettMayson on current branch with Alpha 12
|
@BrettMayson - Alpha 13
but I have |
@@ -1,14 +1,5 @@ | |||
#include "script_component.hpp" | |||
|
|||
#define private 0 // hidden |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was the only one used in one place, I removed those defines, should be fine?
@@ -17,14 +17,14 @@ class RscTitles { | |||
}; | |||
|
|||
class TitleBackground: RscText { | |||
idc = IDC_PROGRESSBAR_BACKGROUND; | |||
// idc = IDC_PROGRESSBAR_BACKGROUND; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was undefined. Important?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think just used for background color
Multiline config code mangling is still happening as in the original comment. 1581723c1581694
< onKeyDown="if ((_this select 1) in [0x1C, 0x9C]) then { ['cba_events_chatMessageSent', [ctrlText ((_this select 0) displayctrl 101), _this select 0]] call CBA_fnc_localEvent; }; false";
---
> onKeyDown="" \n "if ((_this select 1) in [0x1C , 0x9C ]) then {" \n "['cba_events_chatMessageSent', [ctrlText ((_this select 0) displayctrl 101), _this select 0]] call CBA_fnc_localEvent;" \n "};" \n "false";
1840165c1840136
< onLoad=" params ['_ctrlYear']; for '_y' from 1900 to 2050 do { _ctrlYear lbSetValue [_ctrlYear lbAdd str _y, _y]; }; _ctrlYear lbSetCurSel 53; ";
---
> onLoad="\" \n " params ['_ctrlYear'];\" \n " for '_y' from 1900 to 2050 do {\" \n " _ctrlYear lbSetValue [_ctrlYear lbAdd str _y, _y];\" \n " };\" \n " _ctrlYear lbSetCurSel 53;\" \n " ";
1844014c1843985
< expression=" if (isNil 'CBA_fnc_setCallsign') then { _this setGroupID [_value]; } else { [_this, _value] call CBA_fnc_setCallsign; }; ";
---
> expression="\" \n " if (isNil 'CBA_fnc_setCallsign') then {\" \n " _this setGroupID [_value];\" \n " } else {\" \n " [_this, _value] call CBA_fnc_setCallsign;\" \n " };\" \n " ";
2605908c2605879
< onLoad="(_this select 0) call cba_settings_fnc_openSettingsMenu; (_this select 0) closeDisplay 0;";
---
> onLoad="" \n "(_this select 0) call cba_settings_fnc_openSettingsMenu;" \n "(_this select 0) closeDisplay 0;"; We could also just function those? Everything else seems to be fixed. config_mikero_to_hemtt_diff.txt The only other thing "missing" is |
Only those multi-line config differences remain. Somebody should check them in-game instead of the |
First config diff in in-game Config Viewer / onKeyDown = "
if ((_this select 1) in [0x1C , 0x9C ]) then {
['cba_events_chatMessageSent', [ctrlText ((_this select 0) displayctrl 101), _this select 0]] call CBA_fnc_localEvent;
};
false";
Second config diff in in-game Config Viewer / onLoad = "\
params ['_ctrlYear'];\
for '_y' from 1900 to 2050 do {\
_ctrlYear lbSetValue [_ctrlYear lbAdd str _y, _y];\
};\
_ctrlYear lbSetCurSel 53;\
"; Here, After switching it to use
Exact same thing as on second diff happens on third diff. Fourth config diff has the same story as the first. onLoad = "
(_this select 0) call cba_settings_fnc_openSettingsMenu;
(_this select 0) closeDisplay 0;"
I think this can be merged now, as there don't appear to be any issues with how HEMTT preprocesses those config entries? |
Made an issue for incorrect multiline string parsing BrettMayson/HEMTT#531 |
@PabstMirror Is there a point in keeping old |
I like keeping old hemtt around for just packing file patching builds fast |
Need to look at hemtt mangling multiline code @BrettMayson
configDiff.txt