celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2026-09-11 20:11:18 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ice: Implement other acceleration for ice

Browse Source
This commit is contained in:
Er2
2023-12-02 18:46:40 +03:00
parent 9b76709059
commit e78fcc3448
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/world/entity/ItemEntity.cpp
View File

@@ -103,7 +103,7 @@ void ItemEntity::tick()
dragFactor = 0.588f;
TileID tile = m_pLevel->getTile(Mth::floor(m_pos.x), Mth::floor(m_hitbox.min.y) - 1, Mth::floor(m_pos.z));
if (tile > 0)
dragFactor = Tile::tiles[tile]->field_30 * 0.98f;
dragFactor = Tile::tiles[tile]->m_acceleration * 0.98f;
}
m_vel.x *= dragFactor;

4
source/world/entity/Mob.cpp
View File

@@ -519,7 +519,7 @@ void Mob::travel(float a2, float a3)
if (tile <= 0)
_x1 = 0.546f;
else
_x1 = Tile::tiles[tile]->field_30 * 0.91f;
_x1 = Tile::tiles[tile]->m_acceleration * 0.91f;
assert(_x1 != 0.0f);
@@ -542,7 +542,7 @@ void Mob::travel(float a2, float a3)
if (tile <= 0)
dragFactor = 0.546f;
else
dragFactor = Tile::tiles[tile]->field_30 * 0.91f;
dragFactor = Tile::tiles[tile]->m_acceleration * 0.91f;
}
if (onLadder())

1
source/world/tile/IceTile.cpp
View File

@@ -12,6 +12,7 @@
IceTile::IceTile(int a, int b, Material* c) : HalfTransparentTile(a, b, c)
{
setTicking(true);
m_acceleration = 1;
}
int IceTile::getRenderLayer()

2
source/world/tile/Tile.cpp
View File

@@ -65,7 +65,7 @@ void Tile::_init()
m_TextureFrame = 1;
m_pSound = nullptr;
field_28 = 1.0f;
field_30 = 0.6f;
m_acceleration = 0.6f;
m_hardness = 0.0f;
m_blastResistance = 0.0f;
m_descriptionID = "";

2
source/world/tile/Tile.hpp
View File

@@ -222,7 +222,7 @@ public:
const SoundType* m_pSound;
float field_28;
Material* m_pMaterial;
float field_30;
float m_acceleration;
float m_hardness;
float m_blastResistance;
AABB m_aabbReturned;