projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070203-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 5d80bff569438af43135976481d66b3df2193b7b..b25dc1289a9f02f0ce2835bc9b833791f4a67a32 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-210,6
+210,8
@@
#define ALIGNED_XPOS(x,w,a) ((a) == ALIGN_CENTER ? (x) - (w) / 2 : \
(a) == ALIGN_RIGHT ? (x) - (w) : (x))
#define ALIGNED_XPOS(x,w,a) ((a) == ALIGN_CENTER ? (x) - (w) / 2 : \
(a) == ALIGN_RIGHT ? (x) - (w) : (x))
+#define ALIGNED_MENU_XPOS(p) ALIGNED_XPOS((p)->x, (p)->width, (p)->align)
+#define ALIGNED_MENU_YPOS(p) ((p)->y)
/* values for redraw_mask */
#define REDRAW_NONE (0)
/* values for redraw_mask */
#define REDRAW_NONE (0)
@@
-726,6
+728,7
@@
struct SetupEditorInfo
boolean el_diamond_caves;
boolean el_dx_boulderdash;
boolean el_chars;
boolean el_diamond_caves;
boolean el_dx_boulderdash;
boolean el_chars;
+ boolean el_steel_chars;
boolean el_custom;
boolean el_user_defined;
boolean el_dynamic;
boolean el_custom;
boolean el_user_defined;
boolean el_dynamic;
@@
-749,6
+752,7
@@
struct SetupEditorCascadeInfo
boolean el_dc;
boolean el_dx;
boolean el_chars;
boolean el_dc;
boolean el_dx;
boolean el_chars;
+ boolean el_steel_chars;
boolean el_ce;
boolean el_ge;
boolean el_ref;
boolean el_ce;
boolean el_ge;
boolean el_ref;
@@
-1006,6
+1010,23
@@
struct Rect
int width, height;
};
int width, height;
};
+#if 1
+struct MenuPosInfo
+{
+ int x, y;
+ int width, height;
+ int align;
+};
+
+struct TextPosInfo
+{
+ int x, y;
+ int width, height;
+ int align;
+ int chars;
+};
+#endif
+
/* ========================================================================= */
/* exported variables */
/* ========================================================================= */
/* exported variables */
@@
-1059,6
+1080,7
@@
void InitGfxDoor2Info(int, int, int, int);
void InitGfxScrollbufferInfo(int, int);
void SetDrawDeactivationMask(int);
void SetDrawBackgroundMask(int);
void InitGfxScrollbufferInfo(int, int);
void SetDrawDeactivationMask(int);
void SetDrawBackgroundMask(int);
+void SetWindowBackgroundBitmap(Bitmap *);
void SetMainBackgroundBitmap(Bitmap *);
void SetDoorBackgroundBitmap(Bitmap *);
void SetMainBackgroundBitmap(Bitmap *);
void SetDoorBackgroundBitmap(Bitmap *);