cpp/openttd-patchpack/source Changeset - r26764:765b5f74f0f2

Changeset - r26764:765b5f74f0f2

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Rubidium - 17 months ago 2023-01-12 19:23:56
rubidium@openttd.org

Fix: comparison result is always the same warnings

3 files changed with 21 insertions and 20 deletions:

src/command_type.h

src/console_cmds.cpp

src/network/core/game_info.cpp

0 comments (0 inline, 0 general)

src/command_type.h

➞

Show inline comments

@@ @@ -25,7 +25,7 @@ class CommandCost { @@
 	ExpensesType expense_type; ///< the type of expence as shown on the finances view
 	Money cost;       ///< The cost of this action
 	StringID message; ///< Warning message for when success is unset
-	bool success;     ///< Whether the comment went fine up to this moment
+	bool success;     ///< Whether the command went fine up to this moment
 	const GRFFile *textref_stack_grffile; ///< NewGRF providing the #TextRefStack content.
 	uint textref_stack_size;   ///< Number of uint32 values to put on the #TextRefStack for the error message.

src/console_cmds.cpp

➞

Show inline comments

@@ @@ -286,7 +286,11 @@ DEF_CONSOLE_CMD(ConZoomToLevel) @@
 		case 2: {
 			uint32 level;
 			if (GetArgumentInteger(&level, argv[1])) {
 				if (level < ZOOM_LVL_MIN) {
 				/* In case ZOOM_LVL_MIN is more than 0, the next if statement needs to be amended.
 				 * A simple check for less than ZOOM_LVL_MIN does not work here because we are
 				 * reading an unsigned integer from the console, so just check for a '-' char. */
 				static_assert(ZOOM_LVL_MIN == 0);
 				if (argv[1][0] == '-') {
 					IConsolePrint(CC_ERROR, "Zoom-in levels below {} are not supported.", ZOOM_LVL_MIN);
 				} else if (level < _settings_client.gui.zoom_min) {
 					IConsolePrint(CC_ERROR, "Current client settings do not allow zooming in below level {}.", _settings_client.gui.zoom_min);
@@ @@ -2012,18 +2016,15 @@ DEF_CONSOLE_CMD(ConFont) @@
 		bool aa = setting->aa;
 		byte arg_index = 2;
 		if (argc > arg_index) {
 			/* We may encounter "aa" or "noaa" but it must be the last argument. */
 			if (strcasecmp(argv[arg_index], "aa") == 0 || strcasecmp(argv[arg_index], "noaa") == 0) {
 				aa = strncasecmp(argv[arg_index++], "no", 2) != 0;
 				if (argc > arg_index) return false;
 			} else {
 				/* For <name> we want a string. */
 				uint v;
 				if (!GetArgumentInteger(&v, argv[arg_index])) {
 					font = argv[arg_index++];
+				}
 		/* We may encounter "aa" or "noaa" but it must be the last argument. */
 		if (strcasecmp(argv[arg_index], "aa") == 0 || strcasecmp(argv[arg_index], "noaa") == 0) {
 			aa = strncasecmp(argv[arg_index++], "no", 2) != 0;
 			if (argc > arg_index) return false;
 		} else {
 			/* For <name> we want a string. */
 			uint v;
 			if (!GetArgumentInteger(&v, argv[arg_index])) {
 				font = argv[arg_index++];
+			}
+		}

src/network/core/game_info.cpp

➞

Show inline comments

@@ @@ -281,14 +281,14 @@ void DeserializeNetworkGameInfo(Packet * @@
+		}
 		case 4: {
 			GRFConfig **dst = &info->grfconfig;
 			uint i;
 			/* Ensure that the maximum number of NewGRFs and the field in the network
 			 * protocol are matched to eachother. If that is not the case anymore a
 			 * check must be added to ensure the received data is still valid. */
 			static_assert(std::numeric_limits<uint8>::max() == NETWORK_MAX_GRF_COUNT);
 			uint num_grfs = p->Recv_uint8();
 			/* Broken/bad data. It cannot have that many NewGRFs. */
 			if (num_grfs > NETWORK_MAX_GRF_COUNT) return;
 			for (i = 0; i < num_grfs; i++) {
 			GRFConfig **dst = &info->grfconfig;
 			for (uint i = 0; i < num_grfs; i++) {
 				NamedGRFIdentifier grf;
 				switch (newgrf_serialisation) {
 					case NST_GRFID_MD5:

0 comments (0 inline, 0 general)