cleanup code for zooming bitmaps and creating corresponding masked bitmaps

[rocksndiamonds.git] / src / libgame / system.h

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 0bd948bd640ff684c88f25ee3ddff7637a303b0a..fa422cafd8ee206c299023d8908a62430747f4ac 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -179,12 +179,12 @@
 #define MB_WHEEL_DOWN                  5
 #define MB_WHEEL_LEFT                  6
 #define MB_WHEEL_RIGHT                 7
-#define IS_WHEEL_BUTTON_VERTICAL(b)    ((b) >= MB_WHEEL_UP &&          \
-                                        (b) <= MB_WHEEL_DOWN)
-#define IS_WHEEL_BUTTON_HORIZONTAL(b)  ((b) >= MB_WHEEL_LEFT &&        \
-                                        (b) <= MB_WHEEL_RIGHT)
-#define IS_WHEEL_BUTTON(b)             ((b) >= MB_WHEEL_UP &&          \
-                                        (b) <= MB_WHEEL_DOWN)
+#define IS_WHEEL_BUTTON_VERTICAL(b)    ((b) == MB_WHEEL_UP ||          \
+                                        (b) == MB_WHEEL_DOWN)
+#define IS_WHEEL_BUTTON_HORIZONTAL(b)  ((b) == MB_WHEEL_LEFT ||        \
+                                        (b) == MB_WHEEL_RIGHT)
+#define IS_WHEEL_BUTTON(b)             (IS_WHEEL_BUTTON_VERTICAL(b) || \
+                                        IS_WHEEL_BUTTON_HORIZONTAL(b))
 #define DEFAULT_WHEEL_STEPS            3
 
 #define BUTTON_STEPSIZE(b)             ((b) == MB_LEFTBUTTON   ?  1 :  \
@@ -1376,6 +1376,7 @@ extern DrawBuffer        *drawto;
 
 extern int                     button_status;
 extern boolean                 motion_status;
+extern int                     wheel_steps;
 #if defined(TARGET_SDL2)
 extern boolean                 keyrepeat_status;
 #endif
@@ -1461,7 +1462,6 @@ Bitmap *LoadImage(char *);
 Bitmap *LoadCustomImage(char *);
 void ReloadCustomImage(Bitmap *, char *);
 
-Bitmap *ZoomBitmap(Bitmap *, int, int);
 void ReCreateGameTileSizeBitmap(Bitmap **);
 void CreateBitmapWithSmallBitmaps(Bitmap **, int, int);
 void CreateBitmapTextures(Bitmap **);