zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@969 1a8010ca-5511-0410-912e-c29ae57300e0

This commit is contained in:
terminx 2008-08-11 23:22:29 +00:00
parent fc1551af49
commit e97bb94719
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
polymer/build/src/osd.c
View File

@ -540,7 +540,7 @@ static int _internal_osdfunc_listsymbols(const osdfuncparm_t *parm)
{ {
int x = 0, count = 0; int x = 0, count = 0;
maxwidth += 3; maxwidth += 3;
OSD_Printf(OSDTEXT_RED "\nSymbol listing:\n"); OSD_Printf(OSDTEXT_RED "Symbol listing:\n");
for (i=symbols; i!=NULL; i=i->next) for (i=symbols; i!=NULL; i=i->next)
{ {
if (i->func != (void *)OSD_UNALIASED) if (i->func != (void *)OSD_UNALIASED)
@ -892,7 +892,7 @@ int OSD_HandleChar(char ch)
if (!lastmatch->next) break; if (!lastmatch->next) break;
symb=findsymbol(osdedittmp, lastmatch->next); 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; maxwidth += 3;
symb = tabc; symb = tabc;
OSD_Printf(" "); OSD_Printf(" ");
@ -1804,7 +1804,7 @@ static symbol_t *findexactsymbol(const char *name)
startingat = symbols; startingat = symbols;
for (; startingat; startingat=startingat->next) 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; return NULL;
} }

11
polymer/eduke32/source/osdfuncs.c
View File

@ -81,7 +81,7 @@ int GAME_getrowheight(int w)
#define BITSTH 1+32+8+16 // high translucency #define BITSTH 1+32+8+16 // high translucency
#define BITSTL 1+8+16 // low translucency #define BITSTL 1+8+16 // low translucency
#define BITS 8+16+64 // solid #define BITS 8+16+64 // solid
#define SHADE 16 #define SHADE 0
#define PALETTE 4 #define PALETTE 4
void GAME_onshowosd(int shown) void GAME_onshowosd(int shown)
@ -125,17 +125,20 @@ void GAME_clearbackground(int c, int r)
xsiz = tilesizx[BGTILE]; xsiz = tilesizx[BGTILE];
tx2 = xdim/xsiz; tx2 = xdim/xsiz;
ysiz = tilesizy[BGTILE]; ysiz = tilesizy[BGTILE];
// ty2 = ydim/ysiz;
ty2 = daydim/ysiz; ty2 = daydim/ysiz;
for (x=0;x<=tx2;x++) for (x=tx2;x>=0;x--)
for (y=0;y<=ty2;y++) 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); rotatesprite(x*xsiz<<16,y*ysiz<<16,65536L,0,BGTILE,SHADE,PALETTE,bits,0,0,xdim,daydim);
xsiz = tilesizy[BORDTILE]; xsiz = tilesizy[BORDTILE];
tx2 = xdim/xsiz; tx2 = xdim/xsiz;
ysiz = tilesizx[BORDTILE]; 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); rotatesprite(x*xsiz<<16,(daydim+ysiz+1)<<16,65536L,1536,BORDTILE,SHADE-12,PALETTE,BITS,0,0,xdim,daydim+ysiz+1);
} }

2
polymer/eduke32/source/premap.c
View File

@ -577,7 +577,7 @@ void pickrandomspot(int snum)
{ {
for (j=0;j<ud.multimode;j++) for (j=0;j<ud.multimode;j++)
{ {
if (j != snum && g_player[j].ps->team == 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<numplayersprites;k++) for (k=0;k<numplayersprites;k++)
{ {