From ec0dd41b4686d7e4d6248cc3780fc4d98bdd2378 Mon Sep 17 00:00:00 2001 From: Bigjango13 Date: Sat, 6 Jul 2024 17:04:37 -0700 Subject: [PATCH] Suggested fixes but they compile --- mods/src/camera/camera.cpp | 3 +-- mods/src/misc/misc.cpp | 4 ++-- symbols/CMakeLists.txt | 1 + symbols/src/tile/CarriedTile.def | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 symbols/src/tile/CarriedTile.def diff --git a/mods/src/camera/camera.cpp b/mods/src/camera/camera.cpp index 8f128d8d..c6cf55cd 100644 --- a/mods/src/camera/camera.cpp +++ b/mods/src/camera/camera.cpp @@ -31,8 +31,7 @@ static void TripodCamera_tick_Level_addParticle_call_injection(Level *level, std } // Fix camera legs -void EntityRenderer_bindTexture_Camera_leg_injection(EntityRenderer *self, __attribute_ -_((unused)) std::string *file) { +void EntityRenderer_bindTexture_Camera_leg_injection(EntityRenderer *self, __attribute__((unused)) std::string *file) { std::string camera = "item/camera.png"; self->bindTexture(&camera); } diff --git a/mods/src/misc/misc.cpp b/mods/src/misc/misc.cpp index e1c48b0a..99a09577 100644 --- a/mods/src/misc/misc.cpp +++ b/mods/src/misc/misc.cpp @@ -780,7 +780,7 @@ static float Zombie_aiStep_getBrightness_injection(Entity *self, float param_1) } // Fix grass_carried's bottom texture -static int CarriedTile_getTexture2_injection(Tile_getTexture2_t original, Tile *self, int face, int metadata) { +static int CarriedTile_getTexture2_injection(CarriedTile_getTexture2_t original, CarriedTile *self, int face, int metadata) { if (face == 0) return 2; return original(self, face, metadata); } @@ -1055,6 +1055,6 @@ void init_misc() { // Fix grass_carried's bottom texture if (feature_has("Fix Grass's Bottom Texture", server_disabled)) { - patch_address((void *) CarriedTile_getTexture2, (void *) CarriedTile_getTexture2_injection); + overwrite_calls(CarriedTile_getTexture2, CarriedTile_getTexture2_injection); } } diff --git a/symbols/CMakeLists.txt b/symbols/CMakeLists.txt index 79a2ae83..e9c9c50b 100644 --- a/symbols/CMakeLists.txt +++ b/symbols/CMakeLists.txt @@ -149,6 +149,7 @@ set(SRC src/tile/StemTile.def src/tile/Tile_SoundType.def src/tile/TileRenderer.def + src/tile/CarriedTile.def src/tile/GrassTile.def src/tile/HeavyTile.def src/tile/EntityTile.def diff --git a/symbols/src/tile/CarriedTile.def b/symbols/src/tile/CarriedTile.def new file mode 100644 index 00000000..8386d4c4 --- /dev/null +++ b/symbols/src/tile/CarriedTile.def @@ -0,0 +1,3 @@ +extends Tile; + +vtable 0x114798;