projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20001204-1-src
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index b97c44a134777973bdf98284cb50733a7e7728ee..35a6729f85787a01e26195a6476189b664dbc4a3 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-11,15
+11,14
@@
* screens.c *
***********************************************************/
* screens.c *
***********************************************************/
+#include "libgame/libgame.h"
+
#include "screens.h"
#include "events.h"
#include "screens.h"
#include "events.h"
-#include "sound.h"
#include "game.h"
#include "tools.h"
#include "editor.h"
#include "game.h"
#include "tools.h"
#include "editor.h"
-#include "misc.h"
#include "files.h"
#include "files.h"
-#include "buttons.h"
#include "tape.h"
#include "joystick.h"
#include "cartoons.h"
#include "tape.h"
#include "joystick.h"
#include "cartoons.h"
@@
-85,7
+84,7
@@
void DrawMainMenu()
UndrawSpecialEditorDoor();
/* needed if last screen was the setup screen and fullscreen state changed */
UndrawSpecialEditorDoor();
/* needed if last screen was the setup screen and fullscreen state changed */
-
ChangeVideoModeIfNeeded(
);
+
setup.fullscreen = ChangeVideoModeIfNeeded(setup.fullscreen
);
#ifdef TARGET_SDL
SetDrawtoField(DRAW_BACKBUFFER);
#endif
#ifdef TARGET_SDL
SetDrawtoField(DRAW_BACKBUFFER);
#endif
@@
-262,9
+261,9
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
level_nr = new_level_nr;
level_nr = new_level_nr;
- DrawTextExt(drawto,
gc,
SX + 11 * 32, SY + 3 * 32,
+ DrawTextExt(drawto, SX + 11 * 32, SY + 3 * 32,
int2str(level_nr, 3), FS_BIG, font_color);
int2str(level_nr, 3), FS_BIG, font_color);
- DrawTextExt(window,
gc,
SX + 11 * 32, SY + 3 * 32,
+ DrawTextExt(window, SX + 11 * 32, SY + 3 * 32,
int2str(level_nr, 3), FS_BIG, font_color);
LoadLevel(level_nr);
int2str(level_nr, 3), FS_BIG, font_color);
LoadLevel(level_nr);
@@
-617,7
+616,7
@@
void DrawHelpScreenElAction(int start)
}
j++;
}
j++;
- DrawGraphicExt(drawto,
gc,
xstart, ystart+(i-start)*ystep, graphic+frame);
+ DrawGraphicExt(drawto, xstart, ystart+(i-start)*ystep, graphic+frame);
i++;
}
i++;
}
@@
-842,9
+841,9
@@
void HandleTypeName(int newxpos, Key key)
setup.player_name[xpos] = ascii;
setup.player_name[xpos + 1] = 0;
xpos++;
setup.player_name[xpos] = ascii;
setup.player_name[xpos + 1] = 0;
xpos++;
- DrawTextExt(drawto,
gc,
SX + 6*32, SY + ypos*32,
+ DrawTextExt(drawto, SX + 6*32, SY + ypos*32,
setup.player_name, FS_BIG, FC_YELLOW);
setup.player_name, FS_BIG, FC_YELLOW);
- DrawTextExt(window,
gc,
SX + 6*32, SY + ypos*32,
+ DrawTextExt(window, SX + 6*32, SY + ypos*32,
setup.player_name, FS_BIG, FC_YELLOW);
DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
}
setup.player_name, FS_BIG, FC_YELLOW);
DrawGraphic(xpos + 6, ypos, GFX_KUGEL_ROT);
}
@@
-1409,7
+1408,7
@@
void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
{
int yy = y-1;
{
int yy = y-1;
- if (y == 3 &&
sysinfo.audio
_available)
+ if (y == 3 &&
audio.sound
_available)
{
if (setup.sound)
{
{
if (setup.sound)
{
@@
-1423,7
+1422,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.sound = !setup.sound;
}
DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
setup.sound = !setup.sound;
}
- else if (y == 4 &&
sysinfo.audio_
loops_available)
+ else if (y == 4 &&
audio.
loops_available)
{
if (setup.sound_loops)
DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
{
if (setup.sound_loops)
DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@
-1435,7
+1434,7
@@
void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
}
setup.sound_loops = !setup.sound_loops;
}
}
setup.sound_loops = !setup.sound_loops;
}
- else if (y == 5 &&
sysinfo.audio_
loops_available)
+ else if (y == 5 &&
audio.
loops_available)
{
if (setup.sound_music)
DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
{
if (setup.sound_music)
DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
@@
-1500,7
+1499,7
@@
void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
setup.fading = !setup.fading;
}
#endif
setup.fading = !setup.fading;
}
#endif
- else if (y == 8 && fullscreen_available)
+ else if (y == 8 &&
video.
fullscreen_available)
{
if (setup.fullscreen)
DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
{
if (setup.fullscreen)
DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);