projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030120-4-src
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index 60be1aaba58d9c370f8951f270ba5055b4f480b0..688a63b7945d8650c328f2582e849a07d26e2fd1 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-1606,7
+1606,7
@@
static void ScrollMiniLevel(int from_x, int from_y, int scroll)
static void CreateControlButtons()
{
static void CreateControlButtons()
{
- Bitmap *gd_bitmap =
new_graphic_info[IMG_MENU
_DOOR].bitmap;
+ Bitmap *gd_bitmap =
graphic_info[IMG_GLOBAL
_DOOR].bitmap;
struct GadgetInfo *gi;
unsigned long event_mask;
int i;
struct GadgetInfo *gi;
unsigned long event_mask;
int i;
@@
-1827,7
+1827,7
@@
static void CreateCounterButtons()
for (j=0; j<2; j++)
{
for (j=0; j<2; j++)
{
- Bitmap *gd_bitmap =
new_graphic_info[IMG_MENU
_DOOR].bitmap;
+ Bitmap *gd_bitmap =
graphic_info[IMG_GLOBAL
_DOOR].bitmap;
struct GadgetInfo *gi;
int id = (j == 0 ?
counterbutton_info[i].gadget_id_down :
struct GadgetInfo *gi;
int id = (j == 0 ?
counterbutton_info[i].gadget_id_down :
@@
-2049,7
+2049,7
@@
static void CreateTextInputGadgets()
for (i=0; i<ED_NUM_TEXTINPUT; i++)
{
for (i=0; i<ED_NUM_TEXTINPUT; i++)
{
- Bitmap *gd_bitmap =
new_graphic_info[IMG_MENU
_DOOR].bitmap;
+ Bitmap *gd_bitmap =
graphic_info[IMG_GLOBAL
_DOOR].bitmap;
int gd_x, gd_y;
struct GadgetInfo *gi;
unsigned long event_mask;
int gd_x, gd_y;
struct GadgetInfo *gi;
unsigned long event_mask;
@@
-2096,7
+2096,7
@@
static void CreateScrollbarGadgets()
for (i=0; i<ED_NUM_SCROLLBARS; i++)
{
int id = scrollbar_info[i].gadget_id;
for (i=0; i<ED_NUM_SCROLLBARS; i++)
{
int id = scrollbar_info[i].gadget_id;
- Bitmap *gd_bitmap =
new_graphic_info[IMG_MENU
_DOOR].bitmap;
+ Bitmap *gd_bitmap =
graphic_info[IMG_GLOBAL
_DOOR].bitmap;
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;
@@
-2161,7
+2161,7
@@
static void CreateScrollbarGadgets()
static void CreateCheckbuttonGadgets()
{
static void CreateCheckbuttonGadgets()
{
- Bitmap *gd_bitmap =
new_graphic_info[IMG_MENU
_DOOR].bitmap;
+ Bitmap *gd_bitmap =
graphic_info[IMG_GLOBAL
_DOOR].bitmap;
struct GadgetInfo *gi;
unsigned long event_mask;
int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
struct GadgetInfo *gi;
unsigned long event_mask;
int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
@@
-2440,7
+2440,7
@@
void DrawLevelEd()
}
/* copy default editor door content to main double buffer */
}
/* copy default editor door content to main double buffer */
- BlitBitmap(
new_graphic_info[IMG_MENU
_DOOR].bitmap, drawto,
+ BlitBitmap(
graphic_info[IMG_GLOBAL
_DOOR].bitmap, drawto,
DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
/* draw mouse button brush elements */
DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
/* draw mouse button brush elements */
@@
-2458,7
+2458,7
@@
void DrawLevelEd()
DrawSpecialEditorDoor();
/* draw new control window */
DrawSpecialEditorDoor();
/* draw new control window */
- BlitBitmap(
new_graphic_info[IMG_MENU
_DOOR].bitmap, drawto,
+ BlitBitmap(
graphic_info[IMG_GLOBAL
_DOOR].bitmap, drawto,
DOOR_GFX_PAGEX8, 236, EXSIZE, EYSIZE, EX, EY);
redraw_mask |= REDRAW_ALL;
DOOR_GFX_PAGEX8, 236, EXSIZE, EYSIZE, EX, EY);
redraw_mask |= REDRAW_ALL;
@@
-2650,7
+2650,7
@@
static void PickDrawingElement(int button, int element)
static void DrawDrawingWindow()
{
static void DrawDrawingWindow()
{
- Set
BackgroundBitmap(NULL
);
+ Set
MainBackgroundImage(IMG_UNDEFINED
);
ClearWindow();
UnmapLevelEditorWindowGadgets();
ClearWindow();
UnmapLevelEditorWindowGadgets();
@@
-2710,7
+2710,7
@@
static void DrawLevelInfoWindow()
int font_color = FC_GREEN;
int i, x, y;
int font_color = FC_GREEN;
int i, x, y;
- Set
BackgroundBitmap(new_graphic_info[IMG_MENU_BACKGROUND].bitmap
);
+ Set
MainBackgroundImage(IMG_BACKGROUND_EDITOR_SETTINGS_LEVEL
);
ClearWindow();
UnmapLevelEditorWindowGadgets();
ClearWindow();
UnmapLevelEditorWindowGadgets();
@@
-2943,7
+2943,7
@@
static void DrawPropertiesWindow()
{ -1, NULL, NULL }
};
{ -1, NULL, NULL }
};
- Set
BackgroundBitmap(new_graphic_info[IMG_MENU_BACKGROUND].bitmap
);
+ Set
MainBackgroundImage(IMG_BACKGROUND_EDITOR_SETTINGS_ELEMENT
);
ClearWindow();
UnmapLevelEditorWindowGadgets();
ClearWindow();
UnmapLevelEditorWindowGadgets();
@@
-2956,7
+2956,7
@@
static void DrawPropertiesWindow()
DrawGraphicAnimationExt(drawto,
SX + xstart * MINI_TILEX,
SY + ystart * MINI_TILEY + MINI_TILEY / 2,
DrawGraphicAnimationExt(drawto,
SX + xstart * MINI_TILEX,
SY + ystart * MINI_TILEY + MINI_TILEY / 2,
- el2img(properties_element), NO_MASKING);
+ el2img(properties_element),
-1,
NO_MASKING);
FrameCounter = 0; /* restart animation frame counter */
FrameCounter = 0; /* restart animation frame counter */
@@
-4347,7
+4347,7
@@
void HandleLevelEditorIdle()
DrawGraphicAnimationExt(drawto,
SX + xpos * TILEX,
SY + ypos * TILEY + MINI_TILEY / 2,
DrawGraphicAnimationExt(drawto,
SX + xpos * TILEX,
SY + ypos * TILEY + MINI_TILEY / 2,
- el2img(properties_element), NO_MASKING);
+ el2img(properties_element),
-1,
NO_MASKING);
#else
DrawGraphicAnimationExt(drawto,
#else
DrawGraphicAnimationExt(drawto,
@@
-4355,7
+4355,7
@@
void HandleLevelEditorIdle()
SY + ypos * TILEY + MINI_TILEY / 2,
el_dir_act2img(properties_element,
MV_NO_MOVING,
SY + ypos * TILEY + MINI_TILEY / 2,
el_dir_act2img(properties_element,
MV_NO_MOVING,
- ...));
+ ...)
, -1, NO_MASKING
);
#endif
MarkTileDirty(xpos, ypos);
#endif
MarkTileDirty(xpos, ypos);