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

6
source/client/gui/screens/PauseScreen.cpp
View File

@@ -11,6 +11,8 @@
#include "client/network/ServerSideNetworkHandler.hpp"
PauseScreen::PauseScreen() :
field_3C(0),
field_40(0),
m_btnBack(1, "Back to game"),
m_btnQuit(2, "Quit to title"),
m_btnQuitAndCopy(3, "Quit and copy map"),
@@ -67,8 +69,8 @@ void PauseScreen::init()
//swap the options and quit buttons around (??)
std::swap(m_btnOptions.m_yPos, m_btnQuit.m_yPos);
for (auto thing : m_buttons)
m_buttonTabList.push_back(thing);
for (int i = 0; i < int(m_buttons.size()); i++)
m_buttonTabList.push_back(m_buttons[i]);
#ifdef __EMSCRIPTEN__
m_btnVisible.m_bEnabled = false;