projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070320-3-src
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index f21f232956e07c2ed8ac11d4924b2a6e569f235d..c820bff1cbff3726c99e7737fbae413203104c21 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-551,7
+551,16
@@
void FadeExt(int fade_mask, int fade_mode)
redraw_mask |= fade_mask;
redraw_mask |= fade_mask;
+#if 1
+ if (fading.anim_mode == ANIM_NONE)
+ return;
+#endif
+
+#if 1
if (!setup.fade_screens || fade_delay == 0)
if (!setup.fade_screens || fade_delay == 0)
+#else
+ if (!setup.fade_screens || fade_delay == 0 || fading.anim_mode == ANIM_NONE)
+#endif
{
if (fade_mode == FADE_MODE_FADE_OUT)
ClearRectangle(backbuffer, x, y, width, height);
{
if (fade_mode == FADE_MODE_FADE_OUT)
ClearRectangle(backbuffer, x, y, width, height);
@@
-2988,7
+2997,7
@@
unsigned int MoveDoor(unsigned int door_state)
if (setup.quick_doors)
{
if (setup.quick_doors)
{
- stepsize = 20; /* must be cho
o
sen to always draw last frame */
+ stepsize = 20; /* must be chosen to always draw last frame */
door_delay_value = 0;
}
door_delay_value = 0;
}