diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 097663de1..4f9d98a4c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -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 diff --git a/include/loadgl.h b/include/loadgl.h index 1a44a9ca3..5d3d8fd54 100644 --- a/include/loadgl.h +++ b/include/loadgl.h @@ -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 diff --git a/main/newmenu.c b/main/newmenu.c index 8fe749317..31889112f 100644 --- a/main/newmenu.c +++ b/main/newmenu.c @@ -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--) diff --git a/main/titles.c b/main/titles.c index 066531b44..5a33a4a81 100644 --- a/main/titles.c +++ b/main/titles.c @@ -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();