Browse Source

Consistently use uint8_t for lighting values

pull/6004/head
Anders Jenbo 3 years ago
parent
commit
779f16280c
  1. 4
      Source/levels/gendung.cpp
  2. 4
      Source/levels/gendung.h
  3. 6
      Source/lighting.cpp
  4. 24
      Source/loadsave.cpp

4
Source/levels/gendung.cpp

@ -40,8 +40,8 @@ bool TransList[256];
uint16_t dPiece[MAXDUNX][MAXDUNY];
MICROS DPieceMicros[MAXTILES];
int8_t dTransVal[MAXDUNX][MAXDUNY];
char dLight[MAXDUNX][MAXDUNY];
char dPreLight[MAXDUNX][MAXDUNY];
uint8_t dLight[MAXDUNX][MAXDUNY];
uint8_t dPreLight[MAXDUNX][MAXDUNY];
DungeonFlag dFlags[MAXDUNX][MAXDUNY];
int8_t dPlayer[MAXDUNX][MAXDUNY];
int16_t dMonster[MAXDUNX][MAXDUNY];

4
Source/levels/gendung.h

@ -193,8 +193,8 @@ extern DVL_API_FOR_TEST uint16_t dPiece[MAXDUNX][MAXDUNY];
extern MICROS DPieceMicros[MAXTILES];
/** Specifies the transparency at each coordinate of the map. */
extern DVL_API_FOR_TEST int8_t dTransVal[MAXDUNX][MAXDUNY];
extern char dLight[MAXDUNX][MAXDUNY];
extern char dPreLight[MAXDUNX][MAXDUNY];
extern uint8_t dLight[MAXDUNX][MAXDUNY];
extern uint8_t dPreLight[MAXDUNX][MAXDUNY];
/** Holds various information about dungeon tiles, @see DungeonFlag */
extern DungeonFlag dFlags[MAXDUNX][MAXDUNY];

6
Source/lighting.cpp

@ -90,7 +90,7 @@ void RotateRadius(int *x, int *y, int *dx, int *dy, int *lx, int *ly, int *bx, i
}
}
void SetLight(Point position, char v)
void SetLight(Point position, uint8_t v)
{
if (LoadingMapObjects)
dPreLight[position.x][position.y] = v;
@ -98,7 +98,7 @@ void SetLight(Point position, char v)
dLight[position.x][position.y] = v;
}
char GetLight(Point position)
uint8_t GetLight(Point position)
{
if (LoadingMapObjects)
return dPreLight[position.x][position.y];
@ -270,7 +270,7 @@ void DoLighting(Point position, int nRadius, int lnum)
if (radiusBlock >= 128)
continue;
Point temp = position + (Displacement { x, y }).Rotate(-i);
int8_t v = lightradius[nRadius][radiusBlock];
uint8_t v = lightradius[nRadius][radiusBlock];
if (!InDungeonBounds(temp))
continue;
if (v < GetLight(temp))

24
Source/loadsave.cpp

@ -2149,7 +2149,7 @@ void LoadGame(bool firstflag)
for (int j = 0; j < MAXDUNY; j++) {
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
dLight[i][j] = file.NextLE<int8_t>();
dLight[i][j] = file.NextLE<uint8_t>();
}
for (int j = 0; j < MAXDUNY; j++) {
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
@ -2177,12 +2177,12 @@ void LoadGame(bool firstflag)
dObject[i][j] = file.NextLE<int8_t>();
}
for (int j = 0; j < MAXDUNY; j++) {
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
dLight[i][j] = file.NextLE<int8_t>(); // BUGFIX: dLight got loaded already
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
dLight[i][j] = file.NextLE<uint8_t>(); // BUGFIX: dLight got loaded already
}
for (int j = 0; j < MAXDUNY; j++) {
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
dPreLight[i][j] = file.NextLE<int8_t>();
dPreLight[i][j] = file.NextLE<uint8_t>();
}
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) // NOLINT(modernize-loop-convert)
@ -2409,7 +2409,7 @@ void SaveGameData(SaveWriter &saveWriter)
for (int j = 0; j < MAXDUNY; j++) {
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
file.WriteLE<int8_t>(dLight[i][j]);
file.WriteLE<uint8_t>(dLight[i][j]);
}
for (int j = 0; j < MAXDUNY; j++) {
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
@ -2436,12 +2436,12 @@ void SaveGameData(SaveWriter &saveWriter)
file.WriteLE<int8_t>(dObject[i][j]);
}
for (int j = 0; j < MAXDUNY; j++) {
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
file.WriteLE<int8_t>(dLight[i][j]); // BUGFIX: dLight got saved already
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
file.WriteLE<uint8_t>(dLight[i][j]); // BUGFIX: dLight got saved already
}
for (int j = 0; j < MAXDUNY; j++) {
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
file.WriteLE<int8_t>(dPreLight[i][j]);
file.WriteLE<uint8_t>(dPreLight[i][j]);
}
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) // NOLINT(modernize-loop-convert)
@ -2548,11 +2548,11 @@ void SaveLevel(SaveWriter &saveWriter)
}
for (int j = 0; j < MAXDUNY; j++) {
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
file.WriteLE<int8_t>(dLight[i][j]);
file.WriteLE<uint8_t>(dLight[i][j]);
}
for (int j = 0; j < MAXDUNY; j++) {
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
file.WriteLE<int8_t>(dPreLight[i][j]);
file.WriteLE<uint8_t>(dPreLight[i][j]);
}
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) // NOLINT(modernize-loop-convert)
@ -2627,11 +2627,11 @@ void LoadLevel()
}
for (int j = 0; j < MAXDUNY; j++) {
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
dLight[i][j] = file.NextLE<int8_t>();
dLight[i][j] = file.NextLE<uint8_t>();
}
for (int j = 0; j < MAXDUNY; j++) {
for (int i = 0; i < MAXDUNX; i++) // NOLINT(modernize-loop-convert)
dPreLight[i][j] = file.NextLE<int8_t>();
dPreLight[i][j] = file.NextLE<uint8_t>();
}
for (int j = 0; j < DMAXY; j++) {
for (int i = 0; i < DMAXX; i++) { // NOLINT(modernize-loop-convert)

Loading…
Cancel
Save