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:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions

View File

@@ -33,14 +33,14 @@ NetherPortalParticle::NetherPortalParticle(Level *level, double x, double y, dou
gCol = (g/255.0f)*br;
bCol = (b/255.0f)*br;
lifetime = (int) (Math::random()*10) + 40;
lifetime = static_cast<int>(Math::random() * 10) + 40;
noPhysics = true;
setMiscTex((int)(Math::random()*8));
setMiscTex(static_cast<int>(Math::random() * 8));
}
void NetherPortalParticle::render(Tesselator *t, float a, float xa, float ya, float za, float xa2, float za2)
{
float s = (age + a) / (float) lifetime;
float s = (age + a) / static_cast<float>(lifetime);
s = 1-s;
s = s*s;
s = 1-s;
@@ -53,13 +53,13 @@ int NetherPortalParticle::getLightColor(float a)
{
int br = Particle::getLightColor(a);
float pos = age/(float)lifetime;
float pos = age/static_cast<float>(lifetime);
pos = pos*pos;
pos = pos*pos;
int br1 = (br) & 0xff;
int br2 = (br >> 16) & 0xff;
br2 += (int) (pos * 15 * 16);
br2 += static_cast<int>(pos * 15 * 16);
if (br2 > 15 * 16) br2 = 15 * 16;
return br1 | br2 << 16;
}
@@ -67,7 +67,7 @@ int NetherPortalParticle::getLightColor(float a)
float NetherPortalParticle::getBrightness(float a)
{
float br = Particle::getBrightness(a);
float pos = age/(float)lifetime;
float pos = age/static_cast<float>(lifetime);
pos = pos*pos;
pos = pos*pos;
return br*(1-pos)+pos;
@@ -79,7 +79,7 @@ void NetherPortalParticle::tick()
yo = y;
zo = z;
float pos = age/(float)lifetime;
float pos = age/static_cast<float>(lifetime);
float a = pos;
pos = -pos+pos*pos*2;
// pos = pos*pos;