diff options
| author | Loki Rautio <lokirautio@gmail.com> | 2026-03-07 21:12:22 -0600 |
|---|---|---|
| committer | Loki Rautio <lokirautio@gmail.com> | 2026-03-07 21:12:22 -0600 |
| commit | 087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch) | |
| tree | 69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/Material.cpp | |
| parent | a9be52c41a02d207233199e98898fe7483d7e817 (diff) | |
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.
Diffstat (limited to 'Minecraft.World/Material.cpp')
| -rw-r--r-- | Minecraft.World/Material.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/Minecraft.World/Material.cpp b/Minecraft.World/Material.cpp index d17965df..9e201ad5 100644 --- a/Minecraft.World/Material.cpp +++ b/Minecraft.World/Material.cpp @@ -6,39 +6,39 @@ #include "PortalMaterial.h" #include "WebMaterial.h"// 4J added, Java version just does a local alteration when instantiating the Material for webs to get the same thing -Material *Material::air = nullptr; -Material *Material::grass = nullptr; -Material *Material::dirt = nullptr; -Material *Material::wood = nullptr; -Material *Material::stone = nullptr; -Material *Material::metal = nullptr; -Material *Material::heavyMetal = nullptr; -Material *Material::water = nullptr; -Material *Material::lava = nullptr; -Material *Material::leaves = nullptr; -Material *Material::plant = nullptr; -Material *Material::replaceable_plant = nullptr; -Material *Material::sponge = nullptr; -Material *Material::cloth = nullptr; -Material *Material::fire = nullptr; -Material *Material::sand = nullptr; -Material *Material::decoration = nullptr; -Material *Material::clothDecoration = nullptr; -Material *Material::glass = nullptr; -Material *Material::buildable_glass = nullptr; -Material *Material::explosive = nullptr; -Material *Material::coral = nullptr; -Material *Material::ice = nullptr; -Material *Material::topSnow = nullptr; -Material *Material::snow = nullptr; -Material *Material::cactus = nullptr; -Material *Material::clay = nullptr; -Material *Material::vegetable = nullptr; -Material *Material::egg = nullptr; -Material *Material::portal = nullptr; -Material *Material::cake = nullptr; -Material *Material::piston = nullptr; -Material *Material::web = nullptr; +Material *Material::air = NULL; +Material *Material::grass = NULL; +Material *Material::dirt = NULL; +Material *Material::wood = NULL; +Material *Material::stone = NULL; +Material *Material::metal = NULL; +Material *Material::heavyMetal = NULL; +Material *Material::water = NULL; +Material *Material::lava = NULL; +Material *Material::leaves = NULL; +Material *Material::plant = NULL; +Material *Material::replaceable_plant = NULL; +Material *Material::sponge = NULL; +Material *Material::cloth = NULL; +Material *Material::fire = NULL; +Material *Material::sand = NULL; +Material *Material::decoration = NULL; +Material *Material::clothDecoration = NULL; +Material *Material::glass = NULL; +Material *Material::buildable_glass = NULL; +Material *Material::explosive = NULL; +Material *Material::coral = NULL; +Material *Material::ice = NULL; +Material *Material::topSnow = NULL; +Material *Material::snow = NULL; +Material *Material::cactus = NULL; +Material *Material::clay = NULL; +Material *Material::vegetable = NULL; +Material *Material::egg = NULL; +Material *Material::portal = NULL; +Material *Material::cake = NULL; +Material *Material::piston = NULL; +Material *Material::web = NULL; void Material::staticCtor() { |
