projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990122-1
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 16f08ca7d2c458456156098bc2f67c86e23b14b3..2395c4676c25cfb4c0fff4af11b54bb6028c7402 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-47,9
+47,9
@@
extern unsigned char get_ascii(KeySym);
void DrawHeadline()
{
void DrawHeadline()
{
- int x = SX + (SXSIZE - strlen(
GAME
TITLE_STRING) * FONT1_XSIZE) / 2;
+ int x = SX + (SXSIZE - strlen(
PROGRAM_
TITLE_STRING) * FONT1_XSIZE) / 2;
- DrawText(x, SY + 8,
GAME
TITLE_STRING, FS_BIG, FC_YELLOW);
+ DrawText(x, SY + 8,
PROGRAM_
TITLE_STRING, FS_BIG, FC_YELLOW);
DrawTextFCentered(46, FC_RED, COPYRIGHT_STRING);
}
DrawTextFCentered(46, FC_RED, COPYRIGHT_STRING);
}
@@
-58,6
+58,8
@@
void DrawMainMenu()
int i;
char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
int i;
char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
+ XAutoRepeatOn(display);
+
/* needed if last screen was the playing screen, invoked from level editor */
if (level_editor_test_game)
{
/* needed if last screen was the playing screen, invoked from level editor */
if (level_editor_test_game)
{
@@
-87,7
+89,7
@@
void DrawMainMenu()
DrawText(SX + 32, SY + 8*32, "Setup", FS_BIG, FC_GREEN);
DrawText(SX + 32, SY + 9*32, "Quit", FS_BIG, FC_GREEN);
DrawText(SX + 32, SY + 8*32, "Setup", FS_BIG, FC_GREEN);
DrawText(SX + 32, SY + 9*32, "Quit", FS_BIG, FC_GREEN);
- DrawMicroLevel(MICROLEV_XPOS,
MICROLEV_YPOS
);
+ DrawMicroLevel(MICROLEV_XPOS,
MICROLEV_YPOS, TRUE
);
DrawTextF(7*32 + 6, 3*32 + 9, FC_RED, "%d-%d",
leveldir[leveldir_nr].first_level,
DrawTextF(7*32 + 6, 3*32 + 9, FC_RED, "%d-%d",
leveldir[leveldir_nr].first_level,
@@
-128,7
+130,6
@@
void DrawMainMenu()
OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
ClearEventQueue();
OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
ClearEventQueue();
- XAutoRepeatOn(display);
}
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
}
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
@@
-200,7
+201,7
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
int2str(level_nr, 3), FS_BIG, font_color);
LoadLevel(level_nr);
int2str(level_nr, 3), FS_BIG, font_color);
LoadLevel(level_nr);
- DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS);
+ DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS
, TRUE
);
TapeErase();
LoadTape(level_nr);
TapeErase();
LoadTape(level_nr);
@@
-245,7
+246,8
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
}
else if (y == 6)
{
}
else if (y == 6)
{
- if (leveldir[leveldir_nr].readonly)
+ if (leveldir[leveldir_nr].readonly &&
+ strcmp(setup.player_name, "Artsoft") != 0)
Request("This level is read only !", REQ_CONFIRM);
game_status = LEVELED;
DrawLevelEd();
Request("This level is read only !", REQ_CONFIRM);
game_status = LEVELED;
DrawLevelEd();
@@
-290,7
+292,10
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
out:
if (game_status == MAINMENU)
out:
if (game_status == MAINMENU)
+ {
+ DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, FALSE);
DoAnimation();
DoAnimation();
+ }
}
#define MAX_HELPSCREEN_ELS 10
}
#define MAX_HELPSCREEN_ELS 10