W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 12:12:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Drink and Eat actions in vehicles

Browse Source
This commit is contained in:
Skaronator
2013-10-08 21:23:15 +02:00
parent 8f5d259cdd
commit 8df641cf9f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SQF/dayz_code/actions/player_drink.sqf
View File

@@ -6,7 +6,7 @@ call gear_ui_init;
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
if (_onLadder) exitWith {cutText [(localize "str_player_21") , "PLAIN DOWN"]}; if (_onLadder) exitWith {cutText [(localize "str_player_21") , "PLAIN DOWN"]};
if (vehicle player != player) exitWith {cutText ["\n\nYou may not drink while in a vehicle", "PLAIN DOWN"]}; //if (vehicle player != player) exitWith {cutText ["\n\nYou may not drink while in a vehicle", "PLAIN DOWN"]};
//Force players to wait 3 mins to drink again //Force players to wait 3 mins to drink again
//if (dayz_lastDrink < 180) exitWith {cutText ["You may not drink, your not thirsty", "PLAIN DOWN"]}; //if (dayz_lastDrink < 180) exitWith {cutText ["You may not drink, your not thirsty", "PLAIN DOWN"]};
@@ -14,6 +14,7 @@ if (vehicle player != player) exitWith {cutText ["\n\nYou may not drink while in
_itemorignal = _this; _itemorignal = _this;
_hasdrinkitem = _itemorignal in magazines player; _hasdrinkitem = _itemorignal in magazines player;
_hasoutput = _itemorignal in drink_with_output; _hasoutput = _itemorignal in drink_with_output;
_invehicle = false;
_config = configFile >> "CfgMagazines" >> _itemorignal; _config = configFile >> "CfgMagazines" >> _itemorignal;
_text = getText (_config >> "displayName"); _text = getText (_config >> "displayName");
@@ -25,6 +26,12 @@ if (!_hasdrinkitem) exitWith {cutText [format[(localize "str_player_31"),_text,"
player playActionNow "PutDown"; player playActionNow "PutDown";
player removeMagazine _itemorignal; player removeMagazine _itemorignal;
if (vehicle player != player) then {
_display = findDisplay 106;
_display closeDisplay 0;
_invehicle = true;
};
sleep 1; sleep 1;
if (["ItemWaterbottle",_itemorignal] call fnc_inString) then { if (["ItemWaterbottle",_itemorignal] call fnc_inString) then {
@@ -41,7 +48,7 @@ if (["ItemSoda",_itemorignal] call fnc_inString) then {
[player,_dis,true,(getPosATL player)] spawn player_alertZombies; [player,_dis,true,(getPosATL player)] spawn player_alertZombies;
}; };
if (_hasoutput) then{ if (_hasoutput and !_invehicle) then {
// Selecting output // Selecting output
_itemtodrop = drink_output select (drink_with_output find _itemorignal); _itemtodrop = drink_output select (drink_with_output find _itemorignal);