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:
@@ -17,9 +17,12 @@ SelectWorldScreen::SelectWorldScreen() :
|
||||
m_btnDelete (1, "Delete"),
|
||||
m_btnCreateNew(2, "Create new"),
|
||||
m_btnBack (3, "Back"),
|
||||
m_btnUnknown (4, "")
|
||||
m_btnUnknown (4, ""),
|
||||
m_pWorldSelectionList(nullptr)
|
||||
{
|
||||
m_btnDelete.m_bEnabled = false;
|
||||
field_12C = false;
|
||||
field_130 = 0;
|
||||
}
|
||||
|
||||
void SelectWorldScreen::init()
|
||||
@@ -235,8 +238,9 @@ std::string SelectWorldScreen::getUniqueLevelName(const std::string& in)
|
||||
{
|
||||
std::set<std::string> maps;
|
||||
|
||||
for (const auto& ls : m_levels)
|
||||
for (int i = 0; i < int(m_levels.size()); i++)
|
||||
{
|
||||
const LevelSummary& ls = m_levels[i];
|
||||
maps.insert(ls.field_0);
|
||||
}
|
||||
|
||||
@@ -252,9 +256,11 @@ void SelectWorldScreen::loadLevelSource()
|
||||
m_pMinecraft->getLevelSource()->getLevelList(m_levels);
|
||||
|
||||
std::sort(m_levels.begin(), m_levels.end());
|
||||
|
||||
for (const auto& level : m_levels)
|
||||
|
||||
for (int i = 0; i < int(m_levels.size()); i++)
|
||||
{
|
||||
const LevelSummary& level = m_levels[i];
|
||||
|
||||
if (level.field_0 == "_LastJoinedServer")
|
||||
continue;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user