X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=bf3704bdf94cc097f9d691b3f58d06a0c7184d99;hb=5ed4de42ced8e7dce5b786ba3d5fd1a6f6a7d7f6;hp=0c97b9eec82d6378dfd3149a99c5f609420d6201;hpb=76e9111869247eae9edd4e65ee4e8ab615110744;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 0c97b9ee..bf3704bd 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -36,8 +36,10 @@
 #define ED_SCROLL_UP		4
 #define ED_SCROLL_DOWN		8
 
-/* delay value to avoid too fast scrolling etc. */
-#define CHOICE_DELAY_VALUE	100
+/* screens in the level editor */
+#define ED_MODE_DRAWING		0
+#define ED_MODE_INFO		1
+#define ED_MODE_PROPERTIES	2
 
 /* how many steps can be cancelled */
 #define NUM_UNDO_STEPS		(10 + 1)
@@ -64,7 +66,13 @@
 #define ED_NUM_CTRL2_BUTTONS   (ED_CTRL2_BUTTONS_HORIZ * ED_CTRL2_BUTTONS_VERT)
 #define ED_NUM_CTRL_BUTTONS    (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS)
 
-/* control button names */
+/* values for other gadgets */
+#define ED_SCORE_XPOS		TILEX
+#define ED_SCORE_YPOS		(7 * TILEY)
+#define ED_COUNT_VALUE_XOFFSET	5
+#define ED_COUNT_VALUE_YOFFSET	3
+
+/* control button identifiers */
 #define ED_CTRL_ID_SINGLE_ITEMS		0
 #define ED_CTRL_ID_CONNECTED_ITEMS	1
 #define ED_CTRL_ID_LINE			2
@@ -72,7 +80,7 @@
 #define ED_CTRL_ID_RECTANGLE		4
 #define ED_CTRL_ID_FILLED_BOX		5
 #define ED_CTRL_ID_WRAP_UP		6
-#define ED_CTRL_ID_ITEM_PROPERTIES	7
+#define ED_CTRL_ID_PROPERTIES		7
 #define ED_CTRL_ID_FLOOD_FILL		8
 #define ED_CTRL_ID_WRAP_LEFT		9
 #define ED_CTRL_ID_WRAP_RIGHT		11
@@ -86,14 +94,39 @@
 #define ED_CTRL_ID_TEST			20
 #define ED_CTRL_ID_EXIT			21
 
+/* counter button identifiers */
+#define ED_CTRL_ID_SCORE_DOWN		22
+#define ED_CTRL_ID_SCORE_UP		23
+
+/* drawing area identifiers */
+#define ED_CTRL_ID_DRAWING_LEVEL	24
+
+#define ED_NUM_GADGETS			25
+
+/* values for counter gadgets */
+#define ED_COUNTER_SCORE		0
+
+#define ED_NUM_COUNTERS			1
+
+static struct
+{
+  int x, y;
+  int gadget_id;
+} counter_info[ED_NUM_COUNTERS] =
+{
+  { ED_SCORE_XPOS,	ED_SCORE_YPOS,		ED_CTRL_ID_SCORE_DOWN }
+};
+
 /* forward declaration for internal use */
-void HandleDrawingFunctions(int, int, int);
-void HandlePressedControlButtons();
-void HandleControlButtons(struct GadgetInfo *);
+static void DrawDrawingWindow();
+static void DrawPropertiesWindow(int);
+static void CopyLevelToUndoBuffer();
+static void HandleDrawingAreas(struct GadgetInfo *);
+static void HandleCounterButtons(struct GadgetInfo *);
+static void HandleControlButtons(struct GadgetInfo *);
 
-static struct GadgetInfo *control_button_gadget[ED_NUM_CTRL_BUTTONS];
-static boolean control_button_gadgets_created = FALSE;
-static boolean control_button_gadgets_mapped = FALSE;
+static struct GadgetInfo *level_editor_gadget[ED_NUM_GADGETS];
+static boolean level_editor_gadgets_created = FALSE;
 
 static int drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
 
@@ -110,8 +143,11 @@ static int random_placement_method = RANDOM_USE_PERCENTAGE;
 static int random_placement_method = RANDOM_USE_NUM_OBJECTS;
 #endif
 
+/* pointer to score value */
+static int *gadget_score_value;
+
 static int level_xpos,level_ypos;
-static boolean edit_mode;
+static int edit_mode;
 static boolean name_typing;
 static int new_element1 = EL_MAUERWERK;
 static int new_element2 = EL_LEERRAUM;
@@ -413,7 +449,7 @@ int editor_element[] =
 };
 int elements_in_list = sizeof(editor_element)/sizeof(int);
 
-void ScrollMiniLevel(int from_x, int from_y, int scroll)
+static void ScrollMiniLevel(int from_x, int from_y, int scroll)
 {
   int x,y;
   int dx = (scroll==ED_SCROLL_LEFT ? -1 : scroll==ED_SCROLL_RIGHT ? 1 : 0);
@@ -440,12 +476,17 @@ void ScrollMiniLevel(int from_x, int from_y, int scroll)
   BackToFront();
 }
 
-void CreateLevelEditorControlButtons()
+void InitLevelEditorGadgets()
 {
   int i;
 
-  if (control_button_gadgets_created)
-    return;
+  for (i=0; i<ED_NUM_GADGETS; i++)
+    level_editor_gadget[i] = NULL;
+}
+
+static void CreateControlButtons()
+{
+  int i;
 
   for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
   {
@@ -455,6 +496,7 @@ void CreateLevelEditorControlButtons()
     int gd_x1, gd_x2, gd_y;
     int width, height;
     unsigned long event_mask;
+    int id = i;
 
     if (i < ED_NUM_CTRL1_BUTTONS)
     {
@@ -485,11 +527,12 @@ void CreateLevelEditorControlButtons()
 	i == ED_CTRL_ID_WRAP_RIGHT ||
 	i == ED_CTRL_ID_WRAP_UP ||
 	i == ED_CTRL_ID_WRAP_DOWN)
-      event_mask = GD_EVENT_PRESSED;
+      event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
     else
       event_mask = GD_EVENT_RELEASED;
 
-    gi = CreateGadget(GDI_X, EX + gd_xoffset,
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_X, EX + gd_xoffset,
 		      GDI_Y, EY + gd_yoffset,
 		      GDI_WIDTH, width,
 		      GDI_HEIGHT, height,
@@ -504,36 +547,123 @@ void CreateLevelEditorControlButtons()
     if (gi == NULL)
       Error(ERR_EXIT, "cannot create gadget");
 
-    control_button_gadget[i] = gi;
+    level_editor_gadget[id] = gi;
   }
-
-  control_button_gadgets_created = TRUE;
 }
 
-void MapLevelEditorControlButtons()
+static void CreateCounterButtons(int counter_id)
 {
   int i;
 
-  if (!control_button_gadgets_created)
-    CreateLevelEditorControlButtons();
+  for (i=0; i<2; i++)
+  {
+    Pixmap gd_pixmap = pix[PIX_DOOR];
+    struct GadgetInfo *gi;
+    int gd_xoffset;
+    int gd_x1, gd_x2, gd_y;
+    int id = counter_info[counter_id].gadget_id + i;
+    unsigned long event_mask;
+
+    event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
 
-  for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
-    MapGadget(control_button_gadget[i]);
+    gd_xoffset = (i == 0 ? ED_BUTTON_MINUS_XPOS : ED_BUTTON_PLUS_XPOS);
+    gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset;
+    gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
+    gd_y  = DOOR_GFX_PAGEY1 + ED_BUTTON_COUNT_YPOS;
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_X, SX + counter_info[counter_id].x + gd_xoffset,
+		      GDI_Y, SY + counter_info[counter_id].y,
+		      GDI_WIDTH, ED_BUTTON_COUNT_XSIZE,
+		      GDI_HEIGHT, ED_BUTTON_COUNT_YSIZE,
+		      GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+		      GDI_STATE, GD_BUTTON_UNPRESSED,
+		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
+		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
+		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK, HandleCounterButtons,
+		      GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
 
-  control_button_gadgets_mapped = TRUE;
+    level_editor_gadget[id] = gi;
+  }
 }
 
-void UnmapLevelEditorControlButtons()
+static void CreateDrawingAreas()
 {
-  int i;
+  struct GadgetInfo *gi;
+  unsigned long event_mask;
+
+  event_mask =
+    GD_EVENT_PRESSED | GD_EVENT_RELEASED | GD_EVENT_MOVING |
+    GD_EVENT_OFF_BORDERS;
+
+  gi = CreateGadget(GDI_CUSTOM_ID, ED_CTRL_ID_DRAWING_LEVEL,
+		    GDI_X, SX,
+		    GDI_Y, SY,
+		    GDI_WIDTH, SXSIZE,
+		    GDI_HEIGHT, SYSIZE,
+		    GDI_TYPE, GD_TYPE_DRAWING_AREA,
+		    GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
+		    GDI_EVENT_MASK, event_mask,
+		    GDI_CALLBACK, HandleDrawingAreas,
+		    GDI_END);
+
+  if (gi == NULL)
+    Error(ERR_EXIT, "cannot create gadget");
+
+  level_editor_gadget[ED_CTRL_ID_DRAWING_LEVEL] = gi;
+}
 
-  if (!control_button_gadgets_created || !control_button_gadgets_mapped)
+static void CreateLevelEditorGadgets()
+{
+  if (level_editor_gadgets_created)
     return;
 
+  CreateControlButtons();
+  CreateCounterButtons(ED_COUNTER_SCORE);
+  CreateDrawingAreas();
+
+  level_editor_gadgets_created = TRUE;
+}
+
+static void MapControlButtons()
+{
+  int i;
+
   for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
-    UnmapGadget(control_button_gadget[i]);
+    MapGadget(level_editor_gadget[i]);
+}
 
-  control_button_gadgets_mapped = FALSE;
+static void MapCounterButtons(int counter_id)
+{
+  int i;
+
+  for (i=0; i<2; i++)
+    MapGadget(level_editor_gadget[counter_info[counter_id].gadget_id + i]);
+}
+
+static void MapMainDrawingArea()
+{
+  MapGadget(level_editor_gadget[ED_CTRL_ID_DRAWING_LEVEL]);
+}
+
+void UnmapLevelEditorWindowGadgets()
+{
+  int i;
+
+  for (i=ED_NUM_CTRL_BUTTONS; i<ED_NUM_GADGETS; i++)
+    UnmapGadget(level_editor_gadget[i]);
+}
+
+void UnmapLevelEditorGadgets()
+{
+  int i;
+
+  for (i=0; i<ED_NUM_GADGETS; i++)
+    UnmapGadget(level_editor_gadget[i]);
 }
 
 void DrawLevelEd()
@@ -542,7 +672,7 @@ void DrawLevelEd()
 
   level_xpos=-1;
   level_ypos=-1;
-  edit_mode = TRUE;
+  edit_mode = ED_MODE_DRAWING;
   name_typing = FALSE;
   element_shift = 0;
 
@@ -562,11 +692,9 @@ void DrawLevelEd()
   }
   else
   {
-    undo_buffer_position = 0;
-    undo_buffer_steps = 0;
-    for(x=0; x<lev_fieldx; x++)
-      for(y=0; y<lev_fieldy; y++)
-	UndoBuffer[0][x][y] = Ur[x][y];
+    undo_buffer_position = -1;
+    undo_buffer_steps = -1;
+    CopyLevelToUndoBuffer();
   }
 
   DrawMiniLevel(level_xpos,level_ypos);
@@ -648,7 +776,11 @@ void DrawLevelEd()
 
   OpenDoor(DOOR_OPEN_1);
 
-  MapLevelEditorControlButtons();
+  if (!level_editor_gadgets_created)
+    CreateLevelEditorGadgets();
+
+  MapControlButtons();
+  MapMainDrawingArea();
 
   /*
   OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
@@ -660,6 +792,7 @@ void DrawControlWindow()
   int i,x,y;
 
   ClearWindow();
+  UnmapLevelEditorWindowGadgets();
 
   /* Inhalt der Mampfer */
   DrawText(ED_COUNT_GADGET_XPOS+1,SY+6,
@@ -842,9 +975,10 @@ void LevelEd(int mx, int my, int button)
   int y = (my-SY)/MINI_TILEY; 
   */
 
-
+  /*
   HandlePressedControlButtons();
   HandleDrawingFunctions(mx, my, button);
+  */
 
   if (use_floodfill)		/********** FLOOD FILL **********/
   {
@@ -896,7 +1030,7 @@ void LevelEd(int mx, int my, int button)
     if (((choice == ED_BUTTON_EUP && element_shift>0) ||
 	 (choice == ED_BUTTON_EDOWN &&
 	  element_shift<elements_in_list-MAX_ELEM_X*MAX_ELEM_Y)) &&
-	DelayReached(&choice_delay, CHOICE_DELAY_VALUE))
+	DelayReached(&choice_delay, GADGET_FRAME_DELAY))
     {
       int i, step;
 
@@ -942,9 +1076,12 @@ void LevelEd(int mx, int my, int button)
 			 DY+ED_WIN_MB_RIGHT_YPOS,
 			 el2gfx(new_element3));
       redraw_mask |= REDRAW_DOOR_1;
+
+      if (edit_mode == ED_MODE_PROPERTIES)
+	DrawPropertiesWindow(new_element);
     }
   
-    if (edit_mode)		/********** EDIT-FENSTER **********/
+    if (edit_mode == ED_MODE_DRAWING)	/********** EDIT-FENSTER **********/
     {
 
 
@@ -961,7 +1098,7 @@ void LevelEd(int mx, int my, int button)
 		    VXSIZE,VYSIZE,
 		    DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
 	  OpenDoor(DOOR_OPEN_2);
-	  edit_mode = FALSE;
+	  edit_mode = ED_MODE_INFO;
 	  break;
 	case ED_BUTTON_FILL:
 	  Request("Caution ! Flood fill mode ! Choose area !",REQ_OPEN);
@@ -971,7 +1108,7 @@ void LevelEd(int mx, int my, int button)
 	case ED_BUTTON_LEFT:
 	  if (level_xpos>=0)
 	  {
-	    if (!DelayReached(&choice_delay, CHOICE_DELAY_VALUE))
+	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
 	      break;
 	    if (lev_fieldx<2*SCR_FIELDX-2)
 	      break;
@@ -988,7 +1125,7 @@ void LevelEd(int mx, int my, int button)
 	case ED_BUTTON_RIGHT:
 	  if (level_xpos<=lev_fieldx-2*SCR_FIELDX)
 	  {
-	    if (!DelayReached(&choice_delay, CHOICE_DELAY_VALUE))
+	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
 	      break;
 	    if (lev_fieldx<2*SCR_FIELDX-2)
 	      break;
@@ -1005,7 +1142,7 @@ void LevelEd(int mx, int my, int button)
 	case ED_BUTTON_UP:
 	  if (level_ypos>=0)
 	  {
-	    if (!DelayReached(&choice_delay, CHOICE_DELAY_VALUE))
+	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
 	      break;
 	    if (lev_fieldy<2*SCR_FIELDY-2)
 	      break;
@@ -1022,7 +1159,7 @@ void LevelEd(int mx, int my, int button)
 	case ED_BUTTON_DOWN:
 	  if (level_ypos<=lev_fieldy-2*SCR_FIELDY)
 	  {
-	    if (!DelayReached(&choice_delay, CHOICE_DELAY_VALUE))
+	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
 	      break;
 	    if (lev_fieldy<2*SCR_FIELDY-2)
 	      break;
@@ -1095,13 +1232,13 @@ void LevelEd(int mx, int my, int button)
 
 
     }
-    else			/********** KONTROLL-FENSTER **********/
+    else if (edit_mode == ED_MODE_INFO)/********** KONTROLL-FENSTER **********/
     {
       int choice = CheckCountButtons(mx,my,button);
       int step = (button==1 ? 1 : button==2 ? 5 : button==3 ? 10 : 0);
 
       if (choice >= 0 && choice < 36 &&
-	  DelayReached(&choice_delay, CHOICE_DELAY_VALUE))
+	  DelayReached(&choice_delay, GADGET_FRAME_DELAY))
       {
 	if (!(choice % 2))
 	  step = -step;
@@ -1241,7 +1378,7 @@ void LevelEd(int mx, int my, int button)
 		    VXSIZE,VYSIZE,
 		    DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
 	  OpenDoor(DOOR_OPEN_2);
-	  edit_mode = TRUE;
+	  edit_mode = ED_MODE_DRAWING;
 	  break;
 	case ED_BUTTON_CLEAR:
 	  if (Request("Are you sure to clear this level ?",REQ_ASK))
@@ -1490,6 +1627,124 @@ void LevelNameTyping(KeySym key)
   }
 }
 
+static void DrawCounterValueField(int counter_id, int value)
+{
+  int x = SX + counter_info[counter_id].x + ED_WIN_COUNT_XPOS;
+  int y = SY + counter_info[counter_id].y;
+
+  XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+	    DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS,
+	    DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS,
+	    ED_WIN_COUNT_XSIZE, ED_WIN_COUNT_YSIZE,
+	    x, y);
+
+  DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
+	   int2str(value, 3), FS_SMALL, FC_YELLOW);
+}
+
+#define TEXT_COLLECTING		"Score for collecting"
+#define TEXT_SMASHING		"Score for smashing"
+#define TEXT_CRACKING		"Score for cracking"
+#define TEXT_SPEED		"Speed of growth"
+#define TEXT_DURATION		"Duration when activated"
+
+static void DrawDrawingWindow()
+{
+  ClearWindow();
+  UnmapLevelEditorWindowGadgets();
+  MapMainDrawingArea();
+  AdjustLevelScrollPosition();
+  DrawMiniLevel(level_xpos, level_ypos);
+}
+
+static void DrawPropertiesWindow(int element)
+{
+  int i, x, y;
+  int num_elements_in_level;
+  static struct
+  {
+    int element;
+    int *counter_value;
+    char *text;
+  } elements_with_counter[] =
+  {
+    { EL_EDELSTEIN,	&level.score[0],	TEXT_COLLECTING },
+    { EL_EDELSTEIN_BD,	&level.score[0],	TEXT_COLLECTING },
+    { EL_EDELSTEIN_GELB,&level.score[0],	TEXT_COLLECTING },
+    { EL_EDELSTEIN_ROT,	&level.score[0],	TEXT_COLLECTING },
+    { EL_EDELSTEIN_LILA,&level.score[0],	TEXT_COLLECTING },
+    { EL_DIAMANT,	&level.score[1],	TEXT_COLLECTING },
+    { EL_KAEFER_R,	&level.score[2],	TEXT_SMASHING },
+    { EL_KAEFER_O,	&level.score[2],	TEXT_SMASHING },
+    { EL_KAEFER_L,	&level.score[2],	TEXT_SMASHING },
+    { EL_KAEFER_U,	&level.score[2],	TEXT_SMASHING },
+    { EL_BUTTERFLY_R,	&level.score[2],	TEXT_SMASHING },
+    { EL_BUTTERFLY_O,	&level.score[2],	TEXT_SMASHING },
+    { EL_BUTTERFLY_L,	&level.score[2],	TEXT_SMASHING },
+    { EL_BUTTERFLY_U,	&level.score[2],	TEXT_SMASHING },
+    { EL_FLIEGER_R,	&level.score[3],	TEXT_SMASHING },
+    { EL_FLIEGER_O,	&level.score[3],	TEXT_SMASHING },
+    { EL_FLIEGER_L,	&level.score[3],	TEXT_SMASHING },
+    { EL_FLIEGER_U,	&level.score[3],	TEXT_SMASHING },
+    { EL_FIREFLY_R,	&level.score[3],	TEXT_SMASHING },
+    { EL_FIREFLY_O,	&level.score[3],	TEXT_SMASHING },
+    { EL_FIREFLY_L,	&level.score[3],	TEXT_SMASHING },
+    { EL_FIREFLY_U,	&level.score[3],	TEXT_SMASHING },
+    { EL_MAMPFER,	&level.score[4],	TEXT_SMASHING },
+    { EL_MAMPFER2,	&level.score[4],	TEXT_SMASHING },
+    { EL_ROBOT,		&level.score[5],	TEXT_SMASHING },
+    { EL_PACMAN_R,	&level.score[6],	TEXT_SMASHING },
+    { EL_PACMAN_O,	&level.score[6],	TEXT_SMASHING },
+    { EL_PACMAN_L,	&level.score[6],	TEXT_SMASHING },
+    { EL_PACMAN_U,	&level.score[6],	TEXT_SMASHING },
+    { EL_KOKOSNUSS,	&level.score[7],	TEXT_CRACKING },
+    { EL_DYNAMIT_AUS,	&level.score[8],	TEXT_COLLECTING },
+    { EL_SCHLUESSEL1,	&level.score[9],	TEXT_COLLECTING },
+    { EL_SCHLUESSEL2,	&level.score[9],	TEXT_COLLECTING },
+    { EL_SCHLUESSEL3,	&level.score[9],	TEXT_COLLECTING },
+    { EL_SCHLUESSEL4,	&level.score[9],	TEXT_COLLECTING },
+    { EL_AMOEBE_NASS,	&level.tempo_amoebe,	TEXT_SPEED },
+    { EL_AMOEBE_NORM,	&level.tempo_amoebe,	TEXT_SPEED },
+    { EL_AMOEBE_VOLL,	&level.tempo_amoebe,	TEXT_SPEED },
+    { EL_AMOEBE_BD,	&level.tempo_amoebe,	TEXT_SPEED },
+    { EL_SIEB_LEER,	&level.dauer_sieb,	TEXT_DURATION },
+    { EL_ABLENK_AUS,	&level.dauer_ablenk,	TEXT_DURATION },
+    { -1, NULL, NULL }
+  };
+
+  ClearWindow();
+  UnmapLevelEditorWindowGadgets();
+
+  DrawGraphic(1, 1, el2gfx(element));
+  DrawText(SX + 3*TILEX, SY + 5*TILEY/4, "Element Properties",
+	   FS_SMALL, FC_YELLOW);
+
+  num_elements_in_level = 0;
+  for(y=0; y<lev_fieldy; y++) 
+    for(x=0; x<lev_fieldx; x++)
+      if (Feld[x][y] == element)
+	num_elements_in_level++;
+
+  DrawTextF(TILEX, 5*TILEY, FC_YELLOW, "%d x contained in level",
+	    num_elements_in_level);
+
+  for (i=0; elements_with_counter[i].element != -1; i++)
+  {
+    if (elements_with_counter[i].element == element)
+    {
+      int x = SX + counter_info[ED_COUNTER_SCORE].x + DXSIZE;
+      int y = SY + counter_info[ED_COUNTER_SCORE].y;
+
+      gadget_score_value = elements_with_counter[i].counter_value;
+      DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
+      DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
+	       elements_with_counter[i].text, FS_SMALL, FC_YELLOW);
+      MapCounterButtons(ED_COUNTER_SCORE);
+      break;
+    }
+  }
+}
+
 static void swap_numbers(int *i1, int *i2)
 {
   int help = *i1;
@@ -1521,8 +1776,8 @@ static void DrawLineElement(int sx, int sy, int element, boolean change_level)
     Feld[lx][ly] = element;
 }
 
-void DrawLine(int from_x, int from_y, int to_x, int to_y, int element,
-	      boolean change_level)
+static void DrawLine(int from_x, int from_y, int to_x, int to_y,
+		     int element, boolean change_level)
 {
   if (from_y == to_y)			/* horizontal line */
   {
@@ -1583,8 +1838,8 @@ void DrawLine(int from_x, int from_y, int to_x, int to_y, int element,
   }
 }
 
-void DrawRectangle(int from_x, int from_y, int to_x, int to_y, int element,
-		   boolean change_level)
+static void DrawRectangle(int from_x, int from_y, int to_x, int to_y,
+			  int element, boolean change_level)
 {
   DrawLine(from_x, from_y, from_x, to_y, element, change_level);
   DrawLine(from_x, to_y, to_x, to_y, element, change_level);
@@ -1592,8 +1847,8 @@ void DrawRectangle(int from_x, int from_y, int to_x, int to_y, int element,
   DrawLine(to_x, from_y, from_x, from_y, element, change_level);
 }
 
-void DrawFilledBox(int from_x, int from_y, int to_x, int to_y, int element,
-		   boolean change_level)
+static void DrawFilledBox(int from_x, int from_y, int to_x, int to_y,
+			  int element, boolean change_level)
 {
   int y;
 
@@ -1604,7 +1859,7 @@ void DrawFilledBox(int from_x, int from_y, int to_x, int to_y, int element,
     DrawLine(from_x, y, to_x, y, element, change_level);
 }
 
-void FloodFill(int from_x, int from_y, int fill_element)
+static void FloodFill(int from_x, int from_y, int fill_element)
 {
   int i,x,y;
   int old_element;
@@ -1635,7 +1890,7 @@ void FloodFill(int from_x, int from_y, int fill_element)
   safety--;
 }
 
-void CopyLevelToUndoBuffer()
+static void CopyLevelToUndoBuffer()
 {
   int x, y;
 
@@ -1647,15 +1902,9 @@ void CopyLevelToUndoBuffer()
   for(x=0; x<lev_fieldx; x++)
     for(y=0; y<lev_fieldy; y++)
       UndoBuffer[undo_buffer_position][x][y] = Feld[x][y];
-
-
-
-  /*
-    printf("state saved to undo buffer %d\n", undo_buffer_position);
-  */
 }
 
-void RandomPlacement(int button)
+static void RandomPlacement(int button)
 {
   int new_element;
   int x, y;
@@ -1664,8 +1913,6 @@ void RandomPlacement(int button)
 		 button == 2 ? new_element2 :
 		 button == 3 ? new_element3 : 0);
 
-  CopyLevelToUndoBuffer();
-
   if (random_placement_method == RANDOM_USE_PERCENTAGE)
   {
     for(x=0; x<lev_fieldx; x++)
@@ -1693,28 +1940,38 @@ void RandomPlacement(int button)
   DrawMiniLevel(level_xpos, level_ypos);
 }
 
-void HandleDrawingFunctions(int mx, int my, int button)
+static void HandleDrawingAreas(struct GadgetInfo *gi)
 {
-  static int last_button = 0;
-  static int last_element = 0;
+  static boolean started_inside_drawing_area = FALSE;
+  boolean inside_drawing_area = !gi->event.off_borders;
   boolean button_press_event;
   boolean button_release_event;
-  boolean copy_to_undo_buffer = FALSE;
   int new_element;
-  int sx = (mx - SX) / MINI_TILEX; 
-  int sy = (my - SY) / MINI_TILEY; 
-  int lx = sx + level_xpos;
-  int ly = sy + level_ypos;
+  int button = gi->event.button;
+  int sx = gi->event.x, sy = gi->event.y;
+  int lx, ly;
   int x, y;
 
-  if (!edit_mode)
+  if (edit_mode != ED_MODE_DRAWING)
     return;
 
-  button_press_event = (last_button == 0 && button != 0);
-  button_release_event = (last_button != 0 && button == 0);
-  last_button = button;
+  button_press_event = (gi->event.type == GD_EVENT_PRESSED);
+  button_release_event = (gi->event.type == GD_EVENT_RELEASED);
+
+  sx = (sx < 0 ? 0 : sx > 2*SCR_FIELDX - 1 ? 2*SCR_FIELDX - 1 : sx);
+  sy = (sy < 0 ? 0 : sy > 2*SCR_FIELDY - 1 ? 2*SCR_FIELDY - 1 : sy);
+  lx = sx + level_xpos;
+  ly = sy + level_ypos;
+
+  lx = (lx < 0 ? 0 : lx > lev_fieldx - 1 ? lev_fieldx - 1 : lx);
+  ly = (ly < 0 ? 0 : ly > lev_fieldy - 1 ? lev_fieldy - 1 : ly);
+  sx = lx - level_xpos;
+  sy = ly - level_ypos;
 
-  if (mx < SX || mx >= SX + SXSIZE || my < SY || my >= SY + SYSIZE)
+  if (button_press_event)
+    started_inside_drawing_area = inside_drawing_area;
+
+  if (!started_inside_drawing_area)
     return;
 
   if ((!button && !button_release_event) ||
@@ -1733,7 +1990,7 @@ void HandleDrawingFunctions(int mx, int my, int button)
   {
     case ED_CTRL_ID_SINGLE_ITEMS:
       if (button_release_event)
-	copy_to_undo_buffer = TRUE;
+	CopyLevelToUndoBuffer();
 
       if (!button)
 	break;
@@ -1769,7 +2026,7 @@ void HandleDrawingFunctions(int mx, int my, int button)
 	static int last_sy = -1;
 
 	if (button_release_event)
-	  copy_to_undo_buffer = TRUE;
+	  CopyLevelToUndoBuffer();
 
 	if (button)
 	{
@@ -1803,11 +2060,12 @@ void HandleDrawingFunctions(int mx, int my, int button)
 	{
 	  last_sx = start_sx = sx;
 	  last_sy = start_sy = sy;
+	  draw_func(sx, sy, sx, sy, new_element, FALSE);
 	}
 	else if (button_release_event)
 	{
-	  draw_func(start_sx, start_sy, sx, sy, last_element, TRUE);
-	  copy_to_undo_buffer = TRUE;
+	  draw_func(start_sx, start_sy, sx, sy, new_element, TRUE);
+	  CopyLevelToUndoBuffer();
 	}
 	else if (last_sx != sx || last_sy != sy)
 	{
@@ -1824,140 +2082,57 @@ void HandleDrawingFunctions(int mx, int my, int button)
       {
 	FloodFill(lx, ly, new_element);
 	DrawMiniLevel(level_xpos, level_ypos);
-	copy_to_undo_buffer = TRUE;
+	CopyLevelToUndoBuffer();
       }
       break;
 
     default:
       break;
   }
-
-  last_element = new_element;
-
-  if (copy_to_undo_buffer)
-    CopyLevelToUndoBuffer();
-  copy_to_undo_buffer = FALSE;
 }
 
-void HandlePressedControlButtons()
+static void HandleCounterButtons(struct GadgetInfo *gi)
 {
-  static unsigned long button_delay = 0;
-  int i = 0;
-
-  /* buttons with action when held pressed */
-  int gadget_id[] =
-  {
-    ED_CTRL_ID_WRAP_UP,
-    ED_CTRL_ID_WRAP_LEFT,
-    ED_CTRL_ID_WRAP_RIGHT,
-    ED_CTRL_ID_WRAP_DOWN,
-    -1
-  };
-
-  if (!DelayReached(&button_delay, CHOICE_DELAY_VALUE))
-    return;
+  int id = gi->custom_id;
+  int button = gi->event.button;
+  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
 
-  while (gadget_id[i] != -1)
+  switch (id)
   {
-    int id = gadget_id[i++];
-    int state = control_button_gadget[id]->state;
-    int button = control_button_gadget[id]->event.button;
-    int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+    case ED_CTRL_ID_SCORE_DOWN:
+    case ED_CTRL_ID_SCORE_UP:
+      *gadget_score_value += (id == ED_CTRL_ID_SCORE_DOWN ? -step : step);
+      if (*gadget_score_value < 0)
+	*gadget_score_value = 0;
+      else if (*gadget_score_value > 255)
+	*gadget_score_value = 255;
+
+      DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
+      break;
 
-    if (state != GD_BUTTON_PRESSED)
-      continue;
-  
-    switch (id)
-    {
-      case ED_CTRL_ID_WRAP_LEFT:
-  	if (level_xpos >= 0)
-  	{
-  	  if (lev_fieldx < 2*SCR_FIELDX - 2)
-  	    break;
-  
-  	  level_xpos -= step;
-  	  if (level_xpos <- 1)
-  	    level_xpos = -1;
-  	  if (button == 1)
-  	    ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_RIGHT);
-  	  else
-  	    DrawMiniLevel(level_xpos, level_ypos);
-  	}
-  	break;
-  
-      case ED_CTRL_ID_WRAP_RIGHT:
-  	if (level_xpos <= lev_fieldx - 2*SCR_FIELDX)
-  	{
-  	  if (lev_fieldx < 2*SCR_FIELDX - 2)
-  	    break;
-  
-  	  level_xpos += step;
-  	  if (level_xpos > lev_fieldx - 2*SCR_FIELDX + 1)
-  	    level_xpos = lev_fieldx - 2*SCR_FIELDX + 1;
-  	  if (button == 1)
-  	    ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_LEFT);
-  	  else
-  	    DrawMiniLevel(level_xpos, level_ypos);
-  	}
-  	break;
-  
-      case ED_CTRL_ID_WRAP_UP:
-  	if (level_ypos >= 0)
-  	{
-  	  if (lev_fieldy < 2*SCR_FIELDY - 2)
-  	    break;
-  
-  	  level_ypos -= step;
-  	  if (level_ypos < -1)
-  	    level_ypos = -1;
-  	  if (button == 1)
-  	    ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_DOWN);
-  	  else
-  	    DrawMiniLevel(level_xpos, level_ypos);
-  	}
-  	break;
-  
-      case ED_CTRL_ID_WRAP_DOWN:
-  	if (level_ypos <= lev_fieldy - 2*SCR_FIELDY)
-  	{
-  	  if (lev_fieldy < 2*SCR_FIELDY - 2)
-  	    break;
-  
-  	  level_ypos += step;
-  	  if (level_ypos > lev_fieldy - 2*SCR_FIELDY + 1)
-  	    level_ypos = lev_fieldy - 2*SCR_FIELDY + 1;
-  	  if (button == 1)
-  	    ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_UP);
-  	  else
-  	    DrawMiniLevel(level_xpos, level_ypos);
-  	}
-  	break;
-  
-      default:
-	break;
-    }
+    default:
+      break;
   }
 }
 
-void HandleControlButtons(struct GadgetInfo *gi)
+static void HandleControlButtons(struct GadgetInfo *gi)
 {
-  int event_type = gi->event.type;
+  int id = gi->custom_id;
   int button = gi->event.button;
+  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+  int new_element;
   int player_present = FALSE;
   int level_changed = FALSE;
-  int id;
-  int i, x, y;
+  int x, y;
 
-  /* get the button id */
-  for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
-    if (gi->id == control_button_gadget[i]->id)
-      id = i;
+  new_element = (button == 1 ? new_element1 :
+		 button == 2 ? new_element2 :
+		 button == 3 ? new_element3 : 0);
 
-  if (id < ED_NUM_CTRL1_BUTTONS && !edit_mode)
+  if (id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_DRAWING)
   {
-    AdjustLevelScrollPosition();
-    DrawMiniLevel(level_xpos, level_ypos);
-    edit_mode = TRUE;
+    DrawDrawingWindow();
+    edit_mode = ED_MODE_DRAWING;
   }
 
   switch (id)
@@ -1973,8 +2148,78 @@ void HandleControlButtons(struct GadgetInfo *gi)
       drawing_function = id;
       break;
 
+    case ED_CTRL_ID_WRAP_LEFT:
+      if (level_xpos >= 0)
+      {
+	if (lev_fieldx < 2*SCR_FIELDX - 2)
+	  break;
+
+	level_xpos -= step;
+	if (level_xpos <- 1)
+	  level_xpos = -1;
+	if (button == 1)
+	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_RIGHT);
+	else
+	  DrawMiniLevel(level_xpos, level_ypos);
+      }
+      break;
+
+    case ED_CTRL_ID_WRAP_RIGHT:
+      if (level_xpos <= lev_fieldx - 2*SCR_FIELDX)
+      {
+	if (lev_fieldx < 2*SCR_FIELDX - 2)
+	  break;
+
+	level_xpos += step;
+	if (level_xpos > lev_fieldx - 2*SCR_FIELDX + 1)
+	  level_xpos = lev_fieldx - 2*SCR_FIELDX + 1;
+	if (button == 1)
+	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_LEFT);
+	else
+	  DrawMiniLevel(level_xpos, level_ypos);
+      }
+      break;
+
+    case ED_CTRL_ID_WRAP_UP:
+      if (level_ypos >= 0)
+      {
+	if (lev_fieldy < 2*SCR_FIELDY - 2)
+	  break;
+
+	level_ypos -= step;
+	if (level_ypos < -1)
+	  level_ypos = -1;
+	if (button == 1)
+	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_DOWN);
+	else
+	  DrawMiniLevel(level_xpos, level_ypos);
+      }
+      break;
+
+    case ED_CTRL_ID_WRAP_DOWN:
+      if (level_ypos <= lev_fieldy - 2*SCR_FIELDY)
+      {
+	if (lev_fieldy < 2*SCR_FIELDY - 2)
+	  break;
+
+	level_ypos += step;
+	if (level_ypos > lev_fieldy - 2*SCR_FIELDY + 1)
+	  level_ypos = lev_fieldy - 2*SCR_FIELDY + 1;
+	if (button == 1)
+	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_UP);
+	else
+	  DrawMiniLevel(level_xpos, level_ypos);
+      }
+      break;
+
+    case ED_CTRL_ID_PROPERTIES:
+      DrawPropertiesWindow(new_element);
+      edit_mode = ED_MODE_PROPERTIES;
+      break;
+
     case ED_CTRL_ID_RANDOM_PLACEMENT:
       RandomPlacement(button);
+      CopyLevelToUndoBuffer();
       break;
 
     case ED_CTRL_ID_UNDO:
@@ -1995,25 +2240,24 @@ void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     case ED_CTRL_ID_INFO:
-      if (edit_mode)
+      if (edit_mode != ED_MODE_INFO)
       {
 	DrawControlWindow();
-	edit_mode = FALSE;
+	edit_mode = ED_MODE_INFO;
       }
       else
       {
 	AdjustLevelScrollPosition();
 	DrawMiniLevel(level_xpos, level_ypos);
-	edit_mode = TRUE;
+	edit_mode = ED_MODE_DRAWING;
       }
       break;
 
     case ED_CTRL_ID_CLEAR:
-      CopyLevelToUndoBuffer();
-
       for(x=0; x<MAX_LEV_FIELDX; x++) 
 	for(y=0; y<MAX_LEV_FIELDY; y++) 
 	  Feld[x][y] = new_element3;
+      CopyLevelToUndoBuffer();
 
       DrawMiniLevel(level_xpos, level_ypos);
       break;
@@ -2116,12 +2360,14 @@ void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     default:
-      if (event_type == GD_EVENT_PRESSED)
-	printf("HandleControlButtons: GD_EVENT_PRESSED\n");
-      else if (event_type == GD_EVENT_RELEASED)
-	printf("HandleControlButtons: GD_EVENT_RELEASED\n");
+      if (gi->event.type == GD_EVENT_PRESSED)
+	printf("default: HandleControlButtons: GD_EVENT_PRESSED\n");
+      else if (gi->event.type == GD_EVENT_RELEASED)
+	printf("default: HandleControlButtons: GD_EVENT_RELEASED\n");
+      else if (gi->event.type == GD_EVENT_MOVING)
+	printf("default: HandleControlButtons: GD_EVENT_MOVING\n");
       else
-	printf("HandleControlButtons: ?\n");
+	printf("default: HandleControlButtons: ?\n");
       break;
   }
 }