projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20080206-2-src
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index 057c8dd257c598303e17516e1c2ac29097d291c8..f99a7627ed5b1039efa550375a786215b9eb4033 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-10174,6
+10174,9
@@
static void ExecuteCustomElementAction(int x, int y, int element, int page)
action_arg == CA_ARG_ELEMENT_TRIGGER ? change->actual_trigger_element :
action_arg == CA_ARG_ELEMENT_TARGET ? change->target_element :
action_arg == CA_ARG_ELEMENT_ACTION ? change->action_element :
action_arg == CA_ARG_ELEMENT_TRIGGER ? change->actual_trigger_element :
action_arg == CA_ARG_ELEMENT_TARGET ? change->target_element :
action_arg == CA_ARG_ELEMENT_ACTION ? change->action_element :
+ action_arg == CA_ARG_INVENTORY_RM_TRIGGER ? change->actual_trigger_element:
+ action_arg == CA_ARG_INVENTORY_RM_TARGET ? change->target_element :
+ action_arg == CA_ARG_INVENTORY_RM_ACTION ? change->action_element :
EL_EMPTY);
int action_arg_element = GetElementFromGroupElement(action_arg_element_raw);
EL_EMPTY);
int action_arg_element = GetElementFromGroupElement(action_arg_element_raw);
@@
-10619,7
+10622,7
@@
static void ExecuteCustomElementAction(int x, int y, int element, int page)
player->inventory_infinite_element = EL_UNDEFINED;
player->inventory_size = 0;
}
player->inventory_infinite_element = EL_UNDEFINED;
player->inventory_size = 0;
}
- else if (action_arg == CA_ARG_
ELEMENT
_RESET)
+ else if (action_arg == CA_ARG_
INVENTORY
_RESET)
{
player->inventory_infinite_element = EL_UNDEFINED;
player->inventory_size = 0;
{
player->inventory_infinite_element = EL_UNDEFINED;
player->inventory_size = 0;