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

Improve Survival Mode + others (#56)

Browse Source 
* * 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:
iProgramInCpp
2023-08-16 22:32:09 +03:00
committed by GitHub
parent 5e8119d279
commit 9a24abc603
63 changed files with 3599 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/client/gui/screens/SavingWorldScreen.cpp
View File

@@ -12,10 +12,11 @@
#ifdef ENH_IMPROVED_SAVING
SavingWorldScreen::SavingWorldScreen(bool bCopyMap)
SavingWorldScreen::SavingWorldScreen(bool bCopyMap, Entity *pEnt)
{
m_bCopyMapAtEnd = bCopyMap;
m_timer = 0;
m_pEntityToDeleteAfterSave = pEnt;
}
void SavingWorldScreen::render(int mouseX, int mouseY, float f)
@@ -55,6 +56,12 @@ void SavingWorldScreen::tick()
m_pMinecraft->m_pLevel = nullptr;
}
// this is safe to do, since on destruction, nothing accesses the parent level or anything
SAFE_DELETE(m_pEntityToDeleteAfterSave);
m_pMinecraft->m_pMobPersp = m_pMinecraft->m_pLocalPlayer = nullptr;
m_pMinecraft->m_bUsingScreen = true;
if (m_bCopyMapAtEnd)