Added -nomusic ability for SDL_mixer API; Added -gl_fontfixwidth to scale fonts with fixed aspect on widescreen resolutions, scaled to height
This commit is contained in:
parent
8d6a5f125c
commit
5d7dc33e0c
|
@ -4,6 +4,7 @@ D2X-Rebirth Changelog
|
||||||
--------
|
--------
|
||||||
main/gamecntl.c: If a key combo is called which uses key of default wepaon binding, flush inputs
|
main/gamecntl.c: If a key combo is called which uses key of default wepaon binding, flush inputs
|
||||||
main/mission.c, main/mission.h: Added support for another registered D1 HOG with different patching order... damn you PARALLAX!
|
main/mission.c, main/mission.h: Added support for another registered D1 HOG with different patching order... damn you PARALLAX!
|
||||||
|
d2x.ini, arch/sdl/digi_mixer.c, include/args.h, main/gamefont.c, main/inferno.c, misc/args.c: Added -nomusic ability for SDL_mixer API; Added -gl_fontfixwidth to scale fonts with fixed aspect on widescreen resolutions, scaled to height
|
||||||
|
|
||||||
20080518
|
20080518
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -213,6 +213,9 @@ int digi_mixer_get_max_channels() { return digi_max_channels; }
|
||||||
// MIDI stuff follows.
|
// MIDI stuff follows.
|
||||||
|
|
||||||
void digi_mixer_play_midi_song(char * filename, char * melodic_bank, char * drum_bank, int loop ) {
|
void digi_mixer_play_midi_song(char * filename, char * melodic_bank, char * drum_bank, int loop ) {
|
||||||
|
if (GameArg.SndNoMusic)
|
||||||
|
return;
|
||||||
|
|
||||||
mix_set_music_volume(midi_volume);
|
mix_set_music_volume(midi_volume);
|
||||||
jukebox_load(); // update jukebox state
|
jukebox_load(); // update jukebox state
|
||||||
|
|
||||||
|
|
1
d2x.ini
1
d2x.ini
|
@ -36,6 +36,7 @@
|
||||||
;-lowresmovies Play low resolution movies if available (for slow machines)
|
;-lowresmovies Play low resolution movies if available (for slow machines)
|
||||||
;-subtitles Turn on movie subtitles
|
;-subtitles Turn on movie subtitles
|
||||||
;-gl_fixedfont Do not scale fonts to current resolution
|
;-gl_fixedfont Do not scale fonts to current resolution
|
||||||
|
;-gl_fontfixwidth Scale fonts with fixed width for widescreen resolutions
|
||||||
|
|
||||||
Multiplayer:
|
Multiplayer:
|
||||||
|
|
||||||
|
|
|
@ -70,6 +70,7 @@ typedef struct Arg
|
||||||
int GfxMovieSubtitles;
|
int GfxMovieSubtitles;
|
||||||
#ifdef OGL
|
#ifdef OGL
|
||||||
int OglFixedFont;
|
int OglFixedFont;
|
||||||
|
int OglFixedFontWidth;
|
||||||
#endif
|
#endif
|
||||||
int MplGameProfile;
|
int MplGameProfile;
|
||||||
int MplNoRankings;
|
int MplNoRankings;
|
||||||
|
|
|
@ -112,8 +112,15 @@ void gamefont_choose_game_font(int scrx,int scry){
|
||||||
#ifdef OGL
|
#ifdef OGL
|
||||||
if (!GameArg.OglFixedFont)
|
if (!GameArg.OglFixedFont)
|
||||||
{
|
{
|
||||||
FNTScaleX=scrx/font_conf[gf].font[m].x;
|
if (GameArg.OglFixedFontWidth)
|
||||||
FNTScaleY=scry/font_conf[gf].font[m].y;
|
{
|
||||||
|
FNTScaleX = FNTScaleY = scry/font_conf[gf].font[m].y;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
FNTScaleX = scrx/font_conf[gf].font[m].x;
|
||||||
|
FNTScaleY = scry/font_conf[gf].font[m].y;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
gamefont_loadfont(gf,m);
|
gamefont_loadfont(gf,m);
|
||||||
|
|
|
@ -180,6 +180,7 @@ void print_commandline_help()
|
||||||
printf( " -subtitles %s\n", "Turn on movie subtitles");
|
printf( " -subtitles %s\n", "Turn on movie subtitles");
|
||||||
#ifdef OGL
|
#ifdef OGL
|
||||||
printf( " -gl_fixedfont %s\n", "Do not scale fonts to current resolution");
|
printf( " -gl_fixedfont %s\n", "Do not scale fonts to current resolution");
|
||||||
|
printf( " -gl_fontfixwidth %s\n", "Scale fonts with fixed width for widescreen resolutions");
|
||||||
#endif // OGL
|
#endif // OGL
|
||||||
|
|
||||||
#ifdef NETWORK
|
#ifdef NETWORK
|
||||||
|
|
|
@ -179,6 +179,7 @@ void ReadCmdArgs(void)
|
||||||
// OpenGL Options
|
// OpenGL Options
|
||||||
|
|
||||||
GameArg.OglFixedFont = FindArg("-gl_fixedfont");
|
GameArg.OglFixedFont = FindArg("-gl_fixedfont");
|
||||||
|
GameArg.OglFixedFontWidth = FindArg("-gl_fontfixwidth");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Multiplayer Options
|
// Multiplayer Options
|
||||||
|
|
Loading…
Reference in a new issue