Client::makeScreenshot: remove device param

nerzhul · nerzhul · commit 8f2e60a9619f · 2017-06-19T00:00:55.000+02:00
We already have the device param as class member
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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1740,9 +1740,9 @@ float Client::getCurRate()`
`1740`	`1740`	`m_con.getLocalStat(con::CUR_DL_RATE));`
`1741`	`1741`	`}`
`1742`	`1742`
`1743`		`-void Client::makeScreenshot(IrrlichtDevice *device)`
	`1743`	`+void Client::makeScreenshot()`
`1744`	`1744`	`{`
`1745`		`- irr::video::IVideoDriver *driver = device->getVideoDriver();`
	`1745`	`+ irr::video::IVideoDriver *driver = m_device->getVideoDriver();`
`1746`	`1746`	`irr::video::IImage* const raw_image = driver->createScreenShot();`
`1747`	`1747`
`1748`	`1748`	`if (!raw_image)`
Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef`
`507`	`507`
`508`	`508`	`LocalClientState getState() { return m_state; }`
`509`	`509`
`510`		`- void makeScreenshot(IrrlichtDevice *device);`
	`510`	`+ void makeScreenshot();`
`511`	`511`
`512`	`512`	`inline void pushToChatQueue(const std::wstring &input)`
`513`	`513`	`{`
`@@ -529,8 +529,6 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef`
`529`	`529`	`void showGameFog(const bool show = true);`
`530`	`530`	`void showGameDebug(const bool show = true);`
`531`	`531`
`532`		`- IrrlichtDevice *getDevice() const { return m_device; }`
`533`		`-`
`534`	`532`	`const Address getServerAddress()`
`535`	`533`	`{`
`536`	`534`	`return m_con.GetPeerAddress(PEER_ID_SERVER);`
Original file line number	Diff line number	Diff line change
`@@ -3282,7 +3282,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)`
`3282`	`3282`	`return true;`
`3283`	`3283`	`} else if (m_client != NULL && event.KeyInput.PressedDown &&`
`3284`	`3284`	`(kp == getKeySetting("keymap_screenshot"))) {`
`3285`		`- m_client->makeScreenshot(m_device);`
	`3285`	`+ m_client->makeScreenshot();`
`3286`	`3286`	`}`
`3287`	`3287`	`if (event.KeyInput.PressedDown &&`
`3288`	`3288`	`(event.KeyInput.Key==KEY_RETURN \|\|`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ int ModApiClient::l_get_node_def(lua_State *L)`
`327`	`327`	`int ModApiClient::l_take_screenshot(lua_State *L)`
`328`	`328`	`{`
`329`	`329`	`Client *client = getClient(L);`
`330`		`- client->makeScreenshot(client->getDevice());`
	`330`	`+ client->makeScreenshot();`
`331`	`331`	`return 0;`
`332`	`332`	`}`
`333`	`333`