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

core -> common

Browse Source
This commit is contained in:
bux578 2015-01-13 16:29:35 +01:00
parent 41f843514f
commit 67c3c7e7c3
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/respawn/CfgVehicles.hpp
View File

@ -1,7 +1,7 @@
class CfgVehicles { class CfgVehicles {
class Module_F; class Module_F;
class ACE_ModuleRespawn : Module_F { class ACE_ModuleRespawn : Module_F {
author = "$STR_ACE_Core_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "Respawn System"; displayName = "Respawn System";
function = FUNC(module); function = FUNC(module);
@ -31,7 +31,7 @@ class CfgVehicles {
}; };
class ACE_ModuleFriendlyFire : Module_F { class ACE_ModuleFriendlyFire : Module_F {
author = "$STR_ACE_Core_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "Friendly Fire Messages"; displayName = "Friendly Fire Messages";
function = FUNC(moduleFriendlyFire); function = FUNC(moduleFriendlyFire);
@ -43,7 +43,7 @@ class CfgVehicles {
}; };
class ACE_ModuleRallypoint : Module_F { class ACE_ModuleRallypoint : Module_F {
author = "$STR_ACE_Core_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "Rallypoint System"; displayName = "Rallypoint System";
function = FUNC(moduleRallypoint); function = FUNC(moduleRallypoint);
@ -70,7 +70,7 @@ class CfgVehicles {
// static // static
class ACE_Rallypoint_West : Flag_NATO_F { class ACE_Rallypoint_West : Flag_NATO_F {
author = "$STR_ACE_Core_ACETeam"; author = "$STR_ACE_Common_ACETeam";
displayName = "Rallypoint West Base"; displayName = "Rallypoint West Base";
vehicleClass = QGVAR(Rallypoints); vehicleClass = QGVAR(Rallypoints);
@ -90,7 +90,7 @@ class CfgVehicles {
}; };
class ACE_Rallypoint_East : Flag_CSAT_F { class ACE_Rallypoint_East : Flag_CSAT_F {
author = "$STR_ACE_Core_ACETeam"; author = "$STR_ACE_Common_ACETeam";
displayName = "Rallypoint East Base"; displayName = "Rallypoint East Base";
vehicleClass = QGVAR(Rallypoints); vehicleClass = QGVAR(Rallypoints);
@ -110,7 +110,7 @@ class CfgVehicles {
}; };
class ACE_Rallypoint_Independent : Flag_AAF_F { class ACE_Rallypoint_Independent : Flag_AAF_F {
author = "$STR_ACE_Core_ACETeam"; author = "$STR_ACE_Common_ACETeam";
displayName = "Rallypoint Independent Base"; displayName = "Rallypoint Independent Base";
vehicleClass = QGVAR(Rallypoints); vehicleClass = QGVAR(Rallypoints);
@ -131,7 +131,7 @@ class CfgVehicles {
// moveable // moveable
class ACE_RallypointExit_West : Flag_NATO_F { class ACE_RallypointExit_West : Flag_NATO_F {
author = "$STR_ACE_Core_ACETeam"; author = "$STR_ACE_Common_ACETeam";
displayName = "Rallypoint West"; displayName = "Rallypoint West";
vehicleClass = QGVAR(Rallypoints); vehicleClass = QGVAR(Rallypoints);
@ -151,7 +151,7 @@ class CfgVehicles {
}; };
class ACE_RallypointExit_East : Flag_CSAT_F { class ACE_RallypointExit_East : Flag_CSAT_F {
author = "$STR_ACE_Core_ACETeam"; author = "$STR_ACE_Common_ACETeam";
displayName = "Rallypoint East"; displayName = "Rallypoint East";
vehicleClass = QGVAR(Rallypoints); vehicleClass = QGVAR(Rallypoints);
@ -171,7 +171,7 @@ class CfgVehicles {
}; };
class ACE_RallypointExit_Independent : Flag_AAF_F { class ACE_RallypointExit_Independent : Flag_AAF_F {
author = "$STR_ACE_Core_ACETeam"; author = "$STR_ACE_Common_ACETeam";
displayName = "Rallypoint Independent"; displayName = "Rallypoint Independent";
vehicleClass = QGVAR(Rallypoints); vehicleClass = QGVAR(Rallypoints);

2
addons/respawn/config.cpp
View File

@ -5,7 +5,7 @@ class CfgPatches {
units[] = {}; units[] = {};
weapons[] = { "ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent" }; weapons[] = { "ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent" };
requiredVersion = 0.60; requiredVersion = 0.60;
requiredAddons[] = { "ace_core" }; requiredAddons[] = { "ace_common" };
version = QUOTE(VERSION); version = QUOTE(VERSION);
versionStr = QUOTE(VERSION); versionStr = QUOTE(VERSION);
versionAr[] = { VERSION_AR }; versionAr[] = { VERSION_AR };

2
addons/respawn/functions/fnc_handleKilled.sqf
View File

@ -29,5 +29,5 @@ if (GVAR(SavePreDeathGear)) then {
}; };
if (missionNamespace getVariable [QGVAR(showFriendlyFireMessage), false]) then { if (missionNamespace getVariable [QGVAR(showFriendlyFireMessage), false]) then {
[_this, FUNC(showFriendlyFireMessage), 2] call EFUNC(Core,execRemoteFnc); [_this, FUNC(showFriendlyFireMessage), 2] call EFUNC(common,execRemoteFnc);
}; };

4
addons/respawn/functions/fnc_module.sqf
View File

@ -27,8 +27,8 @@ if !(_activated) exitWith {};
GVAR(Module) = true; GVAR(Module) = true;
[_logic, QGVAR(SavePreDeathGear), "SavePreDeathGear"] call EFUNC(Core,readBooleanParameterFromModule); [_logic, QGVAR(SavePreDeathGear), "SavePreDeathGear"] call EFUNC(common,readBooleanParameterFromModule);
[_logic, QGVAR(RemoveDeadBodiesDisonncected), "RemoveDeadBodiesDisonncected"] call EFUNC(Core,readBooleanParameterFromModule); [_logic, QGVAR(RemoveDeadBodiesDisonncected), "RemoveDeadBodiesDisonncected"] call EFUNC(common,readBooleanParameterFromModule);
if (isServer) then { if (isServer) then {
if (GVAR(RemoveDeadBodiesDisonncected)) then { if (GVAR(RemoveDeadBodiesDisonncected)) then {

4
addons/respawn/functions/fnc_moveRallypoint.sqf
View File

@ -38,7 +38,7 @@ _this spawn {
_position set [2, 0]; _position set [2, 0];
[localize "STR_ACE_Respawn_Deploy"] call EFUNC(Core,displayTextStructured); [localize "STR_ACE_Respawn_Deploy"] call EFUNC(common,displayTextStructured);
sleep 5; sleep 5;
_rallypoint setPosATL _position; _rallypoint setPosATL _position;
@ -50,5 +50,5 @@ _this spawn {
_marker setMarkerTextLocal format ["%1:%2", [date select 3, 2, 0] call CBA_fnc_FORMATNumber, [date select 4, 2, 0] call CBA_fnc_FORMATNumber]; _marker setMarkerTextLocal format ["%1:%2", [date select 3, 2, 0] call CBA_fnc_FORMATNumber, [date select 4, 2, 0] call CBA_fnc_FORMATNumber];
*/ */
[localize "STR_ACE_Respawn_Deploy"] call EFUNC(Core,displayTextStructured); [localize "STR_ACE_Respawn_Deploy"] call EFUNC(common,displayTextStructured);
}; };

4
addons/respawn/functions/fnc_showFriendlyFireMessage.sqf
View File

@ -23,7 +23,7 @@ _unit = _this select 0;
_killer = _this select 1; _killer = _this select 1;
if (_unit != _killer && side group _unit in [side group ACE_player, civilian] && {side group _killer == side group ACE_player}) then { if (_unit != _killer && side group _unit in [side group ACE_player, civilian] && {side group _killer == side group ACE_player}) then {
systemChat format ["%1 was killed by %2", [_unit] call EFUNC(Core,getName), [_killer] call EFUNC(Core,getName)]; systemChat format ["%1 was killed by %2", [_unit] call EFUNC(common,getName), [_killer] call EFUNC(common,getName)];
[_unit, "killedByFriendly", [_unit, _killer]] call EFUNC(Core,callCustomEventHandlers); [_unit, "killedByFriendly", [_unit, _killer]] call EFUNC(common,callCustomEventHandlers);
}; };

2
addons/respawn/functions/fnc_teleportToRallypoint.sqf
View File

@ -44,4 +44,4 @@ _rallypoint = ([
if (isNull _rallypoint) exitWith {}; if (isNull _rallypoint) exitWith {};
_unit setPosASL (getPosASL _rallypoint); _unit setPosASL (getPosASL _rallypoint);
[[localize "STR_ACE_Respawn_TeleportedToRallypoint", localize "STR_ACE_Respawn_TeleportedToBase"] select _toBase] call EFUNC(Core, displayTextStructured); [[localize "STR_ACE_Respawn_TeleportedToRallypoint", localize "STR_ACE_Respawn_TeleportedToBase"] select _toBase] call EFUNC(common,displayTextStructured);