Merge branch 'smartcmd:main' into main

1 files changed, 13 insertions, 13 deletions

diff --git a/Minecraft.Client/SelectWorldScreen.cpp b/Minecraft.Client/SelectWorldScreen.cpp
index 0481f1e5..c6d417c5 100644
--- a/Minecraft.Client/SelectWorldScreen.cpp
+++ b/Minecraft.Client/SelectWorldScreen.cpp
@@ -16,11 +16,11 @@ SelectWorldScreen::SelectWorldScreen(Screen *lastScreen)
     title = L"Select world";
     done = false;
 	selectedWorld = 0;
-	worldSelectionList = NULL;
+	worldSelectionList = nullptr;
 	isDeleting = false;
-	deleteButton = NULL;
-    selectButton = NULL;
-    renameButton = NULL;
+	deleteButton = nullptr;
+    selectButton = nullptr;
+    renameButton = nullptr;
 
 	this->lastScreen = lastScreen;
 }
@@ -115,14 +115,14 @@ void SelectWorldScreen::buttonClicked(Button *button)
 		else
 		{
             // create demo world
-            minecraft->setScreen(NULL);
+            minecraft->setScreen(nullptr);
             if (done) return;
             done = true;
 // 4J Stu - Not used, so commenting to stop the build failing
 #if 0
             minecraft->gameMode = new DemoMode(minecraft);
             minecraft->selectLevel(CreateWorldScreen::findAvailableFolderName(minecraft->getLevelSource(), L"Demo"), L"Demo World", 0L);
-            minecraft->setScreen(NULL);
+            minecraft->setScreen(nullptr);
 #endif
         }
     }
@@ -142,20 +142,20 @@ void SelectWorldScreen::buttonClicked(Button *button)
 
 void SelectWorldScreen::worldSelected(int id)
 {
-    minecraft->setScreen(NULL);
+    minecraft->setScreen(nullptr);
     if (done) return;
     done = true;
-    minecraft->gameMode = NULL; //new SurvivalMode(minecraft);
+    minecraft->gameMode = nullptr; //new SurvivalMode(minecraft);
 
     wstring worldFolderName = getWorldId(id);
-    if (worldFolderName == L"")	// 4J - was NULL comparison
+    if (worldFolderName == L"")	// 4J - was nullptr comparison
 	{
         worldFolderName = L"World" + std::to_wstring(id);
     }
 // 4J Stu - Not used, so commenting to stop the build failing
 #if 0
     minecraft->selectLevel(worldFolderName, getWorldName(id), 0);
-    minecraft->setScreen(NULL);
+    minecraft->setScreen(nullptr);
 #endif
 }
 
@@ -235,7 +235,7 @@ SelectWorldScreen::WorldSelectionList::WorldSelectionList(SelectWorldScreen *sws
 
 int SelectWorldScreen::WorldSelectionList::getNumberOfItems()
 {
-	return (int)this->parent->levelList->size();
+	return static_cast<int>(this->parent->levelList->size());
 }
 
 void SelectWorldScreen::WorldSelectionList::selectItem(int item, bool doubleClick)
@@ -259,7 +259,7 @@ bool SelectWorldScreen::WorldSelectionList::isSelectedItem(int item)
 
 int SelectWorldScreen::WorldSelectionList::getMaxPosition()
 {
-	return (int)parent->levelList->size() * 36;
+	return static_cast<int>(parent->levelList->size()) * 36;
 }
 
 void SelectWorldScreen::WorldSelectionList::renderBackground()
@@ -294,7 +294,7 @@ void SelectWorldScreen::WorldSelectionList::renderItem(int i, int x, int y, int
 	swprintf(buffer,20,L"%d/%d/%d %d:%02d",time.wDay, time.wMonth, time.wYear, time.wHour, time.wMinute); // 4J - TODO Localise this
     id = id + L" (" + buffer;
 
-    __int64 size = levelSummary->getSizeOnDisk();
+    int64_t size = levelSummary->getSizeOnDisk();
     id = id + L", " + std::to_wstring(static_cast<float>(size / 1024 * 100 / 1024 / 100.0f)) + L" MB)";
     wstring info;