diff --git a/polymer/build/src/defs.c b/polymer/build/src/defs.c index b32ba0c0d..172de61ed 100644 --- a/polymer/build/src/defs.c +++ b/polymer/build/src/defs.c @@ -395,12 +395,16 @@ static int defsparser(scriptfile *script) break; case T_SPRITECOL: { - int tile,col,type; + int tile,col,col2; if (scriptfile_getsymbol(script,&tile)) break; if (scriptfile_getnumber(script,&col)) break; - if (scriptfile_getnumber(script,&type)) break; - if ((unsigned long)tile < MAXTILES) spritecol2d[tile][type] = col; + if (scriptfile_getnumber(script,&col2)) break; + if ((unsigned long)tile < MAXTILES) + { + spritecol2d[tile][0] = col; + spritecol2d[tile][1] = col2; + } } break; case T_2DCOL: diff --git a/polymer/build/src/winlayer.c b/polymer/build/src/winlayer.c index 892b7eda0..0c72bc7bb 100644 --- a/polymer/build/src/winlayer.c +++ b/polymer/build/src/winlayer.c @@ -2550,7 +2550,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, (PALETTEENTRY*)curpalette, &lpDDPalette, NULL); + result = IDirectDraw_CreatePalette(lpDD, DDPCAPS_8BIT | DDPCAPS_ALLOW256 | DDPCAPS_INITIALIZE, (PALETTEENTRY*)curpalette, &lpDDPalette, NULL); if (result != DD_OK) { ShowDDrawErrorBox("Failure creating palette", result); UninitDirectDraw();