projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060518-1-src
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 65c6255871d133ba329e29f677649d03ef6a0429..bad43ac57805952a68c865a5ce7d57fd52faa84b 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-2615,8
+2615,8
@@
unsigned int MoveDoor(unsigned int door_state)
#if 1
int end = door_size;
#else
#if 1
int end = door_size;
#else
- int end = (door_state & DOOR_ACTION_1 &&
-
door_1.anim_mode & ANIM_VERTICAL ?
DYSIZE : DXSIZE);
+ int end = (door_state & DOOR_ACTION_1 &&
door_1.anim_mode & ANIM_VERTICAL ?
+ DYSIZE : DXSIZE);
#endif
#if 1
int start = ((door_state & DOOR_NO_DELAY) ? end : 0);
#endif
#if 1
int start = ((door_state & DOOR_NO_DELAY) ? end : 0);
@@
-2734,9
+2734,15
@@
unsigned int MoveDoor(unsigned int door_state)
if (door_state & DOOR_ACTION_2)
{
if (door_state & DOOR_ACTION_2)
{
+#if 1
+ int a = MIN(x * door_2.step_offset, door_size);
+ int p = (door_state & DOOR_OPEN_2 ? door_size - a : a);
+ int i = p + door_skip;
+#else
int a = MIN(x * door_2.step_offset, door_size_2);
int p = (door_state & DOOR_OPEN_2 ? door_size_2 - a : a);
int i = p + door_skip;
int a = MIN(x * door_2.step_offset, door_size_2);
int p = (door_state & DOOR_OPEN_2 ? door_size_2 - a : a);
int i = p + door_skip;
+#endif
if (door_2.anim_mode & ANIM_STATIC_PANEL)
{
if (door_2.anim_mode & ANIM_STATIC_PANEL)
{