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:
@@ -24,7 +24,7 @@ GuiParticle::GuiParticle(double x, double y, double xa, double ya)
|
||||
|
||||
friction = 1.0 / (random->nextDouble() * 0.05 + 1.01);
|
||||
|
||||
lifeTime = (int) (10.0 / (random->nextDouble() * 2 + 0.1));
|
||||
lifeTime = static_cast<int>(10.0 / (random->nextDouble() * 2 + 0.1));
|
||||
}
|
||||
|
||||
void GuiParticle::tick(GuiParticles *guiParticles)
|
||||
@@ -37,7 +37,7 @@ void GuiParticle::tick(GuiParticles *guiParticles)
|
||||
|
||||
ya += 0.1;
|
||||
if (++life > lifeTime) remove();
|
||||
a = 2 - (life / (double) lifeTime) * 2;
|
||||
a = 2 - (life / static_cast<double>(lifeTime)) * 2;
|
||||
if (a > 1) a = 1;
|
||||
a = a * a;
|
||||
a *= 0.5;
|
||||
|
||||
Reference in New Issue
Block a user