mirror of
https://github.com/celisej567/mcpe.git
synced 2026-09-23 20:09:46 +03:00
Improve Survival Mode + others (#56)
* * Undo some of the changes done in the "* Work on survival mode." commit. * TEST_SURVIVAL_MODE is now on by default. * * Dying no longer crashes the game. * * Death seems to work ok. * * Improve some of the damage code. * x * work * Fixed the Makefile (#54) * * Finally fix the crack texture appearing to flicker/restart * * Add VS2010 as an optional target. Fix build with VS2010 (both windows_vs and xenon_vs). * * Disable survival mode. Getting ready to merge now! --------- Co-authored-by: Alexander Argentakis <38327951+MFDGaming@users.noreply.github.com>
This commit is contained in:
@@ -595,6 +595,15 @@ void Entity::turn(float yaw, float pitch)
|
||||
field_60 += m_pitch - p_old;
|
||||
}
|
||||
|
||||
void Entity::reset()
|
||||
{
|
||||
// TODO is this it
|
||||
field_98 = field_3C = m_pos;
|
||||
field_5C = m_yaw;
|
||||
field_60 = m_pitch;
|
||||
m_bRemoved = false;
|
||||
}
|
||||
|
||||
void Entity::interpolateTurn(float yaw, float pitch)
|
||||
{
|
||||
m_yaw += yaw * 0.15f;
|
||||
@@ -697,7 +706,7 @@ void Entity::baseTick()
|
||||
|
||||
if (field_C0 % 20 == 0)
|
||||
{
|
||||
hurt(nullptr, true);
|
||||
hurt(nullptr, 1);
|
||||
}
|
||||
|
||||
field_C0--;
|
||||
@@ -1065,3 +1074,8 @@ bool Entity::operator==(const Entity& other) const
|
||||
{
|
||||
return m_EntityID == other.m_EntityID;
|
||||
}
|
||||
|
||||
bool Entity::isLocalPlayer()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user