Add discrete ZC_NUMPAD_? defines to replace define-math in SDL interface.

diff --git a/src/common/frotz.h b/src/common/frotz.h
index 9785a34b9624577cd06059ae4848a39a6a43cc73..1310a6e149c52377affa39aaa2394208a26db47c 100644 (file)
--- a/src/common/frotz.h
+++ b/src/common/frotz.h
@@ -352,6 +352,16 @@ extern const char build_timestamp[];
 #define ZC_FKEY_F12 0x90
 #define ZC_FKEY_MAX 0x90
 #define ZC_NUMPAD_MIN 0x91
+#define ZC_NUMPAD_0 0x91
+#define ZC_NUMPAD_1 0x92
+#define ZC_NUMPAD_2 0x93
+#define ZC_NUMPAD_3 0x94
+#define ZC_NUMPAD_4 0x95
+#define ZC_NUMPAD_5 0x96
+#define ZC_NUMPAD_6 0x97
+#define ZC_NUMPAD_7 0x98
+#define ZC_NUMPAD_8 0x99
+#define ZC_NUMPAD_9 0x9a
 #define ZC_NUMPAD_MAX 0x9a
 #define ZC_SINGLE_CLICK 0x9b
 #define ZC_DOUBLE_CLICK 0x9c

diff --git a/src/sdl/sf_video.c b/src/sdl/sf_video.c
index 76a94ba6eb0e05181300a3409c08491428188986..7aa0373403d158b74fee97a07cc488e902e37e2f 100644 (file)
--- a/src/sdl/sf_video.c
+++ b/src/sdl/sf_video.c
@@ -661,16 +661,16 @@ static zword goodzkey( SDL_Event *e, int allowed)
        case SDLK_TAB:          return (allowed ? VK_TAB : 0);
        case SDLK_PAGEUP:       return (allowed ? VK_PAGE_UP : 0);
        case SDLK_PAGEDOWN:     return (allowed ? VK_PAGE_DOWN : 0);
-       case SDLK_KP_0:         return ZC_NUMPAD_MIN+0;
-       case SDLK_KP_1:         return ZC_NUMPAD_MIN+1;
-       case SDLK_KP_2:         return ZC_NUMPAD_MIN+2;
-       case SDLK_KP_3:         return ZC_NUMPAD_MIN+3;
-       case SDLK_KP_4:         return ZC_NUMPAD_MIN+4;
-       case SDLK_KP_5:         return ZC_NUMPAD_MIN+5;
-       case SDLK_KP_6:         return ZC_NUMPAD_MIN+6;
-       case SDLK_KP_7:         return ZC_NUMPAD_MIN+7;
-       case SDLK_KP_8:         return ZC_NUMPAD_MIN+8;
-       case SDLK_KP_9:         return ZC_NUMPAD_MIN+9;
+       case SDLK_KP_0:         return ZC_NUMPAD_0;
+       case SDLK_KP_1:         return ZC_NUMPAD_1;
+       case SDLK_KP_2:         return ZC_NUMPAD_2;
+       case SDLK_KP_3:         return ZC_NUMPAD_3;
+       case SDLK_KP_4:         return ZC_NUMPAD_4;
+       case SDLK_KP_5:         return ZC_NUMPAD_5;
+       case SDLK_KP_6:         return ZC_NUMPAD_6;
+       case SDLK_KP_7:         return ZC_NUMPAD_7;
+       case SDLK_KP_8:         return ZC_NUMPAD_8;
+       case SDLK_KP_9:         return ZC_NUMPAD_9;
        case SDLK_F1:           return ZC_FKEY_F1;
        case SDLK_F2:           return ZC_FKEY_F2;
        case SDLK_F3:           return ZC_FKEY_F3;