X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient.cpp;h=9892e08cd7f9d0310eee0fc103242afb2fe33202;hb=53acc32bee75e6eb8788ab5eb926243648ad191c;hp=1f6f64ce077cbc2185dc7c976b38b9ae1ba2950e;hpb=5cc8ad946efb3612eb6ea8655780b29fe4c62e19;p=dragonfireclient.git

diff --git a/src/client.cpp b/src/client.cpp
index 1f6f64ce0..9892e08cd 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -69,11 +69,6 @@ Client::Client(
 		bool ipv6,
 		GameUIFlags *game_ui_flags
 ):
-	m_packetcounter_timer(0.0),
-	m_connection_reinit_timer(0.1),
-	m_avg_rtt_timer(0.0),
-	m_playerpos_send_timer(0.0),
-	m_ignore_damage_timer(0.0),
 	m_tsrc(tsrc),
 	m_shsrc(shsrc),
 	m_itemdef(itemdef),
@@ -92,40 +87,13 @@ Client::Client(
 	m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this),
 	m_address_name(address_name),
 	m_device(device),
-	m_camera(NULL),
-	m_minimap(NULL),
-	m_minimap_disabled_by_server(false),
 	m_server_ser_ver(SER_FMT_VER_INVALID),
-	m_proto_ver(0),
-	m_playeritem(0),
-	m_inventory_updated(false),
-	m_inventory_from_server(NULL),
-	m_inventory_from_server_age(0.0),
-	m_animation_time(0),
-	m_crack_level(-1),
-	m_crack_pos(0,0,0),
 	m_last_chat_message_sent(time(NULL)),
-	m_chat_message_allowance(5.0f),
-	m_map_seed(0),
 	m_password(password),
 	m_chosen_auth_mech(AUTH_MECHANISM_NONE),
-	m_auth_data(NULL),
-	m_access_denied(false),
-	m_access_denied_reconnect(false),
-	m_itemdef_received(false),
-	m_nodedef_received(false),
 	m_media_downloader(new ClientMediaDownloader()),
-	m_time_of_day_set(false),
-	m_last_time_of_day_f(-1),
-	m_time_of_day_update_timer(0),
-	m_recommended_send_interval(0.1),
-	m_removed_sounds_check_timer(0),
 	m_state(LC_Created),
-	m_localdb(NULL),
-	m_script(NULL),
-	m_mod_storage_save_timer(10.0f),
-	m_game_ui_flags(game_ui_flags),
-	m_shutdown(false)
+	m_game_ui_flags(game_ui_flags)
 {
 	// Add local player
 	m_env.setLocalPlayer(new LocalPlayer(this, playername));
@@ -253,7 +221,7 @@ Client::~Client()
 		scene::IAnimatedMesh *mesh =
 			m_device->getSceneManager()->getMeshCache()->getMeshByIndex(0);
 
-		if (mesh != NULL)
+		if (mesh)
 			m_device->getSceneManager()->getMeshCache()->removeMesh(mesh);
 	}
 
@@ -415,7 +383,7 @@ void Client::step(float dtime)
 	*/
 	// Control local player (0ms)
 	LocalPlayer *player = m_env.getLocalPlayer();
-	assert(player != NULL);
+	assert(player);
 	player->applyControl(dtime);
 
 	// Step environment
@@ -491,7 +459,7 @@ void Client::step(float dtime)
 			if (block) {
 				// Delete the old mesh
 				delete block->mesh;
-				block->mesh = NULL;
+				block->mesh = nullptr;
 
 				if (r.mesh) {
 					minimap_mapblock = r.mesh->moveMinimapMapblock();
@@ -1402,7 +1370,7 @@ void Client::addNode(v3s16 p, MapNode n, bool remove_metadata)
 void Client::setPlayerControl(PlayerControl &control)
 {
 	LocalPlayer *player = m_env.getLocalPlayer();
-	assert(player != NULL);
+	assert(player);
 	player->control = control;
 }
 
@@ -1426,7 +1394,7 @@ bool Client::getLocalInventoryUpdated()
 void Client::getLocalInventory(Inventory &dst)
 {
 	LocalPlayer *player = m_env.getLocalPlayer();
-	assert(player != NULL);
+	assert(player);
 	dst = player->inventory;
 }
 
@@ -1439,7 +1407,7 @@ Inventory* Client::getInventory(const InventoryLocation &loc)
 	case InventoryLocation::CURRENT_PLAYER:
 	{
 		LocalPlayer *player = m_env.getLocalPlayer();
-		assert(player != NULL);
+		assert(player);
 		return &player->inventory;
 	}
 	break;
@@ -1528,7 +1496,7 @@ void Client::setCrack(int level, v3s16 pos)
 u16 Client::getHP()
 {
 	LocalPlayer *player = m_env.getLocalPlayer();
-	assert(player != NULL);
+	assert(player);
 	return player->hp;
 }
 
@@ -1561,7 +1529,7 @@ void Client::typeChatMessage(const std::wstring &message)
 		// compatibility code
 		if (m_proto_ver < 29) {
 			LocalPlayer *player = m_env.getLocalPlayer();
-			assert(player != NULL);
+			assert(player);
 			std::wstring name = narrow_to_wide(player->getName());
 			pushToChatQueue((std::wstring)L"<" + name + L"> " + message);
 		}
@@ -1772,9 +1740,9 @@ float Client::getCurRate()
 			m_con.getLocalStat(con::CUR_DL_RATE));
 }
 
-void Client::makeScreenshot(IrrlichtDevice *device)
+void Client::makeScreenshot()
 {
-	irr::video::IVideoDriver *driver = device->getVideoDriver();
+	irr::video::IVideoDriver *driver = m_device->getVideoDriver();
 	irr::video::IImage* const raw_image = driver->createScreenShot();
 
 	if (!raw_image)