X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=0977a92a6dbb97b4161369f7ccb0425dfa9cd903;hb=4bca9bc5f299a9b287134b06e41b147f506792b4;hp=fe5dc3589467eb20eadc0f66da11f37212034e9c;hpb=6504e94ad5344b188eae829e8136b804437e70bf;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index fe5dc358..0977a92a 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -690,10 +690,10 @@ static int new_element1 = EL_MAUERWERK;
 static int new_element2 = EL_LEERRAUM;
 static int new_element3 = EL_ERDREICH;
 
-#define BUTTON_ELEMENT(button) (button == 1 ? new_element1 : \
-				button == 2 ? new_element2 : \
-				button == 3 ? new_element3 : EL_LEERRAUM)
-#define BUTTON_STEPSIZE(button) (button == 1 ? 1 : button == 2 ? 5 : 10)
+#define BUTTON_ELEMENT(button) ((button) == 1 ? new_element1 : \
+				(button) == 2 ? new_element2 : \
+				(button) == 3 ? new_element3 : EL_LEERRAUM)
+#define BUTTON_STEPSIZE(button) ((button) == 1 ? 1 : (button) == 2 ? 5 : 10)
 
 /* forward declaration for internal use */
 static void ModifyEditorCounter(int, int);
@@ -3984,9 +3984,9 @@ void HandleLevelEditorKeyInput(Key key)
   {
     if (letter)
       DrawLevelText(0, 0, letter, TEXT_WRITECHAR);
-    else if (key == KEY_Delete || key == KEY_BackSpace)
+    else if (key == KSYM_Delete || key == KSYM_BackSpace)
       DrawLevelText(0, 0, 0, TEXT_BACKSPACE);
-    else if (key == KEY_Return)
+    else if (key == KSYM_Return)
       DrawLevelText(0, 0, 0, TEXT_NEWLINE);
   }
   else if (button_status == MB_RELEASED)
@@ -3995,23 +3995,23 @@ void HandleLevelEditorKeyInput(Key key)
 
     switch (key)
     {
-      case KEY_Left:
+      case KSYM_Left:
 	id = GADGET_ID_SCROLL_LEFT;
 	break;
-      case KEY_Right:
+      case KSYM_Right:
 	id = GADGET_ID_SCROLL_RIGHT;
 	break;
-      case KEY_Up:
+      case KSYM_Up:
 	id = GADGET_ID_SCROLL_UP;
 	break;
-      case KEY_Down:
+      case KSYM_Down:
 	id = GADGET_ID_SCROLL_DOWN;
 	break;
-      case KEY_Page_Up:
+      case KSYM_Page_Up:
 	id = GADGET_ID_SCROLL_LIST_UP;
 	button = MB_RIGHTBUTTON;
 	break;
-      case KEY_Page_Down:
+      case KSYM_Page_Down:
 	id = GADGET_ID_SCROLL_LIST_DOWN;
 	button = MB_RIGHTBUTTON;
 	break;
@@ -4025,7 +4025,7 @@ void HandleLevelEditorKeyInput(Key key)
       ClickOnGadget(level_editor_gadget[id], button);
     else if (letter == '.')
       ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
-    else if (key == KEY_space || key == KEY_Return)
+    else if (key == KSYM_space || key == KSYM_Return)
       ClickOnGadget(level_editor_gadget[GADGET_ID_TEST], button);
     else
       for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)