projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20121013-1-src
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index 7f1ec19f128fd20935d2fce1332786339313a9c9..35ebce3fb9a87581894ec7f1efce4142337db162 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-971,8
+971,13
@@
#define RANDOM_USE_QUANTITY 1
/* maximal size of level editor drawing area */
#define RANDOM_USE_QUANTITY 1
/* maximal size of level editor drawing area */
+#if NEW_TILESIZE
+#define MAX_ED_FIELDX (SCR_FIELDX)
+#define MAX_ED_FIELDY (SCR_FIELDY - 1)
+#else
#define MAX_ED_FIELDX (2 * SCR_FIELDX)
#define MAX_ED_FIELDY (2 * SCR_FIELDY - 1)
#define MAX_ED_FIELDX (2 * SCR_FIELDX)
#define MAX_ED_FIELDY (2 * SCR_FIELDY - 1)
+#endif
/*
/*
@@
-2710,7
+2715,7
@@
static struct
GADGET_ID_CONTINUOUS_SNAPPING, GADGET_ID_NONE,
&level.continuous_snapping,
NULL,
GADGET_ID_CONTINUOUS_SNAPPING, GADGET_ID_NONE,
&level.continuous_snapping,
NULL,
- "continuo
s snapping",
"use snapping without releasing key"
+ "continuo
us snapping",
"use snapping without releasing key"
},
{
ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(7),
},
{
ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(7),
@@
-5143,7
+5148,7
@@
static void DrawElementBorder(int dest_x, int dest_y, int width, int height,
int by2 = TILEY - by;
int i;
int by2 = TILEY - by;
int i;
- getGraphicSource(border_graphic, 0, &src_bitmap, &src_x, &src_y);
+ get
Fixed
GraphicSource(border_graphic, 0, &src_bitmap, &src_x, &src_y);
BlitBitmap(src_bitmap, drawto, src_x, src_y,
bx, by, dest_x - bx, dest_y - by);
BlitBitmap(src_bitmap, drawto, src_x, src_y,
bx, by, dest_x - bx, dest_y - by);
@@
-5225,7
+5230,7
@@
static void CreateControlButtons()
{
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
struct GadgetInfo *gi;
{
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
struct GadgetInfo *gi;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
int i;
/* create toolbox buttons */
int i;
/* create toolbox buttons */
@@
-5514,7
+5519,7
@@
static void CreateCounterButtons()
int gd_xoffset;
int gd_x, gd_x1, gd_x2, gd_y;
int x_size, y_size;
int gd_xoffset;
int gd_x, gd_x1, gd_x2, gd_y;
int x_size, y_size;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
char infotext[max_infotext_len + 1];
event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
char infotext[max_infotext_len + 1];
event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
@@
-5650,7
+5655,7
@@
static void CreateDrawingAreas()
for (i = 0; i < ED_NUM_DRAWING_AREAS; i++)
{
struct GadgetInfo *gi;
for (i = 0; i < ED_NUM_DRAWING_AREAS; i++)
{
struct GadgetInfo *gi;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
int id = drawingarea_info[i].gadget_id;
int x = SX + drawingarea_info[i].x;
int y = SY + drawingarea_info[i].y;
int id = drawingarea_info[i].gadget_id;
int x = SX + drawingarea_info[i].x;
int y = SY + drawingarea_info[i].y;
@@
-5701,7
+5706,7
@@
static void CreateTextInputGadgets()
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
int gd_x, gd_y;
struct GadgetInfo *gi;
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
int gd_x, gd_y;
struct GadgetInfo *gi;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
char infotext[MAX_OUTPUT_LINESIZE + 1];
int id = textinput_info[i].gadget_id;
char infotext[MAX_OUTPUT_LINESIZE + 1];
int id = textinput_info[i].gadget_id;
@@
-5749,7
+5754,7
@@
static void CreateTextAreaGadgets()
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
int gd_x, gd_y;
struct GadgetInfo *gi;
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
int gd_x, gd_y;
struct GadgetInfo *gi;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
char infotext[MAX_OUTPUT_LINESIZE + 1];
int id = textarea_info[i].gadget_id;
int area_xsize = textarea_info[i].xsize;
char infotext[MAX_OUTPUT_LINESIZE + 1];
int id = textarea_info[i].gadget_id;
int area_xsize = textarea_info[i].xsize;
@@
-5798,7
+5803,7
@@
static void CreateSelectboxGadgets()
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
int gd_x, gd_y;
struct GadgetInfo *gi;
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
int gd_x, gd_y;
struct GadgetInfo *gi;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
char infotext[MAX_OUTPUT_LINESIZE + 1];
int id = selectbox_info[i].gadget_id;
int x = SX + selectbox_info[i].x;
char infotext[MAX_OUTPUT_LINESIZE + 1];
int id = selectbox_info[i].gadget_id;
int x = SX + selectbox_info[i].x;
@@
-5875,7
+5880,7
@@
static void CreateTextbuttonGadgets()
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
int gd_x1, gd_x2, gd_y1, gd_y2;
struct GadgetInfo *gi;
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
int gd_x1, gd_x2, gd_y1, gd_y2;
struct GadgetInfo *gi;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
char infotext[MAX_OUTPUT_LINESIZE + 1];
int id = textbutton_info[i].gadget_id;
int x = SX + textbutton_info[i].x;
char infotext[MAX_OUTPUT_LINESIZE + 1];
int id = textbutton_info[i].gadget_id;
int x = SX + textbutton_info[i].x;
@@
-5948,7
+5953,7
@@
static void CreateGraphicbuttonGadgets()
{
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
struct GadgetInfo *gi;
{
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
struct GadgetInfo *gi;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
int i;
/* create buttons for scrolling of drawing area and element list */
int i;
/* create buttons for scrolling of drawing area and element list */
@@
-6055,7
+6060,7
@@
static void CreateScrollbarGadgets()
int gd_x1, gd_x2, gd_y1, gd_y2;
struct GadgetInfo *gi;
int items_max, items_visible, item_position;
int gd_x1, gd_x2, gd_y1, gd_y2;
struct GadgetInfo *gi;
int items_max, items_visible, item_position;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
if (i == ED_SCROLLBAR_ID_LIST_VERTICAL)
{
if (i == ED_SCROLLBAR_ID_LIST_VERTICAL)
{
@@
-6122,7
+6127,7
@@
static void CreateCheckbuttonGadgets()
{
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
struct GadgetInfo *gi;
{
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
struct GadgetInfo *gi;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
int i;
int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
int i;
@@
-6185,7
+6190,7
@@
static void CreateRadiobuttonGadgets()
{
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
struct GadgetInfo *gi;
{
Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
struct GadgetInfo *gi;
- unsigned
long
event_mask;
+ unsigned
int
event_mask;
int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
int i;
int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
int i;
@@
-8173,7
+8178,7
@@
static int PrintElementDescriptionFromFile(char *filename, int start_line)
int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1;
return DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1,
int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1;
return DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1,
- max_lines_per_screen, -1, TRUE, FALSE, FALSE);
+ max_lines_per_screen,
0,
-1, TRUE, FALSE, FALSE);
}
static void DrawPropertiesInfo()
}
static void DrawPropertiesInfo()
@@
-8812,7
+8817,7
@@
static void DrawEditorElementAnimation(int x, int y)
ANIM_MODE(graphic) == ANIM_CE_SCORE ?
custom_element.collect_score_initial : FrameCounter);
ANIM_MODE(graphic) == ANIM_CE_SCORE ?
custom_element.collect_score_initial : FrameCounter);
- DrawGraphicAnimationExt(drawto, x, y, graphic, frame, NO_MASKING);
+ Draw
Fixed
GraphicAnimationExt(drawto, x, y, graphic, frame, NO_MASKING);
}
static void DrawEditorElementName(int x, int y, int element)
}
static void DrawEditorElementName(int x, int y, int element)
@@
-10717,10
+10722,10
@@
static void HandleDrawingAreas(struct GadgetInfo *gi)
gi->y + sy * MINI_TILEY,
el2edimg(new_element));
else
gi->y + sy * MINI_TILEY,
el2edimg(new_element));
else
- DrawGraphicExt(drawto,
- gi->x + sx * TILEX,
- gi->y + sy * TILEY,
- el2img(new_element), 0);
+ Draw
Fixed
GraphicExt(drawto,
+
gi->x + sx * TILEX,
+
gi->y + sy * TILEY,
+
el2img(new_element), 0);
if (id == GADGET_ID_CUSTOM_GRAPHIC)
new_element = GFX_ELEMENT(new_element);
if (id == GADGET_ID_CUSTOM_GRAPHIC)
new_element = GFX_ELEMENT(new_element);
@@
-11744,8
+11749,8
@@
void HandleLevelEditorKeyInput(Key key)
void HandleLevelEditorIdle()
{
void HandleLevelEditorIdle()
{
- static unsigned
long
action_delay = 0;
- unsigned
long
action_delay_value = GameFrameDelay;
+ static unsigned
int
action_delay = 0;
+ unsigned
int
action_delay_value = GameFrameDelay;
int xpos = 1, ypos = 2;
int i;
int xpos = 1, ypos = 2;
int i;