Client::makeScreenshot: remove device param

We already have the device param as class member
minetest · Jun 18, 2017 · 8f2e60a · 8f2e60a
1 parent 4faaadc
commit 8f2e60a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/src/client.cpp b/src/client.cpp
@@ -1740,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)

diff --git a/src/client.h b/src/client.h
@@ -507,7 +507,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 
 	LocalClientState getState() { return m_state; }
 
-	void makeScreenshot(IrrlichtDevice *device);
+	void makeScreenshot();
 
 	inline void pushToChatQueue(const std::wstring &input)
 	{
@@ -529,8 +529,6 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
 	void showGameFog(const bool show = true);
 	void showGameDebug(const bool show = true);
 
-	IrrlichtDevice *getDevice() const { return m_device; }
-
 	const Address getServerAddress()
 	{
 		return m_con.GetPeerAddress(PEER_ID_SERVER);

diff --git a/src/game.cpp b/src/game.cpp
@@ -2524,7 +2524,7 @@ void Game::processKeyInput()
 	} else if (wasKeyDown(KeyType::CINEMATIC)) {
 		toggleCinematic();
 	} else if (wasKeyDown(KeyType::SCREENSHOT)) {
-		client->makeScreenshot(device);
+		client->makeScreenshot();
 	} else if (wasKeyDown(KeyType::TOGGLE_HUD)) {
 		toggleHud();
 	} else if (wasKeyDown(KeyType::MINIMAP)) {

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
@@ -3282,7 +3282,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 			return true;
 		} else if (m_client != NULL && event.KeyInput.PressedDown &&
 				(kp == getKeySetting("keymap_screenshot"))) {
-			m_client->makeScreenshot(m_device);
+			m_client->makeScreenshot();
 		}
 		if (event.KeyInput.PressedDown &&
 			(event.KeyInput.Key==KEY_RETURN ||

diff --git a/src/script/lua_api/l_client.cpp b/src/script/lua_api/l_client.cpp
@@ -327,7 +327,7 @@ int ModApiClient::l_get_node_def(lua_State *L)
 int ModApiClient::l_take_screenshot(lua_State *L)
 {
 	Client *client = getClient(L);
-	client->makeScreenshot(client->getDevice());
+	client->makeScreenshot();
 	return 0;
 }