projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100419-1-src
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 739d5be21c0185df8f84a03d4468a0346cb35044..f71341b2b513ed5fea5f63777c653eabf7d8fd9d 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-43,13
+43,17
@@
#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"
+#if 0
#define SCR_FIELDX 17
#define SCR_FIELDY 17
#define SCR_FIELDX 17
#define SCR_FIELDY 17
+#endif
#define MAX_BUF_XSIZE (SCR_FIELDX + 2)
#define MAX_BUF_YSIZE (SCR_FIELDY + 2)
#define MIN_LEV_FIELDX 3
#define MAX_BUF_XSIZE (SCR_FIELDX + 2)
#define MAX_BUF_YSIZE (SCR_FIELDY + 2)
#define MIN_LEV_FIELDX 3
@@
-943,6
+947,7
@@
#define MAX_INITIAL_INVENTORY_SIZE 8
/* often used screen positions */
#define MAX_INITIAL_INVENTORY_SIZE 8
/* often used screen positions */
+#if 0
#define SX 8
#define SY 8
#define REAL_SX (SX - 2)
#define SX 8
#define SY 8
#define REAL_SX (SX - 2)
@@
-953,6
+958,7
@@
#define VY 400
#define EX DX
#define EY (VY - 44)
#define VY 400
#define EX DX
#define EY (VY - 44)
+#endif
#define TILESIZE 32
#define TILEX TILESIZE
#define TILEY TILESIZE
#define TILESIZE 32
#define TILEX TILESIZE
#define TILEY TILESIZE
@@
-1906,8
+1912,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 */
@@
-2249,6
+2257,14
@@
struct PreviewInfo
int anim_mode;
};
int anim_mode;
};
+struct ViewportInfo
+{
+ struct RectWithBorder window;
+ struct RectWithBorder playfield[NUM_SPECIAL_GFX_ARGS];
+ struct RectWithBorder door_1[NUM_SPECIAL_GFX_ARGS];
+ struct RectWithBorder door_2[NUM_SPECIAL_GFX_ARGS];
+};
+
struct HiScore
{
char Name[MAX_PLAYER_NAME_LEN + 1];
struct HiScore
{
char Name[MAX_PLAYER_NAME_LEN + 1];
@@
-2697,6
+2713,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)
@@
-2793,7
+2812,11
@@
extern SDL_Thread *server_thread;
extern int key_joystick_mapping;
extern int key_joystick_mapping;
+#if 1
+extern boolean redraw[MAX_LEV_FIELDX + 2][MAX_LEV_FIELDY + 2];
+#else
extern boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
extern boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+#endif
extern int redraw_x1, redraw_y1;
extern short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern int redraw_x1, redraw_y1;
extern short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@
-2838,6
+2861,14
@@
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 SCR_FIELDX, SCR_FIELDY;
+extern int SX, SY;
+extern int REAL_SX, REAL_SY;
+extern int DX, DY;
+extern int VX, VY;
+extern int EX, EY;
+
extern int FX, FY;
extern int ScrollStepSize;
extern int ScreenMovDir, ScreenMovPos, ScreenGfxPos;
extern int FX, FY;
extern int ScrollStepSize;
extern int ScreenMovDir, ScreenMovPos, ScreenGfxPos;
@@
-2864,6
+2895,7
@@
extern struct HiScore highscore[];
extern struct TapeInfo tape;
extern struct GlobalInfo global;
extern struct BorderInfo border;
extern struct TapeInfo tape;
extern struct GlobalInfo global;
extern struct BorderInfo border;
+extern struct ViewportInfo viewport;
extern struct TitleFadingInfo fading;
extern struct TitleFadingInfo fading_none;
extern struct TitleFadingInfo title_initial_default;
extern struct TitleFadingInfo fading;
extern struct TitleFadingInfo fading_none;
extern struct TitleFadingInfo title_initial_default;
@@
-2873,7
+2905,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;