projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed "http" to "https" in URLs
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 52fbded05846a88125e503994a8f6439555851a4..1762651003cd65ab3995e546b484237d09f5f997 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-4,7
+4,7
@@
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// http
s
://www.artsoft.org/
// ----------------------------------------------------------------------------
// tools.c
// ============================================================================
// ----------------------------------------------------------------------------
// tools.c
// ============================================================================
@@
-193,22
+193,6
@@
static char *print_if_not_empty(int element)
return s;
}
return s;
}
-int correctLevelPosX_EM(int lx)
-{
- lx -= 1;
- lx -= (BorderElement != EL_EMPTY ? 1 : 0);
-
- return lx;
-}
-
-int correctLevelPosY_EM(int ly)
-{
- ly -= 1;
- ly -= (BorderElement != EL_EMPTY ? 1 : 0);
-
- return ly;
-}
-
int getFieldbufferOffsetX_RND(int dir, int pos)
{
int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0);
int getFieldbufferOffsetX_RND(int dir, int pos)
{
int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0);
@@
-307,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;
}
@@
-324,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;
}
@@
-993,8
+973,7
@@
static void SetScreenStates_BeforeFadingIn(void)
global.anim_status = global.anim_status_next;
// store backbuffer with all animations that will be started after fading in
global.anim_status = global.anim_status_next;
// store backbuffer with all animations that will be started after fading in
- if (fade_type_skip != FADE_MODE_SKIP_FADE_IN)
- PrepareFadeBitmap(DRAW_TO_FADE_TARGET);
+ PrepareFadeBitmap(DRAW_TO_FADE_TARGET);
// set screen mode for animations back to fading
global.anim_status = GAME_MODE_PSEUDO_FADING;
// set screen mode for animations back to fading
global.anim_status = GAME_MODE_PSEUDO_FADING;
@@
-1017,8
+996,7
@@
static void SetScreenStates_BeforeFadingOut(void)
global.anim_status = GAME_MODE_PSEUDO_FADING;
// store backbuffer with all animations that will be stopped for fading out
global.anim_status = GAME_MODE_PSEUDO_FADING;
// store backbuffer with all animations that will be stopped for fading out
- if (fade_type_skip != FADE_MODE_SKIP_FADE_OUT)
- PrepareFadeBitmap(DRAW_TO_FADE_SOURCE);
+ PrepareFadeBitmap(DRAW_TO_FADE_SOURCE);
}
static void SetScreenStates_AfterFadingOut(void)
}
static void SetScreenStates_AfterFadingOut(void)
@@
-6557,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,
@@
-6651,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
},
{
},
{
@@
-6874,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
},
{