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

include/loadgl.h, main/newmenu.c, main/titles.c: Added definitions for OpenGL fucntions which might not be included in system headers; Cleaned and declared briefings palette hacks [EMULATING_D1 needs work]; Menu right border shadow was too wide;

Browse source
This commit is contained in:
zicodxx 2008-03-25 12:28:02 +00:00
parent 96f1a961f6
commit 3a747dbdee
4 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D2X-Rebirth Changelog
20080225
--------
include/loadgl.h, main/newmenu.c, main/titles.c: Added definitions for OpenGL fucntions which might not be included in system headers; Cleaned and declared briefings palette hacks (EMULATING_D1 needs work!); Menu right border shadow was too wide;
20080323
--------
main/kconfig.c, main/laser.c, main/menu.c, main/newmenu.c, main/playsave.c: Added lock status for mouse axis weapon cycling because of scaled mouse delta; Due to player feedback (any my opinion) making homer turn rate smaller to make them a bit harder to dodge; Preventing write of player data while Demo playback; Small code cleanup and corrections

8
include/loadgl.h
View file

@ -44,6 +44,14 @@
#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED
#endif
#ifndef GL_SCISSOR_TEST
#define GL_SCISSOR_TEST 0x0C11
#endif
#ifndef GL_CLAMP_TO_EDGE
#define GL_CLAMP_TO_EDGE 0x812F
#endif
#ifndef GL_NV_register_combiners
#define GL_NV_register_combiners 1
#define GL_REGISTER_COMBINERS_NV 0x8522

2
main/newmenu.c
View file

@ -216,7 +216,7 @@ void nm_draw_background(int x1, int y1, int x2, int y2 )
Gr_scanline_darkening_level = 2*7;
gr_setcolor( BM_XRGB(1,1,1) );
for (w=5*BGScaleX;w>=0;w--)
for (w=5*BGScaleX;w>0;w--)
gr_urect( x2-w, y1+w*(BGScaleY/BGScaleX), x2-w, y2-w*(BGScaleY/BGScaleX) );//right edge
gr_setcolor( BM_XRGB(0,0,0) );
for (h=5*BGScaleY;h>0;h--)

18
main/titles.c
View file

@ -531,7 +531,11 @@ void show_briefing_bitmap(grs_bitmap *bmp)
bitmap_canv = gr_create_sub_canvas(grd_curcanv, 220, 45, bmp->bm_w, bmp->bm_h);
curcanv_save = grd_curcanv;
gr_set_current_canvas(bitmap_canv);
#ifdef OGL
ogl_ubitmapm_cs(0,0,(bmp->bm_w*(SWIDTH/320)),(bmp->bm_h*(SHEIGHT/200)),bmp,255,F1_0);
#else
gr_bitmapm(0, 0, bmp);
#endif
gr_set_current_canvas(curcanv_save);
d_free(bitmap_canv);
@ -620,12 +624,9 @@ int show_char_delay(char the_char, int delay, int robot_num, int cursor_flag)
// -----------------------------------------------------------------------------
// loads a briefing screen
// also takes care for D1 emulation palette remapping in robot screens
// for OGL, redrawing of briefing_bm is done in show_briefing
int load_briefing_screen( char *fname )
{
int pcx_error;
ubyte old_pal[256*3];
if (briefing_bm.bm_data != NULL)
gr_free_bitmap_data(&briefing_bm);
@ -639,16 +640,11 @@ int load_briefing_screen( char *fname )
Error( "Error loading briefing screen <%s>, PCX load error: %s (%i)\n",fname, pcx_errormsg(pcx_error), pcx_error);
}
memcpy(old_pal,gr_palette,sizeof(old_pal));
if (EMULATING_D1 && stricmp(fname,"brief03.pcx") == 0)
{
gr_use_palette_table( "groupa.256" );
gr_remap_bitmap_good( &briefing_bm, old_pal, -1, -1 );
}
show_fullscr(&briefing_bm);
if (EMULATING_D1) // HACK, FIXME: D1 missions should use their own palette (PALETTE.256), but texture replacements not complete
gr_use_palette_table("groupa.256");
gr_palette_load(gr_palette);
set_briefing_fontcolor();