Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup / private vars

Browse Source
This commit is contained in:
PabstMirror 2015-04-16 19:46:42 -05:00
parent 53af014eab
commit 1729c781bd
9 changed files with 451 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/inventory/config.cpp
View File

@ -21,7 +21,7 @@ class ACE_Settings {
isClientSettable = 1; isClientSettable = 1;
displayName = "$STR_ACE_Inventory_SettingName"; displayName = "$STR_ACE_Inventory_SettingName";
description = "$STR_ACE_Inventory_SettingDescription"; description = "$STR_ACE_Inventory_SettingDescription";
values[] = {"Normal (Default Size)", "Medium", "Bigger"}; values[] = {"$str_medium", "$str_large", "$str_very_large"};
}; };
}; };

6
addons/optionsmenu/functions/fnc_exportSettings.sqf
View File

@ -16,6 +16,8 @@
#include "script_component.hpp" #include "script_component.hpp"
private ["_compiledConfig", "_name", "_typeName", "_isClientSetable", "_localizedName", "_localizedDescription", "_possibleValues", "_defaultValue", "_value", "_compiledConfigEntry"];
_compiledConfig = " _compiledConfig = "
"; ";
{ {
@ -52,6 +54,10 @@ class %1 {
typeName = %3; typeName = %3;
force = 1; force = 1;
};", _name, _value, format['"%1"', _typeName]]; };", _name, _value, format['"%1"', _typeName]];
//clipboard seems to be getting cuttoff, so do a backup dump to rpt:
diag_log text _compiledConfigEntry;
_compiledConfig = _compiledConfig + _compiledConfigEntry; _compiledConfig = _compiledConfig + _compiledConfigEntry;
}; };
} forEach EGVAR(common,settings); } forEach EGVAR(common,settings);

2
addons/optionsmenu/functions/fnc_onServerSaveInputField.sqf
View File

@ -16,7 +16,7 @@
#include "script_component.hpp" #include "script_component.hpp"
private ["_settingIndex", "_inputText"]; private ["_settingIndex", "_inputText", "_setting", "_settingName", "_convertedValue"];
_settingIndex = lbCurSel 200; //Index of left list _settingIndex = lbCurSel 200; //Index of left list
_inputText = ctrlText 414; //Index of right drop down _inputText = ctrlText 414; //Index of right drop down

3
addons/optionsmenu/functions/fnc_onServerSettingsMenuOpen.sqf
View File

@ -16,6 +16,8 @@
#include "script_component.hpp" #include "script_component.hpp"
private ["_name", "_typeName", "_isClientSetable", "_localizedName", "_localizedDescription", "_possibleValues", "_defaultValue", "_setting", "_menu", "_settingsMenu"];
if (GVAR(serverConfigGeneration) == 0 || isMultiplayer) exitwith {closeDialog 145246;}; if (GVAR(serverConfigGeneration) == 0 || isMultiplayer) exitwith {closeDialog 145246;};
// Filter only user setable setting // Filter only user setable setting
@ -54,7 +56,6 @@ GVAR(serverSideValues) = [];
//Delay a frame //Delay a frame
[{ [MENU_TAB_SERVER_OPTIONS] call FUNC(onServerListBoxShowSelectionChanged) }, []] call EFUNC(common,execNextFrame); [{ [MENU_TAB_SERVER_OPTIONS] call FUNC(onServerListBoxShowSelectionChanged) }, []] call EFUNC(common,execNextFrame);
private "_menu";
disableSerialization; disableSerialization;
_menu = uiNamespace getvariable "ACE_serverSettingsMenu"; _menu = uiNamespace getvariable "ACE_serverSettingsMenu";
(_menu displayCtrl 1003) ctrlEnable false; (_menu displayCtrl 1003) ctrlEnable false;

4
addons/optionsmenu/functions/fnc_onSettingsMenuOpen.sqf
View File

@ -16,9 +16,12 @@
#include "script_component.hpp" #include "script_component.hpp"
private ["_setting", "_menu"];
// Filter only user setable setting // Filter only user setable setting
GVAR(clientSideOptions) = []; GVAR(clientSideOptions) = [];
GVAR(clientSideColors) = []; GVAR(clientSideColors) = [];
{ {
// If the setting is user setable and not forced // If the setting is user setable and not forced
if ((_x select 2) && !(_x select 6)) then { if ((_x select 2) && !(_x select 6)) then {
@ -40,7 +43,6 @@ GVAR(clientSideColors) = [];
//Delay a frame //Delay a frame
[{ [MENU_TAB_OPTIONS] call FUNC(onListBoxShowSelectionChanged) }, []] call EFUNC(common,execNextFrame); [{ [MENU_TAB_OPTIONS] call FUNC(onListBoxShowSelectionChanged) }, []] call EFUNC(common,execNextFrame);
private "_menu";
disableSerialization; disableSerialization;
_menu = uiNamespace getvariable "ACE_settingsMenu"; _menu = uiNamespace getvariable "ACE_settingsMenu";
(_menu displayCtrl 1002) ctrlEnable false; (_menu displayCtrl 1002) ctrlEnable false;

2
addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateKeyView.sqf
View File

@ -16,7 +16,7 @@
#include "script_component.hpp" #include "script_component.hpp"
private ["_settingsMenu", "_ctrlList", "_collection", "_settingIndex", "_setting", "_entryName", "_localizedName", "_localizedDescription", "_possibleValues", "_settingsValue", "_currentColor"]; private ["_settingsMenu", "_ctrlList", "_collection", "_settingIndex", "_setting", "_entryName", "_localizedName", "_localizedDescription", "_possibleValues", "_settingsValue", "_currentColor", "_expectedType"];
disableSerialization; disableSerialization;
_settingsMenu = uiNamespace getVariable 'ACE_serverSettingsMenu'; _settingsMenu = uiNamespace getVariable 'ACE_serverSettingsMenu';

2
addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
View File

@ -16,7 +16,7 @@
#include "script_component.hpp" #include "script_component.hpp"
private ["_settingsMenu", "_ctrlList", "_settingsText", "_color", "_settingsColor", "_updateKeyView"]; private ["_settingsMenu", "_ctrlList", "_settingsText", "_color", "_settingsColor", "_updateKeyView", "_settingsValue"];
DEFAULT_PARAM(0,_updateKeyView,true); DEFAULT_PARAM(0,_updateKeyView,true);
disableSerialization; disableSerialization;

2
addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
View File

@ -16,7 +16,7 @@
#include "script_component.hpp" #include "script_component.hpp"
private ["_settingsMenu", "_ctrlList", "_settingsText", "_color", "_settingsColor", "_updateKeyView"]; private ["_settingsMenu", "_ctrlList", "_settingsText", "_color", "_settingsColor", "_updateKeyView", "_settingsValue"];
DEFAULT_PARAM(0,_updateKeyView,true); DEFAULT_PARAM(0,_updateKeyView,true);
disableSerialization; disableSerialization;

2
addons/optionsmenu/gui/settingsMenu.hpp
View File

@ -324,7 +324,7 @@ class ACE_serverSettingsMenu: ACE_settingsMenu {
y = Y_PART(5.5); y = Y_PART(5.5);
w = W_PART(23); w = W_PART(23);
h = H_PART(15); h = H_PART(15);
SizeEx = H_PART(0.8); SizeEx = H_ORIGINAL(0.8);
colorBackground[] = {0, 0, 0, 0.9}; colorBackground[] = {0, 0, 0, 0.9};
colorSelectBackground[] = {0, 0, 0, 0.9}; colorSelectBackground[] = {0, 0, 0, 0.9};
columns[] = {0.0, 0.6}; columns[] = {0.0, 0.6};