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

Fixes for http://forums.3drealms.com/vb/showpost.php?p=481243 and possibly http://forums.3drealms.com/vb/showpost.php?p=480994 

git-svn-id: https://svn.eduke32.com/eduke32@477 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2007-01-29 01:19:49 +00:00
parent 64ec370c98
commit 4c1a6e6ce1
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
polymer/build/src/hightile.c
View File

@ -46,7 +46,7 @@ static hicreplctyp * hicfindsubst(long picnum, long palnum, long skybox)
}
}
if (!palnum) break;
if (!palnum || palnum == DETAILPAL) break;
palnum = 0;
} while (1);

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

@ -202,8 +202,7 @@ static int _internal_osdfunc_vars(const osdfuncparm_t *parm)
osdrows = atoi(parm->parms[0]);
if (osdrows < 1) osdrows = 1;
else if (osdrows > osdmaxrows) osdrows = osdmaxrows;
if (osdrowscur < osdrows) osdscroll = 1;
else if (osdrowscur > osdrows) osdscroll = -1;
osdrowscur = osdrows;
return OSDCMD_OK;
}
}

2
polymer/build/src/winlayer.c
View File

@ -2587,7 +2587,7 @@ static int SetupDirectDraw(int width, int height)
// attach a palette to the primary surface
initprintf(" - Creating palette\n");
result = IDirectDraw_CreatePalette(lpDD, DDPCAPS_8BIT | DDPCAPS_ALLOW256 | DDPCAPS_INITIALIZE, (PALETTEENTRY*)curpalette, &lpDDPalette, NULL);
result = IDirectDraw_CreatePalette(lpDD, DDPCAPS_8BIT | DDPCAPS_ALLOW256, (PALETTEENTRY*)curpalette, &lpDDPalette, NULL);
if (result != DD_OK) {
ShowDDrawErrorBox("Failure creating palette", result);
UninitDirectDraw();

9
polymer/eduke32/source/menus.c
View File

@ -723,7 +723,6 @@ void menus(void)
"Switch weapon when empty",
"-",
"-",
"-",
"Multiplayer macros",
NULL
};
@ -3729,7 +3728,7 @@ cheat_for_port_credits:
gametext(c+160-16,46+16+16-8,tempbuf,MENUHIGHLIGHT(2),2+8+16);
gametext(c+10,90+16,"UP:",MENUHIGHLIGHT(3),2+8+16);
gametextpal(c+10,90+16,"UP:",MENUHIGHLIGHT(3),10);
if (MouseDigitalFunctions[1][0] < 0)
strcpy(tempbuf, " -NONE-");
else
@ -3738,7 +3737,7 @@ cheat_for_port_credits:
for (i=0;tempbuf[i];i++) if (tempbuf[i]=='_') tempbuf[i] = ' ';
minitextshade(c+10+60,91+16,tempbuf,MENUHIGHLIGHT(3),0,10+16);
gametext(c+10,90+16+10,"DOWN:",MENUHIGHLIGHT(4),2+8+16);
gametextpal(c+10,90+16+10,"DOWN:",MENUHIGHLIGHT(4),10);
if (MouseDigitalFunctions[1][1] < 0)
strcpy(tempbuf, " -NONE-");
else
@ -3747,7 +3746,7 @@ cheat_for_port_credits:
for (i=0;tempbuf[i];i++) if (tempbuf[i]=='_') tempbuf[i] = ' ';
minitextshade(c+10+60,91+16+10,tempbuf,MENUHIGHLIGHT(4),0,10+16);
gametext(c+10,90+16+10+10,"LEFT:",MENUHIGHLIGHT(5),2+8+16);
gametextpal(c+10,90+16+10+10,"LEFT:",MENUHIGHLIGHT(5),10);
if (MouseDigitalFunctions[0][0] < 0)
strcpy(tempbuf, " -NONE-");
else
@ -3756,7 +3755,7 @@ cheat_for_port_credits:
for (i=0;tempbuf[i];i++) if (tempbuf[i]=='_') tempbuf[i] = ' ';
minitextshade(c+10+60,91+16+10+10,tempbuf,MENUHIGHLIGHT(5),0,10+16);
gametext(c+10,90+16+10+10+10,"RIGHT:",MENUHIGHLIGHT(6),2+8+16);
gametextpal(c+10,90+16+10+10+10,"RIGHT:",MENUHIGHLIGHT(6),10);
if (MouseDigitalFunctions[0][1] < 0)
strcpy(tempbuf, " -NONE-");
else