From c67a3e76b4d773f3eeba4da5b3dd2599545febbb Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 21 Apr 2021 18:34:34 +0200 Subject: [PATCH] - seems I missed a bit... --- source/core/defparser.cpp | 8 ++++---- source/core/palette.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/core/defparser.cpp b/source/core/defparser.cpp index 4fecc8446..e51e95279 100644 --- a/source/core/defparser.cpp +++ b/source/core/defparser.cpp @@ -2060,19 +2060,19 @@ static const dispatch basetokens[] = { "undeftexturerange", parseUndefTextureRange }, { "alphahack", parseAlphahack }, { "alphahackrange", parseAlphahackRange }, - { "spritecol", parseSkip<3> }, + { "spritecol", parseSkip<3> }, { "2dcol", parseSkip<4> }, - { "2dcolidxrange", parseSkip<3> }, + { "2dcolidxrange", parseSkip<3> }, { "fogpal", parseFogpal }, { "loadgrp", parseSkip<1> }, - { "dummytile", parseDummyTile }, + { "dummytile", parseDummyTile }, { "dummytilerange", parseDummyTileRange }, { "setuptile", parseSetupTile }, { "setuptilerange", parseSetupTileRange }, { "undefinetile", parseUndefineTile }, { "undefinetilerange", parseUndefineTileRange }, { "animtilerange", parseAnimTileRange }, - { "cachesize", parseSkip<1> }, + { "cachesize", parseSkip<1> }, { "dummytilefrompic",parseImportTile }, { "tilefromtexture", parseTileFromTexture }, { "artfile", parseArtFile }, diff --git a/source/core/palette.h b/source/core/palette.h index 02dbedf85..efc60b428 100644 --- a/source/core/palette.h +++ b/source/core/palette.h @@ -31,7 +31,8 @@ enum BRIGHTPAL = (MAXPALOOKUPS), MAXREALPAL = MAXPALOOKUPS - RESERVEDPALS -} +}; + // fixme: should use the flags from the PRSFlags enum directly enum {