From c21558f2a340f3db2cc9d8b33905458d96076899 Mon Sep 17 00:00:00 2001 From: terminx Date: Fri, 26 Jan 2007 21:12:05 +0000 Subject: [PATCH] Minor crap git-svn-id: https://svn.eduke32.com/eduke32@474 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/build/src/osd.c | 22 ++++++++++++++-------- polymer/build/src/polymost.c | 2 +- polymer/eduke32/source/menus.c | 10 ++++------ 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/polymer/build/src/osd.c b/polymer/build/src/osd.c index 024f5f88a..5e5f555a8 100644 --- a/polymer/build/src/osd.c +++ b/polymer/build/src/osd.c @@ -424,16 +424,22 @@ int OSD_HandleKey(int sc, int press) { tabc = findsymbol(osdedittmp, NULL); - if (tabc->next && findsymbol(osdedittmp, tabc->next)) + if (tabc) { - symbol_t *symb=tabc; - - OSD_Printf("Matching symbols:\n"); - while (symb && symb != lastmatch) + if (tabc->next) { - OSD_Printf(" %s\n", symb->name); - lastmatch = symb; - symb=findsymbol(osdedittmp, lastmatch->next); + if (findsymbol(osdedittmp, tabc->next)) + { + symbol_t *symb=tabc; + + OSD_Printf("Matching symbols:\n"); + while (symb && symb != lastmatch) + { + OSD_Printf(" %s\n", symb->name); + lastmatch = symb; + symb=findsymbol(osdedittmp, lastmatch->next); + } + } } } } diff --git a/polymer/build/src/polymost.c b/polymer/build/src/polymost.c index 384225a1e..5cab5bdea 100644 --- a/polymer/build/src/polymost.c +++ b/polymer/build/src/polymost.c @@ -117,7 +117,7 @@ static struct glfiltermodes { long glanisotropy = 1; // 0 = maximum supported by card long glusetexcompr = 1; -long gltexfiltermode = 0; // GL_NEAREST +long gltexfiltermode = 2; // GL_NEAREST_MIPMAP_NEAREST long glusetexcache = 0; long glusetexcachecompression = 1; long glmultisample = 0, glnvmultisamplehint = 0; diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c index da7248a8c..191456db3 100644 --- a/polymer/eduke32/source/menus.c +++ b/polymer/eduke32/source/menus.c @@ -724,7 +724,7 @@ void menus(void) "-", "-", "-", - "Taunt macro setup...", + "Multiplayer macros", NULL }; @@ -959,7 +959,7 @@ void menus(void) case 20004: case 20005: rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); - menutext(160,24,0,0,"TAUNT MACRO SETUP"); + menutext(160,24,0,0,"MULTIPLAYER MACROS"); if (current_menu == 20004) { @@ -2676,7 +2676,7 @@ cheat_for_port_credits: { int io, ii, yy, d=c+160+40, enabled; char *opts[] = { - "Parental lock...", + "Parental lock", "-", "Game messages", "HUD weapon", @@ -3226,13 +3226,11 @@ cheat_for_port_credits: // menutext(c+154,50+62+16+16,MENUHIGHLIGHT(5),bpp==8,tempbuf); gametextpal(c+154,50+62+16+16-8,tempbuf,MENUHIGHLIGHT(5),bpp==8); - menutext(c,50+62+16+16+16,MENUHIGHLIGHT(6),bpp==8,"ANISOTROPY"); if (glanisotropy == 1) strcpy(tempbuf,"NONE"); else sprintf(tempbuf,"%ld-tap",glanisotropy); menutext(c+154,50+62+16+16+16,MENUHIGHLIGHT(6),bpp==8,tempbuf); - menutext(c,50+62+16+16+16+16,MENUHIGHLIGHT(7),bpp==8,"ADVANCED..."); - + menutext(c,50+62+16+16+16+16,MENUHIGHLIGHT(7),bpp==8,"ADVANCED VIDEO"); #endif break;