backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make 'assigning field to itself' shut up

Browse source
This commit is contained in:
Liriosha 2026-03-19 09:55:10 -04:00
parent 9c0c4f5c81
commit 4b4cda41f4
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Minecraft.Client/Minecraft.cpp
View file

@ -528,7 +528,7 @@ File Minecraft::getWorkingDirectory(const std::wstring& applicationName) {
LevelStorageSource* Minecraft::getLevelSource() { return levelSource; } LevelStorageSource* Minecraft::getLevelSource() { return levelSource; }
void Minecraft::setScreen(Screen* screen) { void Minecraft::setScreen(Screen* m_screen) {
if (dynamic_cast<ErrorScreen*>(this->screen) != NULL) return; if (dynamic_cast<ErrorScreen*>(this->screen) != NULL) return;
if (this->screen != NULL) { if (this->screen != NULL) {
@ -542,12 +542,12 @@ void Minecraft::setScreen(Screen* screen) {
} }
stats->forceSave();*/ stats->forceSave();*/
if (screen == NULL && level == NULL) { if (m_screen == NULL && level == NULL) {
screen = new TitleScreen(); m_screen = new TitleScreen();
} else if (player != NULL && !ui.GetMenuDisplayed(player->GetXboxPad()) && } else if (player != NULL && !ui.GetMenuDisplayed(player->GetXboxPad()) &&
player->getHealth() <= 0) { player->getHealth() <= 0) {
#ifdef ENABLE_JAVA_GUIS #ifdef ENABLE_JAVA_GUIS
screen = new DeathScreen(); m_screen = new DeathScreen();
#else #else
// 4J Stu - If we exit from the death screen then we are saved as being // 4J Stu - If we exit from the death screen then we are saved as being
// dead. In the Java game when you load the game you are still dead, but // dead. In the Java game when you load the game you are still dead, but
@ -566,7 +566,7 @@ void Minecraft::setScreen(Screen* screen) {
gui->clearMessages(); gui->clearMessages();
} }
this->screen = screen; this->screen = m_screen;
if (screen != NULL) { if (screen != NULL) {
// releaseMouse(); // 4J - removed // releaseMouse(); // 4J - removed
ScreenSizeCalculator ssc(options, width, height); ScreenSizeCalculator ssc(options, width, height);
@ -626,13 +626,13 @@ void Minecraft::destroy() {
setLevel(NULL); setLevel(NULL);
// } catch (Throwable e) { // } catch (Throwable e) {
// } // }
Screen* m_screen = screen;
if (screen == NULL && level == NULL) { if (m_screen == NULL && level == NULL) {
screen = new TitleScreen(); m_screen = new TitleScreen();
} else if (player != NULL && !ui.GetMenuDisplayed(player->GetXboxPad()) && } else if (player != NULL && !ui.GetMenuDisplayed(player->GetXboxPad()) &&
player->getHealth() <= 0) { player->getHealth() <= 0) {
#ifdef ENABLE_JAVA_GUIS #ifdef ENABLE_JAVA_GUIS
screen = new DeathScreen(); m_screen = new DeathScreen();
#else #else
// 4J Stu - If we exit from the death screen then we are saved as being // 4J Stu - If we exit from the death screen then we are saved as being
// dead. In the Java game when you load the game you are still dead, but // dead. In the Java game when you load the game you are still dead, but
@ -646,12 +646,12 @@ void Minecraft::destroy() {
#endif #endif
} }
if (screen != NULL && dynamic_cast<TitleScreen*>(screen) != NULL) { if (m_screen != NULL && dynamic_cast<TitleScreen*>(m_screen) != NULL) {
options->renderDebug = false; options->renderDebug = false;
gui->clearMessages(); gui->clearMessages();
} }
this->screen = screen; this->screen = m_screen;
if (screen != NULL) { if (screen != NULL) {
// releaseMouse(); // 4J - removed // releaseMouse(); // 4J - removed
ScreenSizeCalculator ssc(options, width, height); ScreenSizeCalculator ssc(options, width, height);