Privates - Interaction

This commit is contained in:
PabstMirror 2015-05-01 18:12:24 -05:00
parent e6de0d5906
commit 675b76f569
13 changed files with 18 additions and 7 deletions

View File

@ -15,6 +15,7 @@ if (!hasInterface) exitWith {};
GVAR(isOpeningDoor) = false;
// restore global fire teams for JIP
private ["_team"];
{
_team = _x getVariable [QGVAR(assignedFireTeam), ""];
if (_team != "") then {_x assignTeam _team};

View File

@ -16,6 +16,8 @@
*/
#include "script_component.hpp"
private["_action", "_color", "_count", "_ctrl", "_current", "_dlgInteractionDialog", "_i", "_index", "_infoText", "_player", "_target", "_top", "_vehicle"];
#define CLAMP(x,low,high) (if(x > high)then{high}else{if(x < low)then{low}else{x}})
if (isNil QGVAR(MainButton)) exitWith{};
if (isNil QGVAR(Buttons)) exitWith{};

View File

@ -16,7 +16,7 @@
EXPLODE_3_PVT(_this,_vehicle,_player,_parameters);
private ["_unit","_actions"];
private ["_unit", "_actions", "_actionTrees", "_varName"];
_unit = _parameters select 0;
_varName = format [QEGVAR(interact_menu,Act_%1), typeOf _unit];

View File

@ -20,8 +20,9 @@ private ["_actions"];
_actions = [];
{
private ["_unit"];
_unit = _x;
if (_x != _player) then {
if (_unit != _player) then {
_actions pushBack
[
[

View File

@ -2,7 +2,7 @@
#include "script_component.hpp"
private ["_object", "_actions", "_dlgInteractionDialog", "_ctrlInteractionDialog", "_index", "_ctrlInteractionDialogIcon"];
private ["_object", "_actions", "_dlgInteractionDialog", "_ctrlInteractionDialog", "_index", "_ctrlInteractionDialogIcon", "_a", "_action", "_count"];
_object = GVAR(Target);
_actions = GVAR(Buttons);

View File

@ -1,7 +1,7 @@
// by commy2
#include "script_component.hpp"
private ["_house", "_door", "_animations", "_lockedVariable"];
private ["_house", "_door", "_animations", "_lockedVariable", "_index"];
_house = _this select 0;
_door = _this select 1;

View File

@ -11,6 +11,8 @@
*/
#include "script_component.hpp"
private["_activated", "_logic"];
_logic = _this select 0;
_activated = _this select 2;

View File

@ -26,6 +26,7 @@ GVAR(isOpeningDoor) = true;
playSound "ACE_Sound_Click";
[_house, _animations] spawn {
private ["_house", "_animations", "_phase", "_position", "_time", "_usedMouseWheel"];
_house = _this select 0;
_animations = _this select 1;

View File

@ -23,6 +23,8 @@
*/
#include "script_component.hpp"
private["_action", "_count", "_customActions", "_i"];
if (!(profileNamespace getVariable [QGVAR(FlowMenu), false])) then {
GVAR(SelectAccept) = _this select 1;
GVAR(SelectCancel) = _this select 2;

View File

@ -12,8 +12,7 @@
*/
#include "script_component.hpp"
_boat = _this select 0;
_velocity = _this select 1;
PARAMS_2(_boat,_velocity);
if !(local _boat) exitWith {
[_this, QUOTE(FUNC(push)), _boat] call EFUNC(common,execRemoteFnc);

View File

@ -2,6 +2,7 @@
#include "script_component.hpp"
0 spawn {
private["_index", "_name"];
waitUntil {player getVariable ["ACE_Name", ""] != ""};
_name = player getVariable ["ACE_Name", ""];

View File

@ -20,7 +20,7 @@
#define GUI_GRID_W (0.025)
#define GUI_GRID_H (0.04)
private ["_leftClick", "_rightClick", "_scroll"];
private ["_leftClick", "_rightClick", "_scroll", "_display"];
_leftClick = _this select 0;
_rightClick = _this select 1;
_scroll = "";

View File

@ -1,6 +1,8 @@
// by commy2
#include "script_component.hpp"
private["_ctrl"];
disableSerialization;
_ctrl = ctrlParent (_this select 0) displayCtrl 40;