projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030808-5-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 79a67d1eb066eec2842660ddf6b26a633d2d62b2..7132ab78c99a89f07aad6e8ee759c55c1436194d 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-1284,7
+1284,7
@@
void InitElementPropertiesStatic()
-1
};
-1
};
- static int ep_collectible[] =
+ static int ep_collectible
_only
[] =
{
EL_BD_DIAMOND,
EL_EMERALD,
{
EL_BD_DIAMOND,
EL_EMERALD,
@@
-2495,7
+2495,7
@@
void InitElementPropertiesStatic()
} element_properties[] =
{
{ ep_diggable, EP_DIGGABLE },
} element_properties[] =
{
{ ep_diggable, EP_DIGGABLE },
- { ep_collectible
, EP_COLLECTIBLE
},
+ { ep_collectible
_only, EP_COLLECTIBLE_ONLY
},
{ ep_dont_run_into, EP_DONT_RUN_INTO },
{ ep_dont_collide_with, EP_DONT_COLLIDE_WITH },
{ ep_dont_touch, EP_DONT_TOUCH },
{ ep_dont_run_into, EP_DONT_RUN_INTO },
{ ep_dont_collide_with, EP_DONT_COLLIDE_WITH },
{ ep_dont_touch, EP_DONT_TOUCH },
@@
-2639,7
+2639,7
@@
void InitElementPropertiesEngine(int engine_version)
static int no_wall_properties[] =
{
EP_DIGGABLE,
static int no_wall_properties[] =
{
EP_DIGGABLE,
- EP_COLLECTIBLE,
+ EP_COLLECTIBLE
_ONLY
,
EP_DONT_RUN_INTO,
EP_DONT_COLLIDE_WITH,
EP_CAN_MOVE,
EP_DONT_RUN_INTO,
EP_DONT_COLLIDE_WITH,
EP_CAN_MOVE,
@@
-2705,6
+2705,10
@@
void InitElementPropertiesEngine(int engine_version)
SET_PROPERTY(i, EP_ACCESSIBLE, (IS_WALKABLE(i) ||
IS_PASSABLE(i)));
SET_PROPERTY(i, EP_ACCESSIBLE, (IS_WALKABLE(i) ||
IS_PASSABLE(i)));
+ /* ---------- COLLECTIBLE ---------------------------------------------- */
+ SET_PROPERTY(i, EP_COLLECTIBLE, (IS_COLLECTIBLE_ONLY(i) ||
+ IS_DROPPABLE(i)));
+
/* ---------- SNAPPABLE ------------------------------------------------ */
SET_PROPERTY(i, EP_SNAPPABLE, (IS_DIGGABLE(i) ||
IS_COLLECTIBLE(i) ||
/* ---------- SNAPPABLE ------------------------------------------------ */
SET_PROPERTY(i, EP_SNAPPABLE, (IS_DIGGABLE(i) ||
IS_COLLECTIBLE(i) ||