added functions to get current player position for all game engines

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 6ae0780f5bd2f6fb0437df23b1bac0dbc0caf8f1..2ca18cf6b5f773e117aa6e0ebbfaf0fc010479f3 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -192,6 +192,22 @@ static char *print_if_not_empty(int element)
   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;
+}
+
 static int getFieldbufferOffsetX_RND()
 {
   int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0);
@@ -256,26 +272,6 @@ static int getFieldbufferOffsetY_RND()
   return fy;
 }
 
-int getFieldbufferOffsetX()
-{
-  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-    return getFieldbufferOffsetX_EM();
-  if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
-    return getFieldbufferOffsetX_SP();
-  else
-    return getFieldbufferOffsetX_RND();
-}
-
-int getFieldbufferOffsetY()
-{
-  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-    return getFieldbufferOffsetY_EM();
-  if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
-    return getFieldbufferOffsetY_SP();
-  else
-    return getFieldbufferOffsetY_RND();
-}
-
 static int getLevelFromScreenX_RND(int sx)
 {
   int fx = getFieldbufferOffsetX_RND();
@@ -296,7 +292,7 @@ static int getLevelFromScreenY_RND(int sy)
   return ly;
 }
 
-int getLevelFromScreenX_EM(int sx)
+static int getLevelFromScreenX_EM(int sx)
 {
   int level_xsize = level.native_em_level->lev->width;
   int full_xsize = level_xsize * TILESIZE_VAR;
@@ -306,14 +302,14 @@ int getLevelFromScreenX_EM(int sx)
   int fx = getFieldbufferOffsetX_EM();
   int dx = fx;
   int px = sx - SX;
-  int lx = LEVELX((px + dx) / TILESIZE_VAR) - 1;
+  int lx = LEVELX((px + dx) / TILESIZE_VAR);
 
-  lx -= (BorderElement != EL_EMPTY ? 1 : 0);
+  lx = correctLevelPosX_EM(lx);
 
   return lx;
 }
 
-int getLevelFromScreenY_EM(int sy)
+static int getLevelFromScreenY_EM(int sy)
 {
   int level_ysize = level.native_em_level->lev->height;
   int full_ysize = level_ysize * TILESIZE_VAR;
@@ -323,14 +319,14 @@ int getLevelFromScreenY_EM(int sy)
   int fy = getFieldbufferOffsetY_EM();
   int dy = fy;
   int py = sy - SY;
-  int ly = LEVELY((py + dy) / TILESIZE_VAR) - 1;
+  int ly = LEVELY((py + dy) / TILESIZE_VAR);
 
-  ly -= (BorderElement != EL_EMPTY ? 1 : 0);
+  ly = correctLevelPosY_EM(ly);
 
   return ly;
 }
 
-int getLevelFromScreenX_SP(int sx)
+static int getLevelFromScreenX_SP(int sx)
 {
   int menBorder = setup.sp_show_border_elements;
   int level_xsize = level.native_sp_level->width;
@@ -346,7 +342,7 @@ int getLevelFromScreenX_SP(int sx)
   return lx;
 }
 
-int getLevelFromScreenY_SP(int sy)
+static int getLevelFromScreenY_SP(int sy)
 {
   int menBorder = setup.sp_show_border_elements;
   int level_ysize = level.native_sp_level->height;
@@ -387,14 +383,6 @@ void DumpTile(int x, int y)
   int sx = SCREENX(x);
   int sy = SCREENY(y);
 
-#if 0
-  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-  {
-    x--;
-    y--;
-  }
-#endif
-
   printf_line("-", 79);
   printf("Field Info: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y);
   printf_line("-", 79);
@@ -421,6 +409,7 @@ void DumpTile(int x, int y)
   printf("  GfxElement:  %d\n", GfxElement[x][y]);
   printf("  GfxAction:   %d\n", GfxAction[x][y]);
   printf("  GfxFrame:    %d [%d]\n", GfxFrame[x][y], FrameCounter);
+  printf("  Player x/y:  %d, %d\n", local_player->jx, local_player->jy);
   printf("\n");
 }