projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070825-4-src
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 2a7db9c9959153b4563ad401a6ba9bb842672187..3bc6c2b3ef1b50e7b1f5204d027e58be01636da6 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-747,6
+747,12
@@
static void InitializeTitleControls_CheckTitleInfo(boolean initial)
Bitmap *bitmap = graphic_info[graphic].bitmap;
int sort_priority = graphic_info[graphic].sort_priority;
Bitmap *bitmap = graphic_info[graphic].bitmap;
int sort_priority = graphic_info[graphic].sort_priority;
+#if 0
+ /* skip images and messages (fonts!) when using forced custom graphics */
+ if (setup.override_level_graphics && !initial)
+ continue;
+#endif
+
if (bitmap != NULL)
InitializeTitleControlsExt_AddTitleInfo(TRUE, initial, i, sort_priority);
}
if (bitmap != NULL)
InitializeTitleControlsExt_AddTitleInfo(TRUE, initial, i, sort_priority);
}
@@
-757,6
+763,12
@@
static void InitializeTitleControls_CheckTitleInfo(boolean initial)
char *filename = getLevelSetTitleMessageFilename(i, initial);
int sort_priority = tmi->sort_priority;
char *filename = getLevelSetTitleMessageFilename(i, initial);
int sort_priority = tmi->sort_priority;
+#if 0
+ /* skip images and messages (fonts!) when using forced custom graphics */
+ if (setup.override_level_graphics)
+ continue;
+#endif
+
if (filename != NULL)
InitializeTitleControlsExt_AddTitleInfo(FALSE, initial, i, sort_priority);
}
if (filename != NULL)
InitializeTitleControlsExt_AddTitleInfo(FALSE, initial, i, sort_priority);
}
@@
-766,8
+778,10
@@
static void InitializeTitleControls(boolean show_title_initial)
{
num_title_screens = 0;
{
num_title_screens = 0;
+#if 0
if (show_title_initial)
InitializeTitleControls_CheckTitleInfo(TRUE);
if (show_title_initial)
InitializeTitleControls_CheckTitleInfo(TRUE);
+#endif
InitializeTitleControls_CheckTitleInfo(FALSE);
InitializeTitleControls_CheckTitleInfo(FALSE);
@@
-1411,7
+1425,7
@@
void DrawMainMenuExt(int redraw_mask, boolean do_fading)
MapTapeButtons();
MapScreenMenuGadgets(SCREEN_MASK_MAIN);
MapTapeButtons();
MapScreenMenuGadgets(SCREEN_MASK_MAIN);
-#if
1
+#if
0
DrawMaskedBorder(REDRAW_ALL);
#endif
DrawMaskedBorder(REDRAW_ALL);
#endif
@@
-1426,6
+1440,10
@@
void DrawMainMenuExt(int redraw_mask, boolean do_fading)
}
#endif
}
#endif
+#if 1
+ DrawMaskedBorder(REDRAW_ALL);
+#endif
+
#if 0
if (redraw_all)
redraw_mask = REDRAW_ALL;
#if 0
if (redraw_all)
redraw_mask = REDRAW_ALL;
@@
-4938,7
+4956,8
@@
static void DrawSetupScreen_Generic()
int2str(0, redraw_mask)));
#endif
int2str(0, redraw_mask)));
#endif
-#if 1
+#if 0
+ /* !!! usually REDRAW_NONE => DOES NOT WORK (with fade) => CHECK THIS !!! */
FadeOut(redraw_mask);
#else
FadeOut(REDRAW_FIELD);
FadeOut(redraw_mask);
#else
FadeOut(REDRAW_FIELD);