From: Holger Schemel Date: Sat, 19 Aug 2006 16:42:44 +0000 (+0200) Subject: rnd-20060819-5-src X-Git-Tag: 3.2.1^2~3 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=cf23d62727053bfef711fb08fb4894e0936b9645;p=rocksndiamonds.git rnd-20060819-5-src --- diff --git a/ChangeLog b/ChangeLog index 28b6845d..6ef7fb8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2006-08-19 +2006-08-20 * version 3.2.1 released 2006-08-19 diff --git a/src/conftime.h b/src/conftime.h index 7557ec42..ca4ade19 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2006-08-19 13:52]" +#define COMPILE_DATE_STRING "[2006-08-19 18:41]" diff --git a/src/files.c b/src/files.c index 1d0ca6df..deff36d6 100644 --- a/src/files.c +++ b/src/files.c @@ -5915,7 +5915,7 @@ void SaveScore(int nr) #define SETUP_TOKEN_TOONS 5 #define SETUP_TOKEN_SCROLL_DELAY 6 #define SETUP_TOKEN_SOFT_SCROLLING 7 -#define SETUP_TOKEN_FADING 8 +#define SETUP_TOKEN_FADE_SCREENS 8 #define SETUP_TOKEN_AUTORECORD 9 #define SETUP_TOKEN_SHOW_TITLESCREEN 10 #define SETUP_TOKEN_QUICK_DOORS 11 @@ -6039,7 +6039,7 @@ static struct TokenInfo global_setup_tokens[] = { TYPE_SWITCH, &si.toons, "toons" }, { TYPE_SWITCH, &si.scroll_delay, "scroll_delay" }, { TYPE_SWITCH, &si.soft_scrolling, "soft_scrolling" }, - { TYPE_SWITCH, &si.fading, "screen_fading" }, + { TYPE_SWITCH, &si.fade_screens, "fade_screens" }, { TYPE_SWITCH, &si.autorecord, "automatic_tape_recording" }, { TYPE_SWITCH, &si.show_titlescreen, "show_titlescreen" }, { TYPE_SWITCH, &si.quick_doors, "quick_doors" }, @@ -6189,7 +6189,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->direct_draw = !si->double_buffering; si->scroll_delay = TRUE; si->soft_scrolling = TRUE; - si->fading = TRUE; + si->fade_screens = TRUE; si->autorecord = TRUE; si->show_titlescreen = TRUE; si->quick_doors = FALSE; diff --git a/src/libgame/system.h b/src/libgame/system.h index cc249311..99d7c59d 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -769,7 +769,7 @@ struct SetupInfo boolean direct_draw; /* !double_buffering (redundant!) */ boolean scroll_delay; boolean soft_scrolling; - boolean fading; + boolean fade_screens; boolean autorecord; boolean show_titlescreen; boolean quick_doors; diff --git a/src/libgame/x11.h b/src/libgame/x11.h index 692fe5e9..0e2ba46e 100644 --- a/src/libgame/x11.h +++ b/src/libgame/x11.h @@ -339,7 +339,7 @@ void X11CreateBitmapContent(Bitmap *, int, int, int); void X11FreeBitmapPointers(Bitmap *); void X11CopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int); void X11FillRectangle(Bitmap *, int, int, int, int, Pixel); -void X11FadeScreen(Bitmap *, int, int, int, int, int, int, int); +void X11FadeRectangle(Bitmap *, int, int, int, int, int, int, int); void X11DrawSimpleLine(Bitmap *, int, int, int, int, Pixel); Pixel X11GetPixel(Bitmap *, int, int); Pixel X11GetPixelFromRGB(unsigned int, unsigned int, unsigned int); diff --git a/src/screens.c b/src/screens.c index dbd2dc2a..09e02969 100644 --- a/src/screens.c +++ b/src/screens.c @@ -2555,7 +2555,7 @@ static struct TokenInfo setup_info_graphics[] = { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scrolling:" }, { TYPE_SWITCH, &setup.double_buffering,"Double-Buffering:" }, #endif - { TYPE_SWITCH, &setup.fading, "Fading:" }, + { TYPE_SWITCH, &setup.fade_screens, "Fade Screens:" }, { TYPE_SWITCH, &setup.quick_switch, "Quick Player Focus Switch:" }, { TYPE_SWITCH, &setup.quick_doors, "Quick Menu Doors:" }, { TYPE_SWITCH, &setup.show_titlescreen,"Show Title Screens:" }, diff --git a/src/tools.c b/src/tools.c index eafeb524..298a98bf 100644 --- a/src/tools.c +++ b/src/tools.c @@ -424,24 +424,24 @@ void FadeExt(int fade_mask, int fade_mode) int post_delay = (fade_mode == FADE_MODE_FADE_OUT ? menu.post_delay : 0); int x, y, width, height; - if (fade_mask & REDRAW_ALL) - { - x = 0; - y = 0; - width = WIN_XSIZE; - height = WIN_YSIZE; - } - else if (fade_mask & REDRAW_FIELD) + if (fade_mask & REDRAW_FIELD) { x = REAL_SX; y = REAL_SY; width = FULL_SXSIZE; height = FULL_SYSIZE; } + else /* REDRAW_ALL */ + { + x = 0; + y = 0; + width = WIN_XSIZE; + height = WIN_YSIZE; + } redraw_mask |= fade_mask; - if (!setup.fading || fade_delay == 0) + if (!setup.fade_screens || fade_delay == 0) { if (fade_mode == FADE_MODE_FADE_OUT) ClearRectangle(backbuffer, x, y, width, height);