From e97bb94719e25ebaf1b5ffa7b9c1239bc6dc572d Mon Sep 17 00:00:00 2001 From: terminx Date: Mon, 11 Aug 2008 23:22:29 +0000 Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@969 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/build/src/osd.c | 6 +++--- polymer/eduke32/source/osdfuncs.c | 11 +++++++---- polymer/eduke32/source/premap.c | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/polymer/build/src/osd.c b/polymer/build/src/osd.c index ad21d1941..d6ba4c893 100644 --- a/polymer/build/src/osd.c +++ b/polymer/build/src/osd.c @@ -540,7 +540,7 @@ static int _internal_osdfunc_listsymbols(const osdfuncparm_t *parm) { int x = 0, count = 0; maxwidth += 3; - OSD_Printf(OSDTEXT_RED "\nSymbol listing:\n"); + OSD_Printf(OSDTEXT_RED "Symbol listing:\n"); for (i=symbols; i!=NULL; i=i->next) { if (i->func != (void *)OSD_UNALIASED) @@ -892,7 +892,7 @@ int OSD_HandleChar(char ch) if (!lastmatch->next) break; symb=findsymbol(osdedittmp, lastmatch->next); } - OSD_Printf(OSDTEXT_RED "\nFound %d possible completions for '%s':\n",num,osdedittmp); + OSD_Printf(OSDTEXT_RED "Found %d possible completions for '%s':\n",num,osdedittmp); maxwidth += 3; symb = tabc; OSD_Printf(" "); @@ -1804,7 +1804,7 @@ static symbol_t *findexactsymbol(const char *name) startingat = symbols; for (; startingat; startingat=startingat->next) - if (!Bstrcasecmp(name, startingat->name)) return startingat; + if (startingat->func != (void *)OSD_UNALIASED && !Bstrcasecmp(name, startingat->name)) return startingat; return NULL; } diff --git a/polymer/eduke32/source/osdfuncs.c b/polymer/eduke32/source/osdfuncs.c index 6905702df..46a2f5bfc 100644 --- a/polymer/eduke32/source/osdfuncs.c +++ b/polymer/eduke32/source/osdfuncs.c @@ -81,7 +81,7 @@ int GAME_getrowheight(int w) #define BITSTH 1+32+8+16 // high translucency #define BITSTL 1+8+16 // low translucency #define BITS 8+16+64 // solid -#define SHADE 16 +#define SHADE 0 #define PALETTE 4 void GAME_onshowosd(int shown) @@ -125,17 +125,20 @@ void GAME_clearbackground(int c, int r) xsiz = tilesizx[BGTILE]; tx2 = xdim/xsiz; ysiz = tilesizy[BGTILE]; +// ty2 = ydim/ysiz; ty2 = daydim/ysiz; - for (x=0;x<=tx2;x++) - for (y=0;y<=ty2;y++) + for (x=tx2;x>=0;x--) + for (y=ty2;y>=0;y--) +// for (y=ty2+1;y>=1;y--) +// rotatesprite(x*xsiz<<16,((daydim-ydim)+(y*ysiz))<<16,65536L,0,BGTILE,SHADE,PALETTE,bits,0,0,xdim,daydim); rotatesprite(x*xsiz<<16,y*ysiz<<16,65536L,0,BGTILE,SHADE,PALETTE,bits,0,0,xdim,daydim); xsiz = tilesizy[BORDTILE]; tx2 = xdim/xsiz; ysiz = tilesizx[BORDTILE]; - for (x=0;x<=tx2;x++) + for (x=tx2;x>=0;x--) rotatesprite(x*xsiz<<16,(daydim+ysiz+1)<<16,65536L,1536,BORDTILE,SHADE-12,PALETTE,BITS,0,0,xdim,daydim+ysiz+1); } diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c index d0df0e09a..9ccf76573 100644 --- a/polymer/eduke32/source/premap.c +++ b/polymer/eduke32/source/premap.c @@ -577,7 +577,7 @@ void pickrandomspot(int snum) { for (j=0;jteam == g_player[snum].ps->team && sprite[g_player[j].ps->i].extra > 0) + if (j != snum && g_player[j].ps->team == p->team && sprite[g_player[j].ps->i].extra > 0) { for (k=0;k