projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved code for setting touch info for finger events to separate function
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index 0f8b1ba7c027557b07be3754b8891a424d9746af..b7b739f5145bfab4cc27355d7a8a7f20c6e850a4 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-6218,7
+6218,7
@@
static void CreateControlButtons(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
}
level_editor_gadget[id] = gi;
}
@@
-6284,7
+6284,7
@@
static void CreateControlButtons(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
}
level_editor_gadget[id] = gi;
}
@@
-6337,7
+6337,7
@@
static void CreateControlButtons(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
}
level_editor_gadget[id] = gi;
}
@@
-6431,7
+6431,7
@@
static void CreateCounterButtons(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
right_gadget_border[id] =
level_editor_gadget[id] = gi;
right_gadget_border[id] =
@@
-6493,7
+6493,7
@@
static void CreateCounterButtons(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
right_gadget_border[id] =
level_editor_gadget[id] = gi;
right_gadget_border[id] =
@@
-6551,7
+6551,7
@@
static void CreateDrawingAreas(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
right_gadget_border[id] =
level_editor_gadget[id] = gi;
right_gadget_border[id] =
@@
-6624,7
+6624,7
@@
static void CreateTextInputGadgets(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
}
level_editor_gadget[id] = gi;
}
@@
-6673,7
+6673,7
@@
static void CreateTextAreaGadgets(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
}
level_editor_gadget[id] = gi;
}
@@
-6752,7
+6752,7
@@
static void CreateSelectboxGadgets(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
right_gadget_border[id] =
level_editor_gadget[id] = gi;
right_gadget_border[id] =
@@
-6836,7
+6836,7
@@
static void CreateTextbuttonGadgets(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
right_gadget_border[id] =
level_editor_gadget[id] = gi;
right_gadget_border[id] =
@@
-6892,7
+6892,7
@@
static void CreateGraphicbuttonGadgets(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
right_gadget_border[id] =
level_editor_gadget[id] = gi;
right_gadget_border[id] =
@@
-7007,7
+7007,7
@@
static void CreateScrollbarGadgets(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
}
level_editor_gadget[id] = gi;
}
@@
-7067,7
+7067,7
@@
static void CreateCheckbuttonGadgets(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
right_gadget_border[id] =
level_editor_gadget[id] = gi;
right_gadget_border[id] =
@@
-7132,7
+7132,7
@@
static void CreateRadiobuttonGadgets(void)
GDI_END);
if (gi == NULL)
GDI_END);
if (gi == NULL)
-
Error(ERR_EXIT,
"cannot create gadget");
+
Fail(
"cannot create gadget");
level_editor_gadget[id] = gi;
right_gadget_border[id] =
level_editor_gadget[id] = gi;
right_gadget_border[id] =
@@
-12071,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
mode == CB_BRUSH_TO_CLIPBOARD_SMALL)
SDL_SetClipboardText(text);
else
-
printf("%s", text); // print brush data to conso
le
+
Print("%s", text); // print brush data to console and log fi
le
return;
}
return;
}