projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup of warning messages if setting up SDL 1.2 video mode failed
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 97acf9340534e210dc596a1f3ac760c2b7637e19..593b245010806f0224515685d3cfd9ba135845f9 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-169,6
+169,12
@@
#define DRAW_GLOBAL_ANIM_STAGE_1 1
#define DRAW_GLOBAL_ANIM_STAGE_2 2
#define DRAW_GLOBAL_ANIM_STAGE_1 1
#define DRAW_GLOBAL_ANIM_STAGE_2 2
+/* values for drawing target for global border */
+#define DRAW_BORDER_TO_BACKBUFFER 0
+#define DRAW_BORDER_TO_SCREEN 1
+#define DRAW_BORDER_TO_FADE_SOURCE 2
+#define DRAW_BORDER_TO_FADE_TARGET 3
+
/* values for move directions and special "button" key bitmasks */
#define MV_NONE 0
#define MV_LEFT (1 << MV_BIT_LEFT)
/* values for move directions and special "button" key bitmasks */
#define MV_NONE 0
#define MV_LEFT (1 << MV_BIT_LEFT)
@@
-703,7
+709,6
@@
struct ProgramInfo
struct OptionInfo
{
struct OptionInfo
{
- char *display_name;
char *server_host;
int server_port;
char *server_host;
int server_port;
@@
-725,11
+730,6
@@
struct OptionInfo
boolean debug;
};
boolean debug;
};
-struct ScreenModeInfo
-{
- int width, height;
-};
-
struct VideoSystemInfo
{
int default_depth;
struct VideoSystemInfo
{
int default_depth;
@@
-739,8
+739,6
@@
struct VideoSystemInfo
boolean fullscreen_available;
boolean fullscreen_enabled;
boolean fullscreen_initial;
boolean fullscreen_available;
boolean fullscreen_enabled;
boolean fullscreen_initial;
- struct ScreenModeInfo *fullscreen_modes;
- char *fullscreen_mode_current;
boolean window_scaling_available;
int window_scaling_percent;
boolean window_scaling_available;
int window_scaling_percent;
@@
-811,6
+809,14
@@
struct GfxInfo
Bitmap *background_bitmap;
int background_bitmap_mask;
Bitmap *background_bitmap;
int background_bitmap_mask;
+ Bitmap *fade_bitmap_source;
+ Bitmap *fade_bitmap_target;
+ Bitmap *fade_bitmap_black;
+
+ int fade_border_source_status;
+ int fade_border_target_status;
+ Bitmap *masked_border_bitmap_ptr;
+
#if USE_FINAL_SCREEN_BITMAP
Bitmap *final_screen_bitmap;
#endif
#if USE_FINAL_SCREEN_BITMAP
Bitmap *final_screen_bitmap;
#endif
@@
-998,7
+1004,6
@@
struct SetupInfo
boolean skip_levels;
boolean time_limit;
boolean fullscreen;
boolean skip_levels;
boolean time_limit;
boolean fullscreen;
- char *fullscreen_mode;
int window_scaling_percent;
char *window_scaling_quality;
boolean ask_on_escape;
int window_scaling_percent;
char *window_scaling_quality;
boolean ask_on_escape;