X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=b7b739f5145bfab4cc27355d7a8a7f20c6e850a4;hb=035b753f2a4929225a7db8a9d49d46b54457cd81;hp=2aba3638632873b3f022036f8d2e6827b5df00c5;hpb=58546d540453ea1ddf4142a3911f9873acce1132;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 2aba3638..b7b739f5 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -5749,10 +5749,10 @@ static void ReinitializeElementList(void)
       int element = (*editor_elements_info[i].element_list)[j];
 
       if (element >= NUM_FILE_ELEMENTS)
-	Error(ERR_WARN, "editor element %d is runtime element", element);
+	Warn("editor element %d is runtime element", element);
 
       if (strEqual(getElementInfoText(element), INFOTEXT_UNKNOWN_ELEMENT))
-	Error(ERR_WARN, "no element description text for element %d", element);
+	Warn("no element description text for element %d", element);
     }
   }
 
@@ -6218,7 +6218,7 @@ static void CreateControlButtons(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
   }
@@ -6284,7 +6284,7 @@ static void CreateControlButtons(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
   }
@@ -6337,7 +6337,7 @@ static void CreateControlButtons(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
   }
@@ -6431,7 +6431,7 @@ static void CreateCounterButtons(void)
 			GDI_END);
 
       if (gi == NULL)
-	Error(ERR_EXIT, "cannot create gadget");
+	Fail("cannot create gadget");
 
       level_editor_gadget[id] = gi;
       right_gadget_border[id] =
@@ -6493,7 +6493,7 @@ static void CreateCounterButtons(void)
 			  GDI_END);
 
 	if (gi == NULL)
-	  Error(ERR_EXIT, "cannot create gadget");
+	  Fail("cannot create gadget");
 
 	level_editor_gadget[id] = gi;
 	right_gadget_border[id] =
@@ -6551,7 +6551,7 @@ static void CreateDrawingAreas(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
     right_gadget_border[id] =
@@ -6624,7 +6624,7 @@ static void CreateTextInputGadgets(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
   }
@@ -6673,7 +6673,7 @@ static void CreateTextAreaGadgets(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
   }
@@ -6752,7 +6752,7 @@ static void CreateSelectboxGadgets(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
     right_gadget_border[id] =
@@ -6836,7 +6836,7 @@ static void CreateTextbuttonGadgets(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
     right_gadget_border[id] =
@@ -6892,7 +6892,7 @@ static void CreateGraphicbuttonGadgets(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
     right_gadget_border[id] =
@@ -7007,7 +7007,7 @@ static void CreateScrollbarGadgets(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
   }
@@ -7067,7 +7067,7 @@ static void CreateCheckbuttonGadgets(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
     right_gadget_border[id] =
@@ -7132,7 +7132,7 @@ static void CreateRadiobuttonGadgets(void)
 		      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     level_editor_gadget[id] = gi;
     right_gadget_border[id] =
@@ -7151,7 +7151,7 @@ void CreateLevelEditorGadgets(void)
 
   num_editor_gadgets = NUM_EDITOR_GADGETS;
 
-  // printf("::: allocating %d gadgets ...\n", num_editor_gadgets);
+  // Debug("editor", "allocating %d gadgets ...\n", num_editor_gadgets);
 
   level_editor_gadget =
     checked_calloc(num_editor_gadgets * sizeof(struct GadgetInfo *));
@@ -7189,7 +7189,7 @@ void FreeLevelEditorGadgets(void)
 {
   int i;
 
-  // printf("::: freeing %d gadgets ...\n", num_editor_gadgets);
+  // Debug("editor", "freeing %d gadgets ...\n", num_editor_gadgets);
 
   for (i = 0; i < num_editor_gadgets; i++)
   {
@@ -8408,8 +8408,7 @@ static void CheckElementDescriptions(void)
 
   for (i = 0; i < NUM_FILE_ELEMENTS; i++)
     if (getElementDescriptionFilename(i) == NULL && !IS_OBSOLETE(i))
-      Error(ERR_WARN, "no element description file for element '%s'",
-	    EL_NAME(i));
+      Warn("no element description file for element '%s'", EL_NAME(i));
 }
 #endif
 
@@ -12072,7 +12071,7 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
 	mode == CB_BRUSH_TO_CLIPBOARD_SMALL)
       SDL_SetClipboardText(text);
     else
-      printf("%s", text);
+      Print("%s", text);	// print brush data to console and log file
 
     return;
   }
@@ -14112,13 +14111,13 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
 #ifdef DEBUG
       else if (gi->event.type == GD_EVENT_PRESSED)
-	printf("default: HandleControlButtons: GD_EVENT_PRESSED(%d)\n", id);
+	Debug("editor", "default: HandleControlButtons: GD_EVENT_PRESSED(%d)", id);
       else if (gi->event.type == GD_EVENT_RELEASED)
-	printf("default: HandleControlButtons: GD_EVENT_RELEASED(%d)\n", id);
+	Debug("editor", "default: HandleControlButtons: GD_EVENT_RELEASED(%d)", id);
       else if (gi->event.type == GD_EVENT_MOVING)
-	printf("default: HandleControlButtons: GD_EVENT_MOVING(%d)\n", id);
+	Debug("editor", "default: HandleControlButtons: GD_EVENT_MOVING(%d)", id);
       else
-	printf("default: HandleControlButtons: ? (id == %d)\n", id);
+	Debug("editor", "default: HandleControlButtons: ? (id == %d)", id);
 #endif
       break;
   }