projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20001125-3-src
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 948f1ceb73602a5bbdfda6c0c2161be133678c15..cb715f420688cae2f69bccc3dd841872c606e127 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-60,7
+60,7
@@
void DrawHeadline()
int x = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * FONT1_XSIZE) / 2;
DrawText(x, SY + 8, PROGRAM_TITLE_STRING, FS_BIG, FC_YELLOW);
int x = SX + (SXSIZE - strlen(PROGRAM_TITLE_STRING) * FONT1_XSIZE) / 2;
DrawText(x, SY + 8, PROGRAM_TITLE_STRING, FS_BIG, FC_YELLOW);
- DrawTextFCentered(46, FC_RED,
COPYRIGHT
_STRING);
+ DrawTextFCentered(46, FC_RED,
WINDOW_SUBTITLE
_STRING);
}
void DrawMainMenu()
}
void DrawMainMenu()
@@
-84,6
+84,12
@@
void DrawMainMenu()
/* needed if last screen was the editor screen */
UndrawSpecialEditorDoor();
/* needed if last screen was the editor screen */
UndrawSpecialEditorDoor();
+ /* needed if last screen was the setup screen and fullscreen state changed */
+ ChangeVideoModeIfNeeded();
+#ifdef TARGET_SDL
+ SetDrawtoField(DRAW_BACKBUFFER);
+#endif
+
/* map gadgets for main menu screen */
MapTapeButtons();
/* map gadgets for main menu screen */
MapTapeButtons();
@@
-327,7
+333,7
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
if (setup.autorecord)
TapeStartRecording();
if (setup.autorecord)
TapeStartRecording();
-#if
ndef MSDOS
+#if
!defined(MSDOS) && !defined(WIN32)
if (options.network)
SendToServer_StartPlaying();
else
if (options.network)
SendToServer_StartPlaying();
else
@@
-686,7
+692,7
@@
void DrawHelpScreenCreditsText()
DrawTextFCentered(100, FC_GREEN,
"Credits:");
DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW,
DrawTextFCentered(100, FC_GREEN,
"Credits:");
DrawTextFCentered(ystart + 0 * ystep, FC_YELLOW,
- "DOS
/Windows
port of the game:");
+ "DOS port of the game:");
DrawTextFCentered(ystart + 1 * ystep, FC_RED,
"Guido Schulz");
DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW,
DrawTextFCentered(ystart + 1 * ystep, FC_RED,
"Guido Schulz");
DrawTextFCentered(ystart + 2 * ystep, FC_YELLOW,
@@
-716,13
+722,13
@@
void DrawHelpScreenContactText()
DrawTextFCentered(ystart + 1 * ystep, FC_YELLOW,
"If you like it, send e-mail to:");
DrawTextFCentered(ystart + 2 * ystep, FC_RED,
DrawTextFCentered(ystart + 1 * ystep, FC_YELLOW,
"If you like it, send e-mail to:");
DrawTextFCentered(ystart + 2 * ystep, FC_RED,
- "
aeglos@valinor.owl.de
");
+ "
info@artsoft.org
");
DrawTextFCentered(ystart + 3 * ystep, FC_YELLOW,
"or SnailMail to:");
DrawTextFCentered(ystart + 4 * ystep + 0, FC_RED,
"Holger Schemel");
DrawTextFCentered(ystart + 4 * ystep + 20, FC_RED,
DrawTextFCentered(ystart + 3 * ystep, FC_YELLOW,
"or SnailMail to:");
DrawTextFCentered(ystart + 4 * ystep + 0, FC_RED,
"Holger Schemel");
DrawTextFCentered(ystart + 4 * ystep + 20, FC_RED,
- "
Oststrasse 11a
");
+ "
Detmolder Strasse 189
");
DrawTextFCentered(ystart + 4 * ystep + 40, FC_RED,
"33604 Bielefeld");
DrawTextFCentered(ystart + 4 * ystep + 60, FC_RED,
DrawTextFCentered(ystart + 4 * ystep + 40, FC_RED,
"33604 Bielefeld");
DrawTextFCentered(ystart + 4 * ystep + 60, FC_RED,
@@
-1283,7
+1289,10
@@
void DrawSetupScreen()
#endif
{ &setup.scroll_delay, "Scroll Delay:" },
{ &setup.soft_scrolling, "Soft Scroll.:" },
#endif
{ &setup.scroll_delay, "Scroll Delay:" },
{ &setup.soft_scrolling, "Soft Scroll.:" },
+#if 0
{ &setup.fading, "Fading:" },
{ &setup.fading, "Fading:" },
+#endif
+ { &setup.fullscreen, "Fullscreen:" },
{ &setup.quick_doors, "Quick Doors:" },
{ &setup.autorecord, "Auto-Record:" },
{ &setup.team_mode, "Team-Mode:" },
{ &setup.quick_doors, "Quick Doors:" },
{ &setup.autorecord, "Auto-Record:" },
{ &setup.team_mode, "Team-Mode:" },
@@
-1480,6
+1489,7
@@
void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
setup.soft_scrolling = !setup.soft_scrolling;
}
DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
setup.soft_scrolling = !setup.soft_scrolling;
}
+#if 0
else if (y==8)
{
if (setup.fading)
else if (y==8)
{
if (setup.fading)
@@
-1488,6
+1498,15
@@
void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
setup.fading = !setup.fading;
}
DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
setup.fading = !setup.fading;
}
+#endif
+ else if (y==8 && fullscreen_available)
+ {
+ if (setup.fullscreen)
+ DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
+ else
+ DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
+ setup.fullscreen = !setup.fullscreen;
+ }
else if (y==9)
{
if (setup.quick_doors)
else if (y==9)
{
if (setup.quick_doors)
@@
-1904,8
+1923,12
@@
void CustomizeKeyboard(int player_nr)
break;
}
break;
}
+ /* all keys configured -- wait for "Escape" or "Return" key */
+ if (step_nr == 6)
+ break;
+
/* press 'Enter' to keep the existing key binding */
/* press 'Enter' to keep the existing key binding */
- if (key == KEY_Return
|| step_nr == 6
)
+ if (key == KEY_Return)
key = *customize_step[step_nr].key;
/* check if key already used */
key = *customize_step[step_nr].key;
/* check if key already used */
@@
-2088,7
+2111,7
@@
void CalibrateJoystick(int player_nr)
#ifndef MSDOS
#ifndef MSDOS
-#ifdef USE_SDL_
LIBRARY
+#ifdef USE_SDL_
JOYSTICK
joy_ctrl.x = Get_SDL_Joystick_Axis(joystick_fd, 0);
joy_ctrl.y = Get_SDL_Joystick_Axis(joystick_fd, 1);
#else
joy_ctrl.x = Get_SDL_Joystick_Axis(joystick_fd, 0);
joy_ctrl.y = Get_SDL_Joystick_Axis(joystick_fd, 1);
#else
@@
-2215,6
+2238,8
@@
void CalibrateJoystick(int player_nr)
NextEvent(&event);
HandleOtherEvents(&event);
NextEvent(&event);
HandleOtherEvents(&event);
+
+ Delay(10);
}
}
return;
}
}
return;