projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed pushed objects going into acid in EM engine for old tapes
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 2bc7d4fe9c000c06b4b429559be9aded895a52cc..db0ab8b12ba048cecef932c48f7e676b475e5474 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-291,8
+291,6
@@
static int getLevelFromScreenX_EM(int sx)
int px = sx - SX;
int lx = LEVELX((px + dx) / TILESIZE_VAR);
int px = sx - SX;
int lx = LEVELX((px + dx) / TILESIZE_VAR);
- lx = correctLevelPosX_EM(lx);
-
return lx;
}
return lx;
}
@@
-308,8
+306,6
@@
static int getLevelFromScreenY_EM(int sy)
int py = sy - SY;
int ly = LEVELY((py + dy) / TILESIZE_VAR);
int py = sy - SY;
int ly = LEVELY((py + dy) / TILESIZE_VAR);
- ly = correctLevelPosY_EM(ly);
-
return ly;
}
return ly;
}
@@
-6539,12
+6535,12
@@
em_object_mapping_list[GAME_TILE_MAX + 1] =
EL_SPRING, -1, -1
},
{
EL_SPRING, -1, -1
},
{
- Xspring_e,
FALSE,
FALSE,
- EL_SPRING
,
-1, -1
+ Xspring_e,
TRUE,
FALSE,
+ EL_SPRING
_RIGHT,
-1, -1
},
{
},
{
- Xspring_w,
FALSE,
FALSE,
- EL_SPRING
,
-1, -1
+ Xspring_w,
TRUE,
FALSE,
+ EL_SPRING
_LEFT,
-1, -1
},
{
Xspring_fall, FALSE, FALSE,
},
{
Xspring_fall, FALSE, FALSE,
@@
-6633,11
+6629,11
@@
em_object_mapping_list[GAME_TILE_MAX + 1] =
},
{
Xpush_spring_e, FALSE, FALSE,
},
{
Xpush_spring_e, FALSE, FALSE,
- EL_SPRING
,
-1, MV_BIT_RIGHT
+ EL_SPRING
_RIGHT,
-1, MV_BIT_RIGHT
},
{
Xpush_spring_w, FALSE, FALSE,
},
{
Xpush_spring_w, FALSE, FALSE,
- EL_SPRING
,
-1, MV_BIT_LEFT
+ EL_SPRING
_LEFT,
-1, MV_BIT_LEFT
},
{
},
{
@@
-6856,11
+6852,11
@@
em_object_mapping_list[GAME_TILE_MAX + 1] =
},
{
},
{
- Xdrip,
FALSE,
FALSE,
+ Xdrip,
TRUE,
FALSE,
EL_AMOEBA_DROP, ACTION_GROWING, -1
},
{
EL_AMOEBA_DROP, ACTION_GROWING, -1
},
{
- Xdrip_fall,
TRUE,
FALSE,
+ Xdrip_fall,
FALSE,
FALSE,
EL_AMOEBA_DROP, -1, -1
},
{
EL_AMOEBA_DROP, -1, -1
},
{