projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100402-1-src
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 56ecbd16a67dbeabac69dadc4ffd331e1411cd83..8632855a043f5b6a4a2a8e6094a2acaa5014d9e3 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-43,8
+43,10
@@
#define SND_UNDEFINED (-1)
#define MUS_UNDEFINED (-1)
#define SND_UNDEFINED (-1)
#define MUS_UNDEFINED (-1)
+#if 0
#define WIN_XSIZE 672
#define WIN_YSIZE 560
#define WIN_XSIZE 672
#define WIN_YSIZE 560
+#endif
#define DEFAULT_FULLSCREEN_MODE "800x600"
#define DEFAULT_FULLSCREEN_MODE "800x600"
@@
-1852,10
+1854,11
@@
#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_1 8
#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_2 9
#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3 10
#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_1 8
#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_2 9
#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3 10
-#define GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK 11
-#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER 12
+#define GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4 11
+#define GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK 12
+#define GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER 13
-#define NUM_SPECIAL_GFX_SETUP_ARGS 1
3
+#define NUM_SPECIAL_GFX_SETUP_ARGS 1
4
/* values for image configuration suffixes */
/* values for image configuration suffixes */
@@
-1905,8
+1908,10
@@
#define GFX_ARG_ALIGN 43
#define GFX_ARG_VALIGN 44
#define GFX_ARG_SORT_PRIORITY 45
#define GFX_ARG_ALIGN 43
#define GFX_ARG_VALIGN 44
#define GFX_ARG_SORT_PRIORITY 45
+#define GFX_ARG_CLASS 46
+#define GFX_ARG_STYLE 47
-#define NUM_GFX_ARGS 4
6
+#define NUM_GFX_ARGS 4
8
/* values for sound configuration suffixes */
/* values for sound configuration suffixes */
@@
-2443,6
+2448,8
@@
struct GlobalInfo
int fading_status;
int fading_type;
#endif
int fading_status;
int fading_type;
#endif
+
+ struct Rect screen;
};
struct ElementChangeInfo
};
struct ElementChangeInfo
@@
-2696,6
+2703,9
@@
struct GraphicInfo
int align, valign; /* optional setting for drawing title screens */
int sort_priority; /* optional setting for drawing title screens */
int align, valign; /* optional setting for drawing title screens */
int sort_priority; /* optional setting for drawing title screens */
+ int class;
+ int style;
+
boolean use_image_size; /* use image size as default width and height */
#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
boolean use_image_size; /* use image size as default width and height */
#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
@@
-2837,6
+2847,8
@@
extern int ActiveFont[NUM_FONTS];
extern int lev_fieldx, lev_fieldy;
extern int scroll_x, scroll_y;
extern int lev_fieldx, lev_fieldy;
extern int scroll_x, scroll_y;
+extern int WIN_XSIZE, WIN_YSIZE;
+
extern int FX, FY;
extern int ScrollStepSize;
extern int ScreenMovDir, ScreenMovPos, ScreenGfxPos;
extern int FX, FY;
extern int ScrollStepSize;
extern int ScreenMovDir, ScreenMovPos, ScreenGfxPos;
@@
-2872,7
+2884,7
@@
extern struct TitleMessageInfo titlemessage_initial[];
extern struct TitleMessageInfo titlemessage_default;
extern struct TitleMessageInfo titlemessage[];
extern struct TitleMessageInfo readme;
extern struct TitleMessageInfo titlemessage_default;
extern struct TitleMessageInfo titlemessage[];
extern struct TitleMessageInfo readme;
-extern struct InitInfo init;
+extern struct InitInfo init
, init_last
;
extern struct MenuInfo menu;
extern struct DoorInfo door_1, door_2;
extern struct PreviewInfo preview;
extern struct MenuInfo menu;
extern struct DoorInfo door_1, door_2;
extern struct PreviewInfo preview;