Browse Source

🎨 Use enums for LoadRndLvlPal input

pull/1850/head
Anders Jenbo 5 years ago committed by Gleb Mazovetskiy
parent
commit
32738c318b
  1. 14
      Source/diablo.cpp
  2. 6
      Source/palette.cpp
  3. 2
      Source/palette.h

14
Source/diablo.cpp

@ -1813,39 +1813,39 @@ void CreateLevel(lvl_entry lvldir)
case DTYPE_TOWN:
CreateTown(lvldir);
InitTownTriggers();
LoadRndLvlPal(0);
LoadRndLvlPal(DTYPE_TOWN);
break;
case DTYPE_CATHEDRAL:
CreateL5Dungeon(glSeedTbl[currlevel], lvldir);
InitL1Triggers();
Freeupstairs();
if (currlevel < 21) {
LoadRndLvlPal(1);
LoadRndLvlPal(DTYPE_CATHEDRAL);
} else {
LoadRndLvlPal(5);
LoadRndLvlPal(DTYPE_CRYPT);
}
break;
case DTYPE_CATACOMBS:
CreateL2Dungeon(glSeedTbl[currlevel], lvldir);
InitL2Triggers();
Freeupstairs();
LoadRndLvlPal(2);
LoadRndLvlPal(DTYPE_CATACOMBS);
break;
case DTYPE_CAVES:
CreateL3Dungeon(glSeedTbl[currlevel], lvldir);
InitL3Triggers();
Freeupstairs();
if (currlevel < 17) {
LoadRndLvlPal(3);
LoadRndLvlPal(DTYPE_CAVES);
} else {
LoadRndLvlPal(6);
LoadRndLvlPal(DTYPE_NEST);
}
break;
case DTYPE_HELL:
CreateL4Dungeon(glSeedTbl[currlevel], lvldir);
InitL4Triggers();
Freeupstairs();
LoadRndLvlPal(4);
LoadRndLvlPal(DTYPE_HELL);
break;
default:
app_fatal("CreateLevel");

6
Source/palette.cpp

@ -150,7 +150,7 @@ void LoadPalette(const char *pszFileName)
}
}
void LoadRndLvlPal(int l)
void LoadRndLvlPal(dungeon_type l)
{
if (l == DTYPE_TOWN) {
LoadPalette("Levels\\TownData\\Town.pal");
@ -158,13 +158,13 @@ void LoadRndLvlPal(int l)
}
int rv = GenerateRnd(4) + 1;
if (l == 5) {
if (l == DTYPE_CRYPT) {
LoadPalette("NLevels\\L5Data\\L5Base.PAL");
return;
}
char szFileName[27];
if (l == 6) {
if (l == DTYPE_NEST) {
if (!gbNestArt) {
rv++;
}

2
Source/palette.h

@ -35,7 +35,7 @@ extern Uint8 paletteTransparencyLookup[256][256];
void palette_update();
void palette_init();
void LoadPalette(const char *pszFileName);
void LoadRndLvlPal(int l);
void LoadRndLvlPal(dungeon_type l);
void ResetPal();
void IncreaseGamma();
void ApplyGamma(SDL_Color *dst, const SDL_Color *src, int n);

Loading…
Cancel
Save