projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030830-1-src
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index 0f2aff310c07a1e89555c6d5fa9be3a317eb6a66..184a258f8017b161dfc11d3ad30678ecf9ba34bf 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-6721,7
+6721,7
@@
void TestIfElementTouchesCustomElement(int x, int y)
/* check for change of center element (but change it only once) */
if (IS_CUSTOM_ELEMENT(center_element) &&
/* check for change of center element (but change it only once) */
if (IS_CUSTOM_ELEMENT(center_element) &&
-
element_info[center_element].change_events & CE_OTHER_IS_TOUCHING
&&
+
HAS_ANY_CHANGE_EVENT(center_element, CE_OTHER_IS_TOUCHING)
&&
!change_center_element)
{
for (j=0; j < element_info[center_element].num_change_pages; j++)
!change_center_element)
{
for (j=0; j < element_info[center_element].num_change_pages; j++)
@@
-6729,7
+6729,7
@@
void TestIfElementTouchesCustomElement(int x, int y)
struct ElementChangeInfo *change =
&element_info[center_element].change_page[j];
struct ElementChangeInfo *change =
&element_info[center_element].change_page[j];
- if (change->events & C
E_OTHER_IS_TOUCHING
&&
+ if (change->events & C
H_EVENT_BIT(CE_OTHER_IS_TOUCHING)
&&
change->trigger_element == border_element)
{
change_center_element = TRUE;
change->trigger_element == border_element)
{
change_center_element = TRUE;
@@
-6742,14
+6742,14
@@
void TestIfElementTouchesCustomElement(int x, int y)
/* check for change of border element */
if (IS_CUSTOM_ELEMENT(border_element) &&
/* check for change of border element */
if (IS_CUSTOM_ELEMENT(border_element) &&
-
element_info[border_element].change_events & CE_OTHER_IS_TOUCHING
)
+
HAS_ANY_CHANGE_EVENT(border_element, CE_OTHER_IS_TOUCHING)
)
{
for (j=0; j < element_info[border_element].num_change_pages; j++)
{
struct ElementChangeInfo *change =
&element_info[border_element].change_page[j];
{
for (j=0; j < element_info[border_element].num_change_pages; j++)
{
struct ElementChangeInfo *change =
&element_info[border_element].change_page[j];
- if (change->events & C
E_OTHER_IS_TOUCHING
&&
+ if (change->events & C
H_EVENT_BIT(CE_OTHER_IS_TOUCHING)
&&
change->trigger_element == center_element)
{
CheckElementChangeExt(xx,yy, border_element,CE_OTHER_IS_TOUCHING, j);
change->trigger_element == center_element)
{
CheckElementChangeExt(xx,yy, border_element,CE_OTHER_IS_TOUCHING, j);