Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Project modernization (#630)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

20
Minecraft.World/DoorInteractGoal.cpp
View File

@@ -9,7 +9,7 @@
DoorInteractGoal::DoorInteractGoal(Mob *mob)
{
doorX = doorY = doorZ = 0;
doorTile = NULL;
doorTile = nullptr;
passed = false;
doorOpenDirX = doorOpenDirZ = 0.0f;
@@ -21,7 +21,7 @@ bool DoorInteractGoal::canUse()
if (!mob->horizontalCollision) return false;
PathNavigation *pathNav = mob->getNavigation();
Path *path = pathNav->getPath();
if (path == NULL || path->isDone() || !pathNav->canOpenDoors()) return false;
if (path == nullptr || path->isDone() || !pathNav->canOpenDoors()) return false;
for (int i = 0; i < min(path->getIndex() + 2, path->getSize()); ++i)
{
@@ -31,7 +31,7 @@ bool DoorInteractGoal::canUse()
doorZ = n->z;
if (mob->distanceToSqr(doorX, mob->y, doorZ) > 1.5 * 1.5) continue;
doorTile = getDoorTile(doorX, doorY, doorZ);
if (doorTile == NULL) continue;
if (doorTile == nullptr) continue;
return true;
}
@@ -39,7 +39,7 @@ bool DoorInteractGoal::canUse()
doorY = Mth::floor(mob->y + 1);
doorZ = Mth::floor(mob->z);
doorTile = getDoorTile(doorX, doorY, doorZ);
return doorTile != NULL;
return doorTile != nullptr;
}
bool DoorInteractGoal::canContinueToUse()
@@ -50,14 +50,14 @@ bool DoorInteractGoal::canContinueToUse()
void DoorInteractGoal::start()
{
passed = false;
doorOpenDirX = (float) (doorX + 0.5f - mob->x);
doorOpenDirZ = (float) (doorZ + 0.5f - mob->z);
doorOpenDirX = static_cast<float>(doorX + 0.5f - mob->x);
doorOpenDirZ = static_cast<float>(doorZ + 0.5f - mob->z);
}
void DoorInteractGoal::tick()
{
float newDoorDirX = (float) (doorX + 0.5f - mob->x);
float newDoorDirZ = (float) (doorZ + 0.5f - mob->z);
float newDoorDirX = static_cast<float>(doorX + 0.5f - mob->x);
float newDoorDirZ = static_cast<float>(doorZ + 0.5f - mob->z);
float dot = doorOpenDirX * newDoorDirX + doorOpenDirZ * newDoorDirZ;
if (dot < 0)
{
@@ -68,6 +68,6 @@ void DoorInteractGoal::tick()
DoorTile *DoorInteractGoal::getDoorTile(int x, int y, int z)
{
int tileId = mob->level->getTile(x, y, z);
if (tileId != Tile::door_wood_Id) return NULL;
return (DoorTile *) Tile::tiles[tileId];
if (tileId != Tile::door_wood_Id) return nullptr;
return static_cast<DoorTile *>(Tile::tiles[tileId]);
}