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

in ogl_filltexbuf add pixel row matching color of bitmap edge to get a clean border when filtering cockpit overlay bitmaps; Small text correction for sound menu to fit better on screen

Browse source
This commit is contained in:
zicodxx 2011-01-16 19:33:30 +01:00
parent f5f7435439
commit 76514d8ba1
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -6,6 +6,7 @@ D1X-Rebirth Changelog
main/menu.c: When changing resolutions and Game_wind is present, send EVENT_WINDOW_ACTIVATE shortly so it's canvase will align to the new resolution seamlessly
main/titles.c: Generally use PATH_MAX for filename arrays in titles code
main/console.c, main/inferno.c: Toggle console by KEY_SHIFTED+KEY_ESC again - as it should be
arch/ogl/ogl.c, main/menu.c: in ogl_filltexbuf add pixel row matching color of bitmap edge to get a clean border when filtering cockpit overlay bitmaps; Small text correction for sound menu to fit better on screen
20110115
--------

8
arch/ogl/ogl.c
View file

@ -1287,6 +1287,14 @@ void ogl_filltexbuf(unsigned char *data, GLubyte *texp, int truewidth, int width
c = data[i++];
}
}
else if (x==width) // end of bitmap reached - fill this pixel with last color to make a clean border when filtering this texture
{
c = data[(width*(y+1))-1];
}
else if (y==height) // end of bitmap reached - fill this row with color or last row to make a clean border when filtering this texture
{
c = data[(width*(height-1))+x];
}
else
{
c = 256; // fill the pad space with transparency (or blackness)

2
main/menu.c
View file

@ -1788,7 +1788,7 @@ void do_sound_menu()
m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "cd music options:";
opt_sm_redbook_playorder = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = "force mac descent cd track order"; m[nitems++].value = GameCfg.OrigTrackOrder;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = "force mac cd track order"; m[nitems++].value = GameCfg.OrigTrackOrder;
#ifdef USE_SDLMIXER
m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "";