Combine player_fillWater and player_drinkWater to one function

This commit is contained in:
ebaydayz
2017-01-16 16:35:15 -05:00
parent 95b5447f7d
commit 198ef269d4
8 changed files with 98 additions and 120 deletions

View File

@@ -1,39 +1,35 @@
#define ACTION_DRINK class Drink\
{\
displayName = $STR_ACTIONS_DRINK2;\
displayNameDefault = $STR_ACTIONS_DRINK2;\
priority = 3;\
radius = 3;\
position = "";\
showWindow = 1;\
onlyForPlayer = 1;\
shortcut = "";\
condition = "(['Drink',this] call userActionConditions)";\
statement = "['hands'] spawn player_fillWater;";\
};
class Land_pumpa: House
{
class UserActions
{
class Drink
{
displayName = $STR_ACTIONS_DRINK2;
displayNameDefault = $STR_ACTIONS_DRINK2;
priority = 3;
radius = 3;
position = "";
showWindow = 1;
onlyForPlayer = 1;
shortcut = "";
condition = "(['Drink',this] call userActionConditions)";
statement = "'Land_pumpa' spawn player_drinkWater;";
};
};
class UserActions {ACTION_DRINK};
};
class Land_Misc_Well_C_EP1: House_EP1
{
class UserActions {ACTION_DRINK};
};
class Land_Misc_Well_L_EP1: House_EP1
{
class UserActions {ACTION_DRINK};
};
class Land_Barrel_water: Thing
{
class UserActions
{
class Drink
{
displayName = $STR_ACTIONS_DRINK2;
displayNameDefault = $STR_ACTIONS_DRINK2;
priority = 3;
radius = 3;
position = "";
showWindow = 1;
onlyForPlayer = 1;
shortcut = "";
condition = "(['Drink',this] call userActionConditions)";
statement = "'Land_Barrel_water' spawn player_drinkWater;";
};
};
};
class UserActions {ACTION_DRINK};
};
#undef ACTION_DRINK