Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
This commit is contained in:
@@ -23,9 +23,9 @@ Vec3 *HellDimension::getFogColor(float td, float a) const
|
||||
byte greenComponent = ((colour>>8)&0xFF);
|
||||
byte blueComponent = ((colour)&0xFF);
|
||||
|
||||
float rr = (float)redComponent/256;//0.2f;
|
||||
float gg = (float)greenComponent/256;//0.03f;
|
||||
float bb = (float)blueComponent/256;//0.03f;
|
||||
float rr = static_cast<float>(redComponent)/256;//0.2f;
|
||||
float gg = static_cast<float>(greenComponent)/256;//0.03f;
|
||||
float bb = static_cast<float>(blueComponent)/256;//0.03f;
|
||||
return Vec3::newTemp(rr, gg, bb);
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ void HellDimension::updateLightRamp()
|
||||
float ambientLight = 0.10f;
|
||||
for (int i = 0; i <= Level::MAX_BRIGHTNESS; i++)
|
||||
{
|
||||
float v = (1 - i / (float) (Level::MAX_BRIGHTNESS));
|
||||
float v = (1 - i / static_cast<float>(Level::MAX_BRIGHTNESS));
|
||||
brightnessRamp[i] = ((1 - v) / (v * 3 + 1)) * (1 - ambientLight) + ambientLight;
|
||||
}
|
||||
}
|
||||
@@ -85,5 +85,5 @@ bool HellDimension::isFoggyAt(int x, int z)
|
||||
|
||||
int HellDimension::getXZSize()
|
||||
{
|
||||
return ceil((float)level->getLevelData()->getXZSize() / level->getLevelData()->getHellScale());
|
||||
return ceil(static_cast<float>(level->getLevelData()->getXZSize()) / level->getLevelData()->getHellScale());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user