Bit of cleanup

Astera-org · Jan 14, 2024 · d3db18d · d3db18d
1 parent ac15e92
commit d3db18d
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 20 deletions.
diff --git a/lib/SDL b/lib/SDL
diff --git a/lib/irrlichtmt b/lib/irrlichtmt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -518,11 +518,10 @@ list(SORT server_SRCS)
 
 # Avoid source_group on broken CMake version.
 # see issue #7074 #7075
-# if (CMAKE_VERSION VERSION_GREATER 3.8.1)
-# 	# source_group(TREE ${CMAKE_CURRENT_BINARY_DIR} PREFIX "ProtoBuf Source Files" FILES ${proto_targets})
-# 	source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${client_SRCS})
-# 	source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${server_SRCS})
-# endif()
+if (CMAKE_VERSION VERSION_GREATER 3.8.1)
+	source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${client_SRCS})
+	source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${server_SRCS})
+endif()
 
 include_directories(
 	${PROJECT_BINARY_DIR}

diff --git a/src/client/client.cpp b/src/client/client.cpp
@@ -1884,14 +1884,13 @@ float Client::getCurRate()
 void Client::makeScreenshot()
 {
 	irr::video::IVideoDriver *driver = m_rendering_engine->get_video_driver();
-	irr::video::IImage* raw_image;
 
+	irr::video::IImage* raw_image;
 	if(m_rendering_engine->headless){
 		raw_image = m_rendering_engine->get_screenshot();
 	} else {
 		raw_image = driver->createScreenShot();
 	}
-
 	if (!raw_image)
 		return;
 

diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp
@@ -18,7 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "client/keys.h"
 #include "util/numeric.h"
 #include "inputhandler.h"
 #include "gui/mainmenumanager.h"

diff --git a/src/client/inputhandler.h b/src/client/inputhandler.h
@@ -23,9 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_extrabloated.h"
 #include "joystick_controller.h"
 #include <list>
-#include <zmqpp/zmqpp.hpp>
 #include "keycode.h"
-#include "log.h"
 #include "renderingengine.h"
 
 #ifdef HAVE_TOUCHSCREENGUI

diff --git a/src/client/remoteinputhandler.cpp b/src/client/remoteinputhandler.cpp
@@ -1,8 +1,5 @@
 #include "remoteinputhandler.h"
-#include "IEventReceiver.h"
 #include "client/keycode.h"
-#include "client/keys.h"
-#include "clientiface.h"
 #include "hud.h"
 #include "irr_v2d.h"
 #include "remoteclient.capnp.h"

diff --git a/src/client/remoteinputhandler.h b/src/client/remoteinputhandler.h
@@ -3,6 +3,7 @@
 #include "inputhandler.h"
 #include <capnp/message.h>
 #include <capnp/serialize-packed.h>
+#include <zmqpp/zmqpp.hpp>
 
 class RemoteInputHandler : public InputHandler
 {
@@ -13,7 +14,7 @@ class RemoteInputHandler : public InputHandler
             m_context(),
 			m_socket(m_context, zmqpp::socket_type::reply), m_receiver(receiver)
 	{
-		infostream << "RemoteInputHandler: Binding to " << endpoint << std::endl;
+		infostream << "RemoteInputHandler: Binding to " << endpoint << '\n';
 		m_socket.bind(endpoint);
 		// wait for client
 		zmqpp::message message;
@@ -24,7 +25,7 @@ class RemoteInputHandler : public InputHandler
 		capnp::FlatArrayMessageReader reader(words);
 		Action::Reader action = reader.getRoot<Action>();
 		if (action.hasKeyEvents()){
-			throw std::runtime_error("INVALID HANDSHAKE: Got key events in handshake");
+			throw std::runtime_error("INVALID HANDSHAKE: Got key events in handshake, expected 'action.hasKeyEvents() == false'");
 		}
 	}
 

diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp
@@ -18,7 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "cmake_config.h"
 #include "core.h"
 #include "plain.h"
 #include "client/shadows/dynamicshadowsrender.h"
@@ -94,4 +93,4 @@ video::IImage *RenderingCore::get_screenshot()
 v2u32 RenderingCore::getVirtualSize() const
 {
 	return virtual_size;
-}
+}
diff --git a/src/client/render/pipeline.cpp b/src/client/render/pipeline.cpp
@@ -17,7 +17,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "cmake_config.h"
 #include "pipeline.h"
 #include "client/client.h"
 #include "client/hud.h"