diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index 1f112d009..b0322e75b 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -3044,23 +3044,6 @@ static void ReadPaletteTable(void) // initprintf("success.\n"); }// end ReadPaletteTable -static void ReadGamePalette(void) -{ - int32_t fp; - if ((fp=kopen4load("palette.dat",0)) == -1) - if ((fp=kopen4load("palette.dat",1)) == -1) - { - initprintf("!!! PALETTE.DAT NOT FOUND !!!\n"); - Bsprintf(tempbuf, "Mapster32 %s %s", VERSION, s_buildRev); - wm_msgbox(tempbuf,"palette.dat not found"); - exit(0); - } - // initprintf("Loading game palette... "); - kread(fp,GAMEpalette,768); - kclose(fp); - // initprintf("success.\n"); - ReadPaletteTable(); -} static void m32_showmouse(void) { @@ -10463,8 +10446,7 @@ int32_t ExtInit(void) showinvisibility = 1; - ReadGamePalette(); - // InitWater(); + ReadPaletteTable(); InitCustomColors(); @@ -11972,7 +11954,7 @@ void SetGAMEPalette(void) { if (acurpalette==0) return; acurpalette=0; - setbrightness(GAMMA_CALC,6,2); + setbrightness(GAMMA_CALC,0,2); } static void SearchSectors(int32_t dir) // <0: backwards, >=0: forwards diff --git a/polymer/eduke32/source/mapster32.h b/polymer/eduke32/source/mapster32.h index cad7ea9f8..5cf6ef736 100644 --- a/polymer/eduke32/source/mapster32.h +++ b/polymer/eduke32/source/mapster32.h @@ -73,12 +73,12 @@ static void EditWallData(int16_t wallnum); static void EditSectorData(int16_t sectnum); static void FuncMenu(void); -#define BASEPALCOUNT 7 +#define BASEPALCOUNT 6 -static uint8_t GAMEpalette[768], WATERpalette[768], SLIMEpalette[768], TITLEpalette[768]; +static uint8_t WATERpalette[768], SLIMEpalette[768], TITLEpalette[768]; static uint8_t REALMSpalette[768], BOSS1palette[768]; -uint8_t *basepaltable[BASEPALCOUNT] = { palette, WATERpalette, SLIMEpalette, TITLEpalette, REALMSpalette, BOSS1palette, GAMEpalette }; +static uint8_t *basepaltable[BASEPALCOUNT] = { palette, WATERpalette, SLIMEpalette, TITLEpalette, REALMSpalette, BOSS1palette }; static char num_tables;