zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-05 05:10:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

spritecol

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@325 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-10-30 01:50:52 +00:00
parent 59f5ab835f
commit d1bff5a20b
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
polymer/build/src/defs.c
View file

@ -395,12 +395,16 @@ static int defsparser(scriptfile *script)
break; break;
case T_SPRITECOL: case T_SPRITECOL:
{ {
int tile,col,type; int tile,col,col2;
if (scriptfile_getsymbol(script,&tile)) break; if (scriptfile_getsymbol(script,&tile)) break;
if (scriptfile_getnumber(script,&col)) break; if (scriptfile_getnumber(script,&col)) break;
if (scriptfile_getnumber(script,&type)) break; if (scriptfile_getnumber(script,&col2)) break;
if ((unsigned long)tile < MAXTILES) spritecol2d[tile][type] = col; if ((unsigned long)tile < MAXTILES)
{
spritecol2d[tile][0] = col;
spritecol2d[tile][1] = col2;
}
} }
break; break;
case T_2DCOL: case T_2DCOL:

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

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