projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20140211-1-src
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index 53123487787f240b81d36fff743e1389d7da5d8e..c6d6ecfafcb71294662debda1c97e38e1f4e953c 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-5230,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 */
@@
-5519,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;
@@
-5655,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;
@@
-5706,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;
@@
-5754,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;
@@
-5803,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;
@@
-5880,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;
@@
-5953,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 */
@@
-6060,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)
{
@@
-6127,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;
@@
-6190,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;
@@
-6733,8
+6733,8
@@
static boolean PrepareSavingIntoPersonalLevelSet()
return TRUE;
}
return TRUE;
}
- if (!Request("This level is read only
! "
- "Save into personal level set
?", REQ_ASK))
+ if (!Request("This level is read only! "
+ "Save into personal level set?", REQ_ASK))
return FALSE;
// "cd" to personal level set dir (for writing copy the first time)
return FALSE;
// "cd" to personal level set dir (for writing copy the first time)
@@
-7012,13
+7012,13
@@
static boolean CopyCustomElement(int element_old, int element_new,
}
else if (IS_CUSTOM_ELEMENT(element_old) && !IS_CUSTOM_ELEMENT(element_new))
{
}
else if (IS_CUSTOM_ELEMENT(element_old) && !IS_CUSTOM_ELEMENT(element_new))
{
- Request("Please choose custom element
!", REQ_CONFIRM);
+ Request("Please choose custom element!", REQ_CONFIRM);
return FALSE;
}
else if (IS_GROUP_ELEMENT(element_old) && !IS_GROUP_ELEMENT(element_new))
{
return FALSE;
}
else if (IS_GROUP_ELEMENT(element_old) && !IS_GROUP_ELEMENT(element_new))
{
- Request("Please choose group element
!", REQ_CONFIRM);
+ Request("Please choose group element!", REQ_CONFIRM);
return FALSE;
}
return FALSE;
}
@@
-7243,7
+7243,7
@@
static void CopyCustomElementPropertiesToGame(int element)
if (level.use_custom_template)
{
if (level.use_custom_template)
{
- if (Request("Copy and modify level template
?", REQ_ASK))
+ if (Request("Copy and modify level template?", REQ_ASK))
{
level.use_custom_template = FALSE;
ModifyGadget(level_editor_gadget[GADGET_ID_CUSTOM_USE_TEMPLATE],
{
level.use_custom_template = FALSE;
ModifyGadget(level_editor_gadget[GADGET_ID_CUSTOM_USE_TEMPLATE],
@@
-10314,7
+10314,10
@@
static void FloodFill(int from_x, int from_y, int fill_element)
static int DrawLevelText(int sx, int sy, char letter, int mode)
{
static short delete_buffer[MAX_LEV_FIELDX];
static int DrawLevelText(int sx, int sy, char letter, int mode)
{
static short delete_buffer[MAX_LEV_FIELDX];
- static int start_sx, start_sy;
+ static int start_sx;
+#if 0
+ static int start_sy;
+#endif
static int last_sx, last_sy;
static boolean typing = FALSE;
int letter_element = EL_CHAR_ASCII0 + letter;
static int last_sx, last_sy;
static boolean typing = FALSE;
int letter_element = EL_CHAR_ASCII0 + letter;
@@
-10356,8
+10359,12
@@
static int DrawLevelText(int sx, int sy, char letter, int mode)
DrawLevelText(0, 0, 0, TEXT_END);
typing = TRUE;
DrawLevelText(0, 0, 0, TEXT_END);
typing = TRUE;
- start_sx = last_sx = sx;
- start_sy = last_sy = sy;
+ start_sx = sx;
+#if 0
+ start_sy = sy;
+#endif
+ last_sx = sx;
+ last_sy = sy;
DrawLevelText(sx, sy, 0, TEXT_SETCURSOR);
break;
DrawLevelText(sx, sy, 0, TEXT_SETCURSOR);
break;
@@
-10871,7
+10878,7
@@
static void HandleCounterButtons(struct GadgetInfo *gi)
if ((level_changed && pressed) || (!level_changed && released))
return;
if ((level_changed && pressed) || (!level_changed && released))
return;
- if (level_changed && !Request("Level has changed
! Discard changes
?",
+ if (level_changed && !Request("Level has changed
! Discard changes
?",
REQ_ASK))
{
if (gadget_id == counterbutton_info[counter_id].gadget_id_text)
REQ_ASK))
{
if (gadget_id == counterbutton_info[counter_id].gadget_id_text)
@@
-11044,11
+11051,11
@@
static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
CopyPlayfield(Feld, level.field);
if (new_template ||
CopyPlayfield(Feld, level.field);
if (new_template ||
- Request("Save this template and kill the old
?", REQ_ASK))
+ Request("Save this template and kill the old?", REQ_ASK))
SaveLevelTemplate();
if (new_template)
SaveLevelTemplate();
if (new_template)
- Request("Template saved
!", REQ_CONFIRM);
+ Request("Template saved!", REQ_CONFIRM);
/* restore original "level.field" (needed to track playfield changes) */
CopyPlayfield(FieldBackup, level.field);
/* restore original "level.field" (needed to track playfield changes) */
CopyPlayfield(FieldBackup, level.field);
@@
-11164,7
+11171,7
@@
static void HandleCheckbuttons(struct GadgetInfo *gi)
if (level.use_custom_template && !fileExists(template_filename))
{
if (level.use_custom_template && !fileExists(template_filename))
{
- Request("No level template found
!", REQ_CONFIRM);
+ Request("No level template found!", REQ_CONFIRM);
level.use_custom_template = FALSE;
ModifyGadget(gi, GDI_CHECKED, FALSE, GDI_END);
level.use_custom_template = FALSE;
ModifyGadget(gi, GDI_CHECKED, FALSE, GDI_END);
@@
-11397,7
+11404,7
@@
static void HandleControlButtons(struct GadgetInfo *gi)
case GADGET_ID_UNDO:
if (undo_buffer_steps == 0)
{
case GADGET_ID_UNDO:
if (undo_buffer_steps == 0)
{
- Request("Undo buffer empty
!", REQ_CONFIRM);
+ Request("Undo buffer empty!", REQ_CONFIRM);
break;
}
break;
}
@@
-11471,7
+11478,7
@@
static void HandleControlButtons(struct GadgetInfo *gi)
new_level = !fileExists(level_filename);
if (new_level ||
new_level = !fileExists(level_filename);
if (new_level ||
- Request("Save this level and kill the old
?", REQ_ASK))
+ Request("Save this level and kill the old?", REQ_ASK))
{
if (leveldir_former->readonly)
ModifyLevelInfoForSavingIntoPersonalLevelSet(leveldir_former->name);
{
if (leveldir_former->readonly)
ModifyLevelInfoForSavingIntoPersonalLevelSet(leveldir_former->name);
@@
-11487,10
+11494,10
@@
static void HandleControlButtons(struct GadgetInfo *gi)
if (leveldir_former->readonly)
sprintf(level_saved_msg,
if (leveldir_former->readonly)
sprintf(level_saved_msg,
- "Level saved as level %d into personal level set
!",
+ "Level saved as level %d into personal level set!",
level_nr);
else
level_nr);
else
- strcpy(level_saved_msg, "Level saved
!");
+ strcpy(level_saved_msg, "Level saved!");
Request(level_saved_msg, REQ_CONFIRM);
}
Request(level_saved_msg, REQ_CONFIRM);
}
@@
-11749,8
+11756,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;
@@
-11996,7
+12003,7
@@
void RequestExitLevelEditor(boolean ask_if_level_has_changed,
{
if (!ask_if_level_has_changed ||
!LevelChanged() ||
{
if (!ask_if_level_has_changed ||
!LevelChanged() ||
- Request("Level has changed
! Exit without saving
?",
+ Request("Level has changed
! Exit without saving
?",
REQ_ASK | REQ_STAY_OPEN))
{
CloseDoor(DOOR_CLOSE_1);
REQ_ASK | REQ_STAY_OPEN))
{
CloseDoor(DOOR_CLOSE_1);