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

some menu fixes

Browse source
This commit is contained in:
zicodxx 2007-03-03 18:27:55 +00:00
parent 9c758b2cc9
commit f268021ddb
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dxx-changelog.txt
View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20070303
--------
main/game.c, main/newmenu.c: some menu fixes
20070228
--------
main/game.c: newdemo-related fixes

3
main/game.c
View file

@ -1513,7 +1513,6 @@ void show_d1x_help()
m[ 2].type = NM_TYPE_TEXT; m[ 2].text = "CTRL-ALT-`\t Start/Stop Hud-Logging";
m[ 3].type = NM_TYPE_TEXT; m[ 3].text = "";
m[ 4].type = NM_TYPE_TEXT; m[ 4].text = "Multiplayer:";
m[ 5].type = NM_TYPE_TEXT; m[ 5].text = "F8\t Send message";
m[ 6].type = NM_TYPE_TEXT; m[ 6].text = "ALT-F6\t Accept new player";
m[ 7].type = NM_TYPE_TEXT; m[ 7].text = "CTRL-N\t Game-Master Menu";
@ -1867,7 +1866,7 @@ void show_help()
m[ 8].type = NM_TYPE_TEXT; m[ 8].text = TXT_HELP_PRTSCN;
m[ 9].type = NM_TYPE_TEXT; m[ 9].text = TXT_HELP_1TO5;
m[10].type = NM_TYPE_TEXT; m[10].text = TXT_HELP_6TO10;
m[11].type = NM_TYPE_TEXT; m[11].text = "SHIFT F1\t SHOW D1X HELP";
m[11].type = NM_TYPE_TEXT; m[11].text = "SHIFT-F1\t SHOW D1X HELP";
m[12].type = NM_TYPE_TEXT; m[12].text = "";
m[13].type = NM_TYPE_TEXT; m[13].text = TXT_HELP_TO_VIEW;
newmenu_do( NULL, TXT_KEYS, 14, m, NULL );

14
main/newmenu.c
View file

@ -901,8 +901,8 @@ int newmenu_do3_real( char * title, char * subtitle, int nitems, newmenu_item *
old_choice = choice;
switch( k ) {
case KEY_V + KEY_CTRLED:
#ifndef __WINDOWS__
case KEY_V + KEY_CTRLED:
case KEY_INSERT + KEY_SHIFTED:
if(item[choice].type==NM_TYPE_INPUT)
{
@ -1976,6 +1976,7 @@ int newmenu_listbox1( char * title, int nitems, char * items[], int allow_abort_
int width, height, wx, wy, title_height;
int font_height,font_height1;
keyd_repeat = 1;
bkg bg;
#ifdef NEWMENU_MOUSE
int mx, my, x1, x2, y1, y2, mouse_state, omouse_state; //, dblclick_flag;
int close_x,close_y;
@ -2013,8 +2014,10 @@ int newmenu_listbox1( char * title, int nitems, char * items[], int allow_abort_
if ( wy < title_height )
wy = title_height;
gr_bm_bitblt(grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h, 0, 0, 0, 0, &(grd_curcanv->cv_bitmap), &(VR_offscreen_menu->cv_bitmap) );
nm_draw_background( wx-(15*MENSCALE_X),wy-title_height-(15*MENSCALE_Y),wx+width+(15*MENSCALE_X),wy+height+(15*MENSCALE_Y) );
bg.saved = NULL;
bg.background = gr_create_bitmap(grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h);
gr_bm_bitblt(grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h, 0, 0, 0, 0, &grd_curcanv->cv_bitmap, bg.background );
nm_draw_background( wx-(15*MENSCALE_X),wy-title_height-(15*MENSCALE_Y),wx+width+(15*MENSCALE_X),wy+height+(15*MENSCALE_Y) );
gr_string( 0x8000, wy - title_height, title );
@ -2237,7 +2240,10 @@ int newmenu_listbox1( char * title, int nitems, char * items[], int allow_abort_
newmenu_hide_cursor();
keyd_repeat = old_keyd_repeat;
gr_bm_bitblt(grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h, 0, 0, 0, 0, &(VR_offscreen_menu->cv_bitmap), &(grd_curcanv->cv_bitmap) );
gr_bm_bitblt(grd_curcanv->cv_bitmap.bm_w, grd_curcanv->cv_bitmap.bm_h, 0, 0, 0, 0, bg.background, &grd_curcanv->cv_bitmap );
if ( bg.background != &VR_offscreen_buffer->cv_bitmap )
gr_free_bitmap(bg.background);
return citem;
}