projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3f3ea56
)
rnd-19990117-1
author
Holger Schemel
<info@artsoft.org>
Sun, 17 Jan 1999 21:29:18 +0000
(22:29 +0100)
committer
Holger Schemel
<info@artsoft.org>
Sat, 30 Aug 2014 08:33:03 +0000
(10:33 +0200)
src/editor.c
patch
|
blob
|
history
diff --git
a/src/editor.c
b/src/editor.c
index 7312964bdf364ac708a91767c388b8c127549b21..cb50572ecf4d45a8d1cd285caf254a16b55b16ac 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-1085,13
+1085,13
@@
static void CreateScrollbarGadgets()
if (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL)
{
if (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL)
{
- items_max =
lev_fieldx + 2
;
+ items_max =
MAX(lev_fieldx + 2, ED_FIELDX)
;
items_visible = ED_FIELDX;
item_position = 0;
}
else
{
items_visible = ED_FIELDX;
item_position = 0;
}
else
{
- items_max =
lev_fieldy + 2
;
+ items_max =
MAX(lev_fieldy + 2, ED_FIELDY)
;
items_visible = ED_FIELDY;
item_position = 0;
}
items_visible = ED_FIELDY;
item_position = 0;
}
@@
-1516,13
+1516,13
@@
void AdjustEditorScrollbar(int id)
if (id == ED_CTRL_ID_SCROLL_HORIZONTAL)
{
if (id == ED_CTRL_ID_SCROLL_HORIZONTAL)
{
- items_max =
lev_fieldx + 2
;
+ items_max =
MAX(lev_fieldx + 2, ED_FIELDX)
;
items_visible = ED_FIELDX;
item_position = level_xpos + 1;
}
else
{
items_visible = ED_FIELDX;
item_position = level_xpos + 1;
}
else
{
- items_max =
lev_fieldy + 2
;
+ items_max =
MAX(lev_fieldy + 2, ED_FIELDY)
;
items_visible = ED_FIELDY;
item_position = level_ypos + 1;
}
items_visible = ED_FIELDY;
item_position = level_ypos + 1;
}
@@
-3109,10
+3109,10
@@
static void HandleDrawingAreas(struct GadgetInfo *gi)
button == 3 ? new_element3 : 0);
button == 3 ? new_element3 : 0);
-
+#if 0
if (button_release_event)
button = 0;
if (button_release_event)
button = 0;
-
+#endif
if (!draw_level && drawing_function != ED_CTRL_ID_SINGLE_ITEMS)
if (!draw_level && drawing_function != ED_CTRL_ID_SINGLE_ITEMS)
@@
-3136,7
+3136,10
@@
static void HandleDrawingAreas(struct GadgetInfo *gi)
break;
if (draw_with_brush)
break;
if (draw_with_brush)
- CopyBrushToLevel(sx, sy, button);
+ {
+ if (!button_release_event)
+ CopyBrushToLevel(sx, sy, button);
+ }
else if (new_element != Feld[lx][ly])
{
if (new_element == EL_SPIELFIGUR)
else if (new_element != Feld[lx][ly])
{
if (new_element == EL_SPIELFIGUR)