projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030417-2-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 9224bb64fd5958983e155f303c083852431e8ef2..34d4ef14d51ae6093f72a112805563e3f51263ab 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-363,7
+363,7
@@
void InitFontGraphicInfo()
/* ---------- initialize font bitmap array ---------- */
if (font_bitmap_info != NULL)
/* ---------- initialize font bitmap array ---------- */
if (font_bitmap_info != NULL)
-
free
(font_bitmap_info);
+
FreeFontInfo
(font_bitmap_info);
font_bitmap_info =
checked_calloc(num_font_bitmaps * sizeof(struct FontBitmapInfo));
font_bitmap_info =
checked_calloc(num_font_bitmaps * sizeof(struct FontBitmapInfo));
@@
-2069,24
+2069,24
@@
void InitElementProperties()
EL_SP_PORT_RIGHT,
EL_SP_PORT_UP,
EL_SP_PORT_DOWN,
EL_SP_PORT_RIGHT,
EL_SP_PORT_UP,
EL_SP_PORT_DOWN,
+ EL_SP_PORT_HORIZONTAL,
+ EL_SP_PORT_VERTICAL,
+ EL_SP_PORT_ANY,
EL_SP_GRAVITY_PORT_LEFT,
EL_SP_GRAVITY_PORT_RIGHT,
EL_SP_GRAVITY_PORT_UP,
EL_SP_GRAVITY_PORT_DOWN,
EL_SP_GRAVITY_PORT_LEFT,
EL_SP_GRAVITY_PORT_RIGHT,
EL_SP_GRAVITY_PORT_UP,
EL_SP_GRAVITY_PORT_DOWN,
- EL_SP_PORT_HORIZONTAL,
- EL_SP_PORT_VERTICAL,
- EL_SP_PORT_ANY,
- EL_TUBE_ANY,
- EL_TUBE_VERTICAL,
- EL_TUBE_HORIZONTAL,
- EL_TUBE_VERTICAL_LEFT,
- EL_TUBE_VERTICAL_RIGHT,
- EL_TUBE_HORIZONTAL_UP,
- EL_TUBE_HORIZONTAL_DOWN,
EL_TUBE_LEFT_UP,
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
EL_TUBE_RIGHT_DOWN,
EL_TUBE_LEFT_UP,
EL_TUBE_LEFT_DOWN,
EL_TUBE_RIGHT_UP,
EL_TUBE_RIGHT_DOWN,
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_HORIZONTAL_UP,
+ EL_TUBE_HORIZONTAL_DOWN,
+ EL_TUBE_VERTICAL,
+ EL_TUBE_VERTICAL_LEFT,
+ EL_TUBE_VERTICAL_RIGHT,
+ EL_TUBE_ANY,
-1
};
-1
};
@@
-2212,6
+2212,22
@@
void InitElementProperties()
-1
};
-1
};
+ static int ep_tube[] =
+ {
+ EL_TUBE_LEFT_UP,
+ EL_TUBE_LEFT_DOWN,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_RIGHT_DOWN,
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_HORIZONTAL_UP,
+ EL_TUBE_HORIZONTAL_DOWN,
+ EL_TUBE_VERTICAL,
+ EL_TUBE_VERTICAL_LEFT,
+ EL_TUBE_VERTICAL_RIGHT,
+ EL_TUBE_ANY,
+ -1
+ };
+
static struct
{
int *elements;
static struct
{
int *elements;
@@
-2259,6
+2275,7
@@
void InitElementProperties()
{ ep_belt_switch, EP_BELT_SWITCH },
{ ep_sp_element, EP_SP_ELEMENT },
{ ep_has_content, EP_HAS_CONTENT },
{ ep_belt_switch, EP_BELT_SWITCH },
{ ep_sp_element, EP_SP_ELEMENT },
{ ep_has_content, EP_HAS_CONTENT },
+ { ep_tube, EP_TUBE },
{ NULL, -1 }
};
{ NULL, -1 }
};