TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added -nomusic ability for SDL_mixer API; Added -gl_fontfixwidth to scale fonts with fixed aspect on widescreen resolutions, scaled to height

Browse source
This commit is contained in:
zicodxx 2008-05-19 19:28:27 +00:00
parent 8d6a5f125c
commit 5d7dc33e0c
7 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -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/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
--------

3
arch/sdl/digi_mixer.c
View file

@ -213,6 +213,9 @@ int digi_mixer_get_max_channels() { return digi_max_channels; }
// MIDI stuff follows.
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);
jukebox_load(); // update jukebox state

1
d2x.ini
View file

@ -36,6 +36,7 @@
;-lowresmovies Play low resolution movies if available (for slow machines)
;-subtitles Turn on movie subtitles
;-gl_fixedfont Do not scale fonts to current resolution
;-gl_fontfixwidth Scale fonts with fixed width for widescreen resolutions
Multiplayer:

1
include/args.h
View file

@ -70,6 +70,7 @@ typedef struct Arg
int GfxMovieSubtitles;
#ifdef OGL
int OglFixedFont;
int OglFixedFontWidth;
#endif
int MplGameProfile;
int MplNoRankings;

11
main/gamefont.c
View file

@ -112,8 +112,15 @@ void gamefont_choose_game_font(int scrx,int scry){
#ifdef OGL
if (!GameArg.OglFixedFont)
{
FNTScaleX=scrx/font_conf[gf].font[m].x;
FNTScaleY=scry/font_conf[gf].font[m].y;
if (GameArg.OglFixedFontWidth)
{
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
gamefont_loadfont(gf,m);

1
main/inferno.c
View file

@ -180,6 +180,7 @@ void print_commandline_help()
printf( " -subtitles %s\n", "Turn on movie subtitles");
#ifdef OGL
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
#ifdef NETWORK

1
misc/args.c
View file

@ -179,6 +179,7 @@ void ReadCmdArgs(void)
// OpenGL Options
GameArg.OglFixedFont = FindArg("-gl_fixedfont");
GameArg.OglFixedFontWidth = FindArg("-gl_fontfixwidth");
#endif
// Multiplayer Options