cpp/openttd-patchpack/source Changeset - r28480:005e26a72bd2

Changeset - r28480:005e26a72bd2

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Patric Stout - 11 months ago 2024-01-16 21:04:35
truebrain@openttd.org

Codechange: compile-time validate the string format of IConsolePrint (#11804)

This means we can no longer use runtime picking what string to use.

3 files changed with 23 insertions and 24 deletions:

src/console_cmds.cpp

src/console_func.h

src/network/network_server.cpp

0 comments (0 inline, 0 general)

src/console_cmds.cpp

➞

Show inline comments

@@ @@ -264,26 +264,24 @@ DEF_CONSOLE_CMD(ConResetTile) @@
 DEF_CONSOLE_CMD(ConZoomToLevel)
+{
 	switch (argc) {
 		case 0:
 			IConsolePrint(CC_HELP, "Set the current zoom level of the main viewport.");
 			IConsolePrint(CC_HELP, "Usage: 'zoomto <level>'.");
 			IConsolePrint(
 				CC_HELP,
 				ZOOM_LVL_MIN < _settings_client.gui.zoom_min ?
 					"The lowest zoom-in level allowed by current client settings is {}." :
 					"The lowest supported zoom-in level is {}.",
 				std::max(ZOOM_LVL_MIN, _settings_client.gui.zoom_min)
 			);
 			IConsolePrint(
 				CC_HELP,
 				_settings_client.gui.zoom_max < ZOOM_LVL_MAX ?
 					"The highest zoom-out level allowed by current client settings is {}." :
 					"The highest supported zoom-out level is {}.",
 				std::min(_settings_client.gui.zoom_max, ZOOM_LVL_MAX)
 			);
 			if (ZOOM_LVL_MIN < _settings_client.gui.zoom_min) {
 				IConsolePrint(CC_HELP, "The lowest zoom-in level allowed by current client settings is {}.", std::max(ZOOM_LVL_MIN, _settings_client.gui.zoom_min));
 			} else {
 				IConsolePrint(CC_HELP, "The lowest supported zoom-in level is {}.", std::max(ZOOM_LVL_MIN, _settings_client.gui.zoom_min));
+			}
 			if (_settings_client.gui.zoom_max < ZOOM_LVL_MAX) {
 				IConsolePrint(CC_HELP, "The highest zoom-out level allowed by current client settings is {}.", std::min(_settings_client.gui.zoom_max, ZOOM_LVL_MAX));
 			} else {
 				IConsolePrint(CC_HELP, "The highest supported zoom-out level is {}.", std::min(_settings_client.gui.zoom_max, ZOOM_LVL_MAX));
+			}
 			return true;
 		case 2: {
 			uint32_t level;
 			if (GetArgumentInteger(&level, argv[1])) {
 				/* In case ZOOM_LVL_MIN is more than 0, the next if statement needs to be amended.

src/console_func.h

➞

Show inline comments

@@ @@ -31,22 +31,21 @@ void IConsolePrint(TextColour colour_cod @@
  * are also logged. All lines to print are added to a temporary buffer which can be
  * used as a history to print them onscreen
  * @param colour_code The colour of the command.
  * @param format_string The formatting string to tell what to do with the remaining arguments.
  * @param first_arg The first argument to the format.
  * @param other_args The other arguments to the format.
  * @tparam T The type of formatting parameter.
  * @tparam A The type of the first argument.
  * @tparam Args The types of the other arguments.
  */
 template <typename T, typename A, typename ... Args>
 inline void IConsolePrint(TextColour colour_code, const T &format, A first_arg, Args&&... other_args)
 template <typename A, typename ... Args>
 inline void IConsolePrint(TextColour colour_code, fmt::format_string<A, Args...> format, A first_arg, Args&&... other_args)
+{
 	/* The separate first_arg argument is added to aid overloading.
 	 * Otherwise the calls that do no need formatting will still use this function. */
 	IConsolePrint(colour_code, fmt::format(format, first_arg, other_args...));
+	IConsolePrint(colour_code, fmt::format(format, std::forward<A>(first_arg), std::forward<Args>(other_args)...));
+}
 /* Parser */
 void IConsoleCmdExec(const std::string &command_string, const uint recurse_count = 0);
 bool IsValidConsoleColour(TextColour c);

src/network/network_server.cpp

➞

Show inline comments

@@ @@ -1701,18 +1701,20 @@ void NetworkServer_Tick(bool send_frame) @@
 		/* Check if the speed of the client is what we can expect from a client */
 		uint lag = NetworkCalculateLag(cs);
 		switch (cs->status) {
 			case NetworkClientSocket::STATUS_ACTIVE:
 				if (lag > _settings_client.network.max_lag_time) {
 					/* Client did still not report in within the specified limit. */
 					IConsolePrint(CC_WARNING, cs->last_packet + std::chrono::milliseconds(lag * MILLISECONDS_PER_TICK) > std::chrono::steady_clock::now() ?
 							/* A packet was received in the last three game days, so the client is likely lagging behind. */
 								"Client #{} (IP: {}) is dropped because the client's game state is more than {} ticks behind." :
 							/* No packet was received in the last three game days; sounds like a lost connection. */
 								"Client #{} (IP: {}) is dropped because the client did not respond for more than {} ticks.",
 							cs->client_id, cs->GetClientIP(), lag);
 					if (cs->last_packet + std::chrono::milliseconds(lag * MILLISECONDS_PER_TICK) > std::chrono::steady_clock::now()) {
 						/* A packet was received in the last three game days, so the client is likely lagging behind. */
 						IConsolePrint(CC_WARNING, "Client #{} (IP: {}) is dropped because the client's game state is more than {} ticks behind.", cs->client_id, cs->GetClientIP(), lag);
 					} else {
 						/* No packet was received in the last three game days; sounds like a lost connection. */
 						IConsolePrint(CC_WARNING, "Client #{} (IP: {}) is dropped because the client did not respond for more than {} ticks.", cs->client_id, cs->GetClientIP(), lag);
+					}
 					cs->SendError(NETWORK_ERROR_TIMEOUT_COMPUTER);
 					continue;
+				}
 				/* Report once per time we detect the lag, and only when we
 				 * received a packet in the last 2 seconds. If we

0 comments (0 inline, 0 general)