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 branch 'cargo' of github.com:acemod/ACE3 into cargo

Browse Source 
Conflicts:
	addons/cargo/functions/fnc_initVehicle.sqf
This commit is contained in:
Glowbal 2015-08-15 09:51:15 +02:00
commit 03413ef6b6
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/cargo/CfgVehicles.hpp
View File

@ -152,7 +152,8 @@ class CfgVehicles {
GVAR(size) = 50;
XEH_ENABLED;
};
class Land_Cargo20_military_ruins_F: Cargo_base_F {
class Ruins_F;
class Land_Cargo20_military_ruins_F: Ruins_F {
GVAR(space) = 49;
GVAR(size) = 50;
XEH_ENABLED;
@ -224,7 +225,7 @@ class CfgVehicles {
GVAR(size) = 100;
XEH_ENABLED;
};
class Land_Cargo40_military_ruins_F: Cargo_base_F {
class Land_Cargo40_military_ruins_F: Ruins_F {
GVAR(space) = 99;
GVAR(size) = 100;
XEH_ENABLED;

4
addons/cargo/functions/fnc_canLoadItemIn.sqf
View File

@ -3,8 +3,8 @@
* Check if item can be loaded into other Object
*
* Arguments:
* 0: Any object <OBJECT>
* 1: Object <OBJECT>
* 0: Item Object <OBJECT>
* 1: Holder Object (vehicle) <OBJECT>
*
* Return value:
* Can load in <BOOL>

2
addons/cargo/functions/fnc_canUnloadItem.sqf
View File

@ -14,7 +14,7 @@
#include "script_component.hpp"
private ["_loaded", "_position", "_validVehiclestate", "_emptyPos"];
private ["_loaded", "_validVehiclestate", "_emptyPos"];
params ["_item", "_vehicle"];
_loaded = _vehicle getvariable [QGVAR(loaded), []];
if !(_item in _loaded) exitwith {false};

2
addons/cargo/functions/fnc_handleDestroyed.sqf
View File

@ -15,6 +15,8 @@
params ["_vehicle"];
private["_loaded"];
_loaded = _vehicle getvariable [QGVAR(loaded), []];
if (count _loaded == 0) exitwith {};

2
addons/cargo/functions/fnc_initVehicle.sqf
View File

@ -49,8 +49,8 @@ SETMVAR(GVAR(initializedClasses),_initializedClasses);
if (getNumber (configFile >> "CfgVehicles" >> _type >> QGVAR(hasCargo)) != 1) exitwith {};
private ["_text", "_condition", "_statement", "_icon", "_action"];
_text = localize "STR_ACE_Cargo_openMenu";
_condition = {GVAR(enable)};
_text = localize LSTRING(openMenu);
_statement = {GVAR(interactionVehicle) = _target; createDialog QGVAR(menu);};
_icon = "";

2
addons/cargo/functions/fnc_onMenuOpen.sqf
View File

@ -41,5 +41,5 @@ uiNamespace setvariable [QGVAR(menuDisplay), _display];
true
} count _loaded;
_label ctrlSetText format[localize "STR_ACE_Cargo_labelSpace", [GVAR(interactionVehicle)] call DFUNC(getCargoSpaceLeft)];
_label ctrlSetText format[localize LSTRING(labelSpace), [GVAR(interactionVehicle)] call DFUNC(getCargoSpaceLeft)];
}, 0, []] call CBA_fnc_addPerFrameHandler;