diff options
| author | ModMaker101 <119018978+ModMaker101@users.noreply.github.com> | 2026-03-08 19:08:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-08 18:08:36 -0500 |
| commit | 28614b922fb77149a54da1a87bebfbc98736f296 (patch) | |
| tree | 7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/EnchantmentCategory.cpp | |
| parent | 88798b501d0cf6287b6f87acb2592676e3cec58d (diff) | |
Modernize project codebase (#906)
* 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
* Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.World/EnchantmentCategory.cpp')
| -rw-r--r-- | Minecraft.World/EnchantmentCategory.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/EnchantmentCategory.cpp b/Minecraft.World/EnchantmentCategory.cpp index 7fb44481..b1c951ee 100644 --- a/Minecraft.World/EnchantmentCategory.cpp +++ b/Minecraft.World/EnchantmentCategory.cpp @@ -16,25 +16,25 @@ bool EnchantmentCategory::canEnchant(Item *item) const { if (this == all) return true; - if (dynamic_cast<ArmorItem *>( item ) != NULL) + if (dynamic_cast<ArmorItem *>( item ) != nullptr) { if (this == armor) return true; - ArmorItem *ai = (ArmorItem *) item; + ArmorItem *ai = static_cast<ArmorItem *>(item); if (ai->slot == ArmorItem::SLOT_HEAD) return this == armor_head; if (ai->slot == ArmorItem::SLOT_LEGS) return this == armor_legs; if (ai->slot == ArmorItem::SLOT_TORSO) return this == armor_torso; if (ai->slot == ArmorItem::SLOT_FEET) return this == armor_feet; return false; } - else if (dynamic_cast<WeaponItem *>(item) != NULL) + else if (dynamic_cast<WeaponItem *>(item) != nullptr) { return this == weapon; } - else if (dynamic_cast<DiggerItem *>(item) != NULL) + else if (dynamic_cast<DiggerItem *>(item) != nullptr) { return this == digger; } - else if (dynamic_cast<BowItem *>(item) != NULL) + else if (dynamic_cast<BowItem *>(item) != nullptr) { return this == bow; } |
