improved code readability regarding calculation precedence

diff --git a/src/game.c b/src/game.c
index ee067b8a8715ef82d2cfc09eb2d8284e651fc153..af54fecc15ef8c73c496fa8457f07e58d161bb1c 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -5582,8 +5582,8 @@ static void InitMovingField(int x, int y, int direction)
 void Moving2Blocked(int x, int y, int *goes_to_x, int *goes_to_y)
 {
   int direction = MovDir[x][y];
-  int newx = x + (direction & MV_LEFT ? -1 : direction & MV_RIGHT ? +1 : 0);
-  int newy = y + (direction & MV_UP   ? -1 : direction & MV_DOWN  ? +1 : 0);
+  int newx = x + ((direction & MV_LEFT) ? -1 : (direction & MV_RIGHT) ? +1 : 0);
+  int newy = y + ((direction & MV_UP)   ? -1 : (direction & MV_DOWN)  ? +1 : 0);
 
   *goes_to_x = newx;
   *goes_to_y = newy;
@@ -5592,8 +5592,8 @@ void Moving2Blocked(int x, int y, int *goes_to_x, int *goes_to_y)
 void Blocked2Moving(int x, int y, int *comes_from_x, int *comes_from_y)
 {
   int direction = MovDir[x][y];
-  int oldx = x + (direction & MV_LEFT ? +1 : direction & MV_RIGHT ? -1 : 0);
-  int oldy = y + (direction & MV_UP   ? +1 : direction & MV_DOWN  ? -1 : 0);
+  int oldx = x + ((direction & MV_LEFT) ? +1 : (direction & MV_RIGHT) ? -1 : 0);
+  int oldy = y + ((direction & MV_UP)   ? +1 : (direction & MV_DOWN)  ? -1 : 0);
 
   *comes_from_x = oldx;
   *comes_from_y = oldy;
@@ -13091,8 +13091,8 @@ static boolean canFallDown(struct PlayerInfo *player)
 static boolean canPassField(int x, int y, int move_dir)
 {
   int opposite_dir = MV_DIR_OPPOSITE(move_dir);
-  int dx = (move_dir & MV_LEFT ? -1 : move_dir & MV_RIGHT ? +1 : 0);
-  int dy = (move_dir & MV_UP   ? -1 : move_dir & MV_DOWN  ? +1 : 0);
+  int dx = ((move_dir & MV_LEFT) ? -1 : (move_dir & MV_RIGHT) ? +1 : 0);
+  int dy = ((move_dir & MV_UP)   ? -1 : (move_dir & MV_DOWN)  ? +1 : 0);
   int nextx = x + dx;
   int nexty = y + dy;
   int element = Tile[x][y];
@@ -13107,8 +13107,8 @@ static boolean canPassField(int x, int y, int move_dir)
 static boolean canMoveToValidFieldWithGravity(int x, int y, int move_dir)
 {
   int opposite_dir = MV_DIR_OPPOSITE(move_dir);
-  int dx = (move_dir & MV_LEFT ? -1 : move_dir & MV_RIGHT ? +1 : 0);
-  int dy = (move_dir & MV_UP   ? -1 : move_dir & MV_DOWN  ? +1 : 0);
+  int dx = ((move_dir & MV_LEFT) ? -1 : (move_dir & MV_RIGHT) ? +1 : 0);
+  int dy = ((move_dir & MV_UP)   ? -1 : (move_dir & MV_DOWN)  ? +1 : 0);
   int newx = x + dx;
   int newy = y + dy;
 

diff --git a/src/game_sp/Input.c b/src/game_sp/Input.c
index 5a469575399886e012048e50e5afee9f0b4e3510..f800492ead1c1b5a2e5be1dc50b1e3a50fe7c3b3 100644 (file)
--- a/src/game_sp/Input.c
+++ b/src/game_sp/Input.c
@@ -9,17 +9,17 @@ int map_key_RND_to_SP(int key)
 {
   if (key & KEY_BUTTON)
   {
-    return (key & MV_UP                ? keySpaceUp    :
-           key & MV_LEFT       ? keySpaceLeft  :
-           key & MV_DOWN       ? keySpaceDown  :
-           key & MV_RIGHT      ? keySpaceRight : keySpace);
+    return ((key & MV_UP)      ? keySpaceUp    :
+           (key & MV_LEFT)     ? keySpaceLeft  :
+           (key & MV_DOWN)     ? keySpaceDown  :
+           (key & MV_RIGHT)    ? keySpaceRight : keySpace);
   }
   else
   {
-    return (key & MV_UP                ? keyUp         :
-           key & MV_LEFT       ? keyLeft       :
-           key & MV_DOWN       ? keyDown       :
-           key & MV_RIGHT      ? keyRight      : keyNone);
+    return ((key & MV_UP)      ? keyUp         :
+           (key & MV_LEFT)     ? keyLeft       :
+           (key & MV_DOWN)     ? keyDown       :
+           (key & MV_RIGHT)    ? keyRight      : keyNone);
   }
 }
 

diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index d664eecc01df267ae8a86aff5f04e29cb43abbdc..e401a65c11de74ab4295184a8ac4142aace4de00 100644 (file)
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -3084,10 +3084,10 @@ static void DrawTouchInputOverlay_ShowGridButtons(int alpha)
       if (draw_outlined)
       {
        int rect_x = rect.x +
-         (outline_border & MV_LEFT  ? border_size : 0);
+         ((outline_border & MV_LEFT)  ? border_size : 0);
        int rect_w = rect.w -
-         (outline_border & MV_LEFT  ? border_size : 0) -
-         (outline_border & MV_RIGHT ? border_size : 0);
+         ((outline_border & MV_LEFT)  ? border_size : 0) -
+         ((outline_border & MV_RIGHT) ? border_size : 0);
 
        if (outline_border & MV_LEFT)
          RenderFillRectangle(rect.x, rect.y, border_size, rect.h);

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index 5f497c386c56c6dda9088ecfd87940cd3bcfd36c..53a054443fb4ae28566c35781ef3f75fd0e88716 100644 (file)
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -59,9 +59,9 @@
 #define SOUND_VOLUME_LOOPS(v)  SOUND_VOLUME_FROM_PERCENT(v, setup.volume_loops)
 #define SOUND_VOLUME_MUSIC(v)  SOUND_VOLUME_FROM_PERCENT(v, setup.volume_music)
 
-#define SETUP_SOUND_VOLUME(v, s)       ((s) & SND_CTRL_MUSIC ?         \
+#define SETUP_SOUND_VOLUME(v, s)       (((s) & SND_CTRL_MUSIC) ?       \
                                         SOUND_VOLUME_MUSIC(v) :        \
-                                        (s) & SND_CTRL_LOOP ?          \
+                                        ((s) & SND_CTRL_LOOP) ?        \
                                         SOUND_VOLUME_LOOPS(v) :        \
                                         SOUND_VOLUME_SIMPLE(v))
 

diff --git a/src/screens.c b/src/screens.c
index 478d57387a5bbaf421fb699fe592caee28137648..d6dda4acf44e03703f180eb4ff146f23052995b6 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -8981,7 +8981,7 @@ static int getSetupValueFont(int type, void *value)
   if (type & TYPE_GHOSTED)
     return FONT_OPTION_OFF;
   else if (type & TYPE_KEY)
-    return (type & TYPE_QUERY ? FONT_INPUT_1_ACTIVE : FONT_VALUE_1);
+    return ((type & TYPE_QUERY) ? FONT_INPUT_1_ACTIVE : FONT_VALUE_1);
   else if (type & TYPE_STRING)
     return FONT_VALUE_2;
   else if (type & TYPE_ECS_AGA)

diff --git a/src/tape.c b/src/tape.c
index be363da08747b17a5e91157b8f7daeb854e85f5f..9d729799a9a07524367da37a0fd1467f57a4e698 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -305,8 +305,8 @@ static void DrawVideoDisplay_DateTime(unsigned int state, unsigned int value)
        pos->y == -1)
       continue;
 
-    xpos = VX + pos->x + (type & DATETIME_XOFFSET_1 ? pos->xoffset  :
-                         type & DATETIME_XOFFSET_2 ? pos->xoffset2 : 0);
+    xpos = VX + pos->x + ((type & DATETIME_XOFFSET_1) ? pos->xoffset  :
+                         (type & DATETIME_XOFFSET_2) ? pos->xoffset2 : 0);
     ypos = VY + pos->y;
 
     if ((type & DATETIME_DATE) && (state & VIDEO_STATE_DATE_ON))
@@ -319,11 +319,11 @@ static void DrawVideoDisplay_DateTime(unsigned int state, unsigned int value)
       int month = month_index + 1;
       int day = value % 100;
 
-      strcpy(s, (type & DATETIME_DATE_YYYY ? int2str(year4, 4) :
-                type & DATETIME_DATE_YY   ? int2str(year2, 2) :
-                type & DATETIME_DATE_MON  ? month_shortnames[month_index] :
-                type & DATETIME_DATE_MM   ? int2str(month, 2) :
-                type & DATETIME_DATE_DD   ? int2str(day, 2) : ""));
+      strcpy(s, ((type & DATETIME_DATE_YYYY) ? int2str(year4, 4) :
+                (type & DATETIME_DATE_YY)   ? int2str(year2, 2) :
+                (type & DATETIME_DATE_MON)  ? month_shortnames[month_index] :
+                (type & DATETIME_DATE_MM)   ? int2str(month, 2) :
+                (type & DATETIME_DATE_DD)   ? int2str(day, 2) : ""));
 
       DrawText(xpos, ypos, s, pos->font);
     }
@@ -335,10 +335,10 @@ static void DrawVideoDisplay_DateTime(unsigned int state, unsigned int value)
       int mm = (value / 60) % 60;
       int ss = value % 60;
 
-      strcpy(s, (type & DATETIME_TIME_HH  ? int2str(hh, 2) :
-                type & DATETIME_TIME_MIN ? int2str(min, 2) :
-                type & DATETIME_TIME_MM  ? int2str(mm, 2) :
-                type & DATETIME_TIME_SS  ? int2str(ss, 2) : ""));
+      strcpy(s, ((type & DATETIME_TIME_HH)  ? int2str(hh, 2) :
+                (type & DATETIME_TIME_MIN) ? int2str(min, 2) :
+                (type & DATETIME_TIME_MM)  ? int2str(mm, 2) :
+                (type & DATETIME_TIME_SS)  ? int2str(ss, 2) : ""));
 
       DrawText(xpos, ypos, s, pos->font);
     }