projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040607-1-src
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index c4aa62dfb8e1d26538c7668a818a0298c83817ca..12901f035f76b63fdb3e47d1217f3da7afe9e6bd 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-270,7
+270,7
@@
void DrawMainMenu()
leveldir_last_valid = leveldir_current;
/* needed if last screen (level choice) changed graphics, sounds or music */
leveldir_last_valid = leveldir_current;
/* needed if last screen (level choice) changed graphics, sounds or music */
- ReloadCustomArtwork();
+ ReloadCustomArtwork(
0
);
#ifdef TARGET_SDL
SetDrawtoField(DRAW_BACKBUFFER);
#ifdef TARGET_SDL
SetDrawtoField(DRAW_BACKBUFFER);
@@
-495,7
+495,7
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
if (setup.autorecord)
TapeStartRecording();
if (setup.autorecord)
TapeStartRecording();
-#if defined(
PLATFORM_UNIX
)
+#if defined(
NETWORK_AVALIABLE
)
if (options.network)
SendToServer_StartPlaying();
else
if (options.network)
SendToServer_StartPlaying();
else
@@
-1869,7
+1869,7
@@
static void execSetupArtwork()
setup.music_set = artwork.mus_current->identifier;
/* needed if last screen (setup choice) changed graphics, sounds or music */
setup.music_set = artwork.mus_current->identifier;
/* needed if last screen (setup choice) changed graphics, sounds or music */
- ReloadCustomArtwork();
+ ReloadCustomArtwork(
0
);
/* needed for displaying artwork name instead of artwork identifier */
graphics_set_name = artwork.gfx_current->name;
/* needed for displaying artwork name instead of artwork identifier */
graphics_set_name = artwork.gfx_current->name;
@@
-2409,6
+2409,8
@@
static void drawPlayerSetupInputInfo(int player_nr)
DrawText(mSX+11*32, mSY+2*32, int2str(player_nr +1, 1), FONT_INPUT_1_ACTIVE);
#if 1
DrawText(mSX+11*32, mSY+2*32, int2str(player_nr +1, 1), FONT_INPUT_1_ACTIVE);
#if 1
+ ClearRectangleOnBackground(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY,
+ TILEX, TILEY);
DrawGraphicThruMaskExt(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY,
PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
#else
DrawGraphicThruMaskExt(drawto, mSX + 8 * TILEX, mSY + 2 * TILEY,
PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
#else