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

Merge pull request #2336 from acemod/322hcmodule

Browse Source 
high command module breaks ace, fix #2134
This commit is contained in:
commy2 2015-09-01 17:05:24 +02:00
commit c0defe9204
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/common/functions/fnc_checkFiles.sqf
View File

@ -20,7 +20,9 @@ _version = getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr");
diag_log text format ["[ACE]: ACE is version %1.", _version]; diag_log text format ["[ACE]: ACE is version %1.", _version];
private "_addons"; private "_addons";
_addons = activatedAddons; //_addons = activatedAddons; // broken with High-Command module, see #2134
_addons = "true" configClasses (configFile >> "CfgPatches");//
_addons = [_addons, {toLower configName _this}] call FUNC(map);//
_addons = [_addons, {_this find "ace_" == 0}] call FUNC(filter); _addons = [_addons, {_this find "ace_" == 0}] call FUNC(filter);
{ {
@ -63,26 +65,17 @@ if (isMultiplayer) then {
// send servers version of ACE to all clients // send servers version of ACE to all clients
GVAR(ServerVersion) = _version; GVAR(ServerVersion) = _version;
GVAR(ServerAddons) = _addons; GVAR(ServerAddons) = _addons;
diag_log text format ["[ACE] DEBUG: ServerVersion - %1", GVAR(ServerVersion)];
diag_log text format ["[ACE] DEBUG: ServerAddons - %1", GVAR(ServerAddons)];
publicVariable QGVAR(ServerVersion); publicVariable QGVAR(ServerVersion);
publicVariable QGVAR(ServerAddons); publicVariable QGVAR(ServerAddons);
} else { } else {
// clients have to wait for the variables // clients have to wait for the variables
[{ [{
if (isNil QGVAR(ServerVersion) || isNil QGVAR(ServerAddons)) exitWith { if (isNil QGVAR(ServerVersion) || isNil QGVAR(ServerAddons)) exitWith {};
diag_log text "[ACE] DEBUG: Waiting for file info from server.";
};
private ["_version","_addons"]; private ["_version","_addons"];
_version = (_this select 0) select 0; _version = (_this select 0) select 0;
_addons = (_this select 0) select 1; _addons = (_this select 0) select 1;
diag_log text format ["[ACE] DEBUG: ServerVersion - %1", GVAR(ServerVersion)];
diag_log text format ["[ACE] DEBUG: ServerAddons - %1", GVAR(ServerAddons)];
diag_log text format ["[ACE] DEBUG: ClientVersion - %1", _version];
diag_log text format ["[ACE] DEBUG: ClientAddons - %1", _addons];
if (_version != GVAR(ServerVersion)) then { if (_version != GVAR(ServerVersion)) then {
private "_errorMsg"; private "_errorMsg";
_errorMsg = format ["Client/Server Version Mismatch. Server: %1, Client: %2.", GVAR(ServerVersion), _version]; _errorMsg = format ["Client/Server Version Mismatch. Server: %1, Client: %2.", GVAR(ServerVersion), _version];

1
addons/main/config.cpp
View File

@ -545,7 +545,6 @@ class CfgPatches {
}; };
author[] = {ECSTRING(common,ACETeam)}; author[] = {ECSTRING(common,ACETeam)};
authorUrl = "http://ace3mod.com/"; authorUrl = "http://ace3mod.com/";
versionDesc = "ACE3";
VERSION_CONFIG; VERSION_CONFIG;
}; };
}; };

1
addons/winddeflection/config.cpp
View File

@ -6,7 +6,6 @@ class CfgPatches {
weapons[] = {}; weapons[] = {};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_weather"}; requiredAddons[] = {"ace_weather"};
versionDesc = "ACE Wind Deflection";
author[] = {ECSTRING(common,ACETeam), "Glowbal", "Ruthberg"}; author[] = {ECSTRING(common,ACETeam), "Glowbal", "Ruthberg"};
authorUrl = "http://ace3mod.com/"; authorUrl = "http://ace3mod.com/";
VERSION_CONFIG; VERSION_CONFIG;