projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added options for post delay for door actions
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index e1ff8140e3d56fbc44f8e30f050024072961a5d2..b87d7201018950e61db340d14f24b0838e83a7fb 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-2486,12
+2486,14
@@
void DrawLevelField(int x, int y)
}
static void DrawSizedWallExt_MM(int dst_x, int dst_y, int element, int tilesize,
}
static void DrawSizedWallExt_MM(int dst_x, int dst_y, int element, int tilesize,
- int (*el2img_function)(int), boolean masked)
+ int (*el2img_function)(int), boolean masked,
+ int element_bits_draw)
{
int element_base = map_mm_wall_element(element);
int element_bits = (IS_DF_WALL(element) ?
element - EL_DF_WALL_START :
{
int element_base = map_mm_wall_element(element);
int element_bits = (IS_DF_WALL(element) ?
element - EL_DF_WALL_START :
- element - EL_MM_WALL_START) & 0x000f;
+ IS_MM_WALL(element) ?
+ element - EL_MM_WALL_START : EL_EMPTY) & 0x000f;
int graphic = el2img_function(element_base);
int tilesize_draw = tilesize / 2;
Bitmap *src_bitmap;
int graphic = el2img_function(element_base);
int tilesize_draw = tilesize / 2;
Bitmap *src_bitmap;
@@
-2505,6
+2507,9
@@
static void DrawSizedWallExt_MM(int dst_x, int dst_y, int element, int tilesize,
int dst_draw_x = dst_x + (i % 2) * tilesize_draw;
int dst_draw_y = dst_y + (i / 2) * tilesize_draw;
int dst_draw_x = dst_x + (i % 2) * tilesize_draw;
int dst_draw_y = dst_y + (i / 2) * tilesize_draw;
+ if (!(element_bits_draw & (1 << i)))
+ continue;
+
if (element_bits & (1 << i))
{
if (masked)
if (element_bits & (1 << i))
{
if (masked)
@@
-2523,10
+2528,18
@@
static void DrawSizedWallExt_MM(int dst_x, int dst_y, int element, int tilesize,
}
}
}
}
+void DrawSizedWallParts_MM(int x, int y, int element, int tilesize,
+ boolean masked, int element_bits_draw)
+{
+ DrawSizedWallExt_MM(SX + x * tilesize, SY + y * tilesize,
+ element, tilesize, el2edimg, masked, element_bits_draw);
+}
+
void DrawSizedWall_MM(int dst_x, int dst_y, int element, int tilesize,
int (*el2img_function)(int))
{
void DrawSizedWall_MM(int dst_x, int dst_y, int element, int tilesize,
int (*el2img_function)(int))
{
- DrawSizedWallExt_MM(dst_x, dst_y, element, tilesize, el2img_function, FALSE);
+ DrawSizedWallExt_MM(dst_x, dst_y, element, tilesize, el2img_function, FALSE,
+ 0x000f);
}
void DrawSizedElementExt(int x, int y, int element, int tilesize,
}
void DrawSizedElementExt(int x, int y, int element, int tilesize,
@@
-2535,7
+2548,7
@@
void DrawSizedElementExt(int x, int y, int element, int tilesize,
if (IS_MM_WALL(element))
{
DrawSizedWallExt_MM(SX + x * tilesize, SY + y * tilesize,
if (IS_MM_WALL(element))
{
DrawSizedWallExt_MM(SX + x * tilesize, SY + y * tilesize,
- element, tilesize, el2edimg, masked);
+ element, tilesize, el2edimg, masked
, 0x000f
);
}
else
{
}
else
{
@@
-4849,9
+4862,23
@@
unsigned int MoveDoor(unsigned int door_state)
{
/* opening door sound has priority over simultaneously closing door */
if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2))
{
/* opening door sound has priority over simultaneously closing door */
if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2))
+ {
PlayMenuSoundStereo(SND_DOOR_OPENING, SOUND_MIDDLE);
PlayMenuSoundStereo(SND_DOOR_OPENING, SOUND_MIDDLE);
+
+ if (door_state & DOOR_OPEN_1)
+ PlayMenuSoundStereo(SND_DOOR_1_OPENING, SOUND_MIDDLE);
+ if (door_state & DOOR_OPEN_2)
+ PlayMenuSoundStereo(SND_DOOR_2_OPENING, SOUND_MIDDLE);
+ }
else if (door_state & (DOOR_CLOSE_1 | DOOR_CLOSE_2))
else if (door_state & (DOOR_CLOSE_1 | DOOR_CLOSE_2))
+ {
PlayMenuSoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE);
PlayMenuSoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE);
+
+ if (door_state & DOOR_CLOSE_1)
+ PlayMenuSoundStereo(SND_DOOR_1_CLOSING, SOUND_MIDDLE);
+ if (door_state & DOOR_CLOSE_2)
+ PlayMenuSoundStereo(SND_DOOR_2_CLOSING, SOUND_MIDDLE);
+ }
}
for (k = start; k < num_move_steps; k++)
}
for (k = start; k < num_move_steps; k++)
@@
-5028,6
+5055,17
@@
unsigned int MoveDoor(unsigned int door_state)
if (door_part_done_all)
break;
}
if (door_part_done_all)
break;
}
+
+ if (!(door_state & DOOR_NO_DELAY))
+ {
+ /* wait for specified door action post delay */
+ if (door_state & DOOR_ACTION_1 && door_state & DOOR_ACTION_2)
+ Delay(MAX(door_1.post_delay, door_2.post_delay));
+ else if (door_state & DOOR_ACTION_1)
+ Delay(door_1.post_delay);
+ else if (door_state & DOOR_ACTION_2)
+ Delay(door_2.post_delay);
+ }
}
if (door_state & DOOR_ACTION_1)
}
if (door_state & DOOR_ACTION_1)
@@
-7409,6
+7447,9
@@
int map_sound_MM_to_RND(int sound_mm)
case SND_MM_GAME_LEVELTIME_CHARGING:
return SND_GAME_LEVELTIME_CHARGING;
case SND_MM_GAME_LEVELTIME_CHARGING:
return SND_GAME_LEVELTIME_CHARGING;
+ case SND_MM_GAME_HEALTH_CHARGING:
+ return SND_GAME_HEALTH_CHARGING;
+
default:
return SND_UNDEFINED;
}
default:
return SND_UNDEFINED;
}