openttd-mini: comparison src/console

equal deleted inserted replaced

-:6baad5b3033d
+:ab6e0234bacc
 #endif /* ENABLE_NETWORK */
 static void IConsoleHelp(const char *str)
 {
-	IConsolePrintF(_icolour_warn, "- %s", str);
+	IConsolePrintF(CC_WARNING, "- %s", str);
 }
 DEF_CONSOLE_CMD(ConResetEngines)
 {
 	if (argc == 0) {
 	if (argc == 2) {
 		uint32 result;
 		if (GetArgumentInteger(&result, argv[1])) {
 			if (result >= MapSize()) {
-				IConsolePrint(_icolour_err, "Tile does not exist");
+				IConsolePrint(CC_ERROR, "Tile does not exist");
 				return true;
 			}
 			ScrollMainWindowToTile((TileIndex)result);
 			return true;
 		}
 		return true;
 	}
 	if (argc == 2) {
 		char *filename = str_fmt("%s.sav", argv[1]);
-		IConsolePrint(_icolour_def, "Saving map...");
+		IConsolePrint(CC_DEFAULT, "Saving map...");
 		if (SaveOrLoad(filename, SL_SAVE, SAVE_DIR) != SL_OK) {
-			IConsolePrint(_icolour_err, "Saving map failed");
+			IConsolePrint(CC_ERROR, "Saving map failed");
 		} else {
-			IConsolePrintF(_icolour_def, "Map sucessfully saved to %s", filename);
+			IConsolePrintF(CC_DEFAULT, "Map sucessfully saved to %s", filename);
 		}
 		free(filename);
 		return true;
 	}
 		IConsoleHelp("Saves the current config, typically to 'openttd.cfg'.");
 		return true;
 	}
 	SaveToConfig();
-	IConsolePrint(_icolour_def, "Saved config.");
+	IConsolePrint(CC_DEFAULT, "Saved config.");
 	return true;
 }
 static const FiosItem* GetFiosItem(const char* file)
 {
 				SetFiosType(item->type);
 				ttd_strlcpy(_file_to_saveload.name, FiosBrowseTo(item), sizeof(_file_to_saveload.name));
 				ttd_strlcpy(_file_to_saveload.title, item->title, sizeof(_file_to_saveload.title));
 			} break;
-			default: IConsolePrintF(_icolour_err, "%s: Not a savegame.", file);
+			default: IConsolePrintF(CC_ERROR, "%s: Not a savegame.", file);
 		}
 	} else {
-		IConsolePrintF(_icolour_err, "%s: No such file or directory.", file);
+		IConsolePrintF(CC_ERROR, "%s: No such file or directory.", file);
 	}
 	FiosFreeSavegameList();
 	return true;
 }
 	file = argv[1];
 	item = GetFiosItem(file);
 	if (item != NULL) {
 		if (!FiosDelete(item->name))
-			IConsolePrintF(_icolour_err, "%s: Failed to delete file", file);
+			IConsolePrintF(CC_ERROR, "%s: Failed to delete file", file);
 	} else {
-		IConsolePrintF(_icolour_err, "%s: No such file or directory.", file);
+		IConsolePrintF(CC_ERROR, "%s: No such file or directory.", file);
 	}
 	FiosFreeSavegameList();
 	return true;
 }
 	BuildFileList();
 	for (i = 0; i < _fios_num; i++) {
 		const FiosItem *item = &_fios_list[i];
-		IConsolePrintF(_icolour_def, "%d) %s", i, item->title);
+		IConsolePrintF(CC_DEFAULT, "%d) %s", i, item->title);
 	}
 	FiosFreeSavegameList();
 	return true;
 }
 	if (item != NULL) {
 		switch (item->type) {
 			case FIOS_TYPE_DIR: case FIOS_TYPE_DRIVE: case FIOS_TYPE_PARENT:
 				FiosBrowseTo(item);
 				break;
-			default: IConsolePrintF(_icolour_err, "%s: Not a directory.", file);
+			default: IConsolePrintF(CC_ERROR, "%s: Not a directory.", file);
 		}
 	} else {
-		IConsolePrintF(_icolour_err, "%s: No such file or directory.", file);
+		IConsolePrintF(CC_ERROR, "%s: No such file or directory.", file);
 	}
 	FiosFreeSavegameList();
 	return true;
 }
 	// XXX - Workaround for broken file handling
 	FiosGetSavegameList(SLD_LOAD_GAME);
 	FiosFreeSavegameList();
 	FiosGetDescText(&path, NULL);
-	IConsolePrint(_icolour_def, path);
+	IConsolePrint(CC_DEFAULT, path);
 	return true;
 }
 DEF_CONSOLE_CMD(ConClearBuffer)
 {
 	}
 	if (ci != NULL) {
 		banip = inet_ntoa(*(struct in_addr *)&ci->client_ip);
 		SEND_COMMAND(PACKET_SERVER_ERROR)(NetworkFindClientStateFromIndex(index), NETWORK_ERROR_KICKED);
-		IConsolePrint(_icolour_def, "Client banned");
+		IConsolePrint(CC_DEFAULT, "Client banned");
 	} else {
-		IConsolePrint(_icolour_def, "Client not online, banned IP");
+		IConsolePrint(CC_DEFAULT, "Client not online, banned IP");
 	}
 	/* Add user to ban-list */
 	for (index = 0; index < lengthof(_network_ban_list); index++) {
 		if (_network_ban_list[index] == NULL) {
 		if (_network_ban_list[i] == NULL) continue;
 		if (strcmp(_network_ban_list[i], argv[1]) == 0 || index == i) {
 			free(_network_ban_list[i]);
 			_network_ban_list[i] = NULL;
-			IConsolePrint(_icolour_def, "IP unbanned.");
+			IConsolePrint(CC_DEFAULT, "IP unbanned.");
 			return true;
 		}
 	}
-	IConsolePrint(_icolour_def, "IP not in ban-list.");
+	IConsolePrint(CC_DEFAULT, "IP not in ban-list.");
 	return true;
 }
 DEF_CONSOLE_CMD(ConBanList)
 {
 	if (argc == 0) {
 		IConsoleHelp("List the IP's of banned clients: Usage 'banlist'");
 		return true;
 	}
-	IConsolePrint(_icolour_def, "Banlist: ");
+	IConsolePrint(CC_DEFAULT, "Banlist: ");
 	for (i = 0; i < lengthof(_network_ban_list); i++) {
 		if (_network_ban_list[i] != NULL)
-			IConsolePrintF(_icolour_def, "  %d) %s", i + 1, _network_ban_list[i]);
+			IConsolePrintF(CC_DEFAULT, "  %d) %s", i + 1, _network_ban_list[i]);
 	}
 	return true;
 }
 		return true;
 	}
 	if (_pause_game == 0) {
 		DoCommandP(0, 1, 0, NULL, CMD_PAUSE);
-		IConsolePrint(_icolour_def, "Game paused.");
+		IConsolePrint(CC_DEFAULT, "Game paused.");
 	} else {
-		IConsolePrint(_icolour_def, "Game is already paused.");
+		IConsolePrint(CC_DEFAULT, "Game is already paused.");
 	}
 	return true;
 }
 		return true;
 	}
 	if (_pause_game != 0) {
 		DoCommandP(0, 0, 0, NULL, CMD_PAUSE);
-		IConsolePrint(_icolour_def, "Game unpaused.");
+		IConsolePrint(CC_DEFAULT, "Game unpaused.");
 	} else {
-		IConsolePrint(_icolour_def, "Game is already unpaused.");
+		IConsolePrint(CC_DEFAULT, "Game is already unpaused.");
 	}
 	return true;
 }
 		int lag = NetworkCalculateLag(cs);
 		const NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs);
 		const char* status;
 		status = (cs->status < (ptrdiff_t)lengthof(stat_str) ? stat_str[cs->status] : "unknown");
-		IConsolePrintF(8, "Client #%1d  name: '%s'  status: '%s'  frame-lag: %3d  company: %1d  IP: %s  unique-id: '%s'",
+		IConsolePrintF(CC_INFO, "Client #%1d  name: '%s'  status: '%s'  frame-lag: %3d  company: %1d  IP: %s  unique-id: '%s'",
 			cs->index, ci->client_name, status, lag,
 			ci->client_playas + (IsValidPlayer(ci->client_playas) ? 1 : 0),
 			GetPlayerIP(ci), ci->unique_id);
 	}
 		IConsoleHelp("You can change these values by setting the variables 'max_clients', 'max_companies' and 'max_spectators'");
 		return true;
 	}
 	gi = &_network_game_info;
-	IConsolePrintF(_icolour_def, "Current/maximum clients:    %2d/%2d", gi->clients_on, gi->clients_max);
+	IConsolePrintF(CC_DEFAULT, "Current/maximum clients:    %2d/%2d", gi->clients_on, gi->clients_max);
-	IConsolePrintF(_icolour_def, "Current/maximum companies:  %2d/%2d", ActivePlayerCount(), gi->companies_max);
+	IConsolePrintF(CC_DEFAULT, "Current/maximum companies:  %2d/%2d", ActivePlayerCount(), gi->companies_max);
-	IConsolePrintF(_icolour_def, "Current/maximum spectators: %2d/%2d", NetworkSpectatorCount(), gi->spectators_max);
+	IConsolePrintF(CC_DEFAULT, "Current/maximum spectators: %2d/%2d", NetworkSpectatorCount(), gi->spectators_max);
 	return true;
 }
 DEF_CONSOLE_HOOK(ConHookValidateMaxClientsCount)
 	index = (PlayerID)(atoi(argv[1]) - 1);
 	/* Check valid range */
 	if (!IsValidPlayer(index)) {
-		IConsolePrintF(_icolour_err, "Company does not exist. Company-id must be between 1 and %d.", MAX_PLAYERS);
+		IConsolePrintF(CC_ERROR, "Company does not exist. Company-id must be between 1 and %d.", MAX_PLAYERS);
 		return true;
 	}
 	/* Check if company does exist */
 	p = GetPlayer(index);
 		return true;
 	}
 	/* It is safe to remove this company */
 	DoCommandP(0, 2, index, NULL, CMD_PLAYER_CTRL);
-	IConsolePrint(_icolour_def, "Company deleted.");
+	IConsolePrint(CC_DEFAULT, "Company deleted.");
 	return true;
 }
 DEF_CONSOLE_CMD(ConNetworkClients)
 		IConsoleHelp("Get a list of connected clients including their ID, name, company-id, and IP. Usage: 'clients'");
 		return true;
 	}
 	FOR_ALL_ACTIVE_CLIENT_INFOS(ci) {
-		IConsolePrintF(8, "Client #%1d  name: '%s'  company: %1d  IP: %s",
+		IConsolePrintF(CC_INFO, "Client #%1d  name: '%s'  company: %1d  IP: %s",
 		               ci->client_index, ci->client_name,
 		               ci->client_playas + (IsValidPlayer(ci->client_playas) ? 1 : 0),
 		               GetPlayerIP(ci));
 	}
 	rport = NETWORK_DEFAULT_PORT;
 	_network_playas = PLAYER_NEW_COMPANY;
 	ParseConnectionString(&player, &port, ip);
-	IConsolePrintF(_icolour_def, "Connecting to %s...", ip);
+	IConsolePrintF(CC_DEFAULT, "Connecting to %s...", ip);
 	if (player != NULL) {
 		_network_playas = (PlayerID)atoi(player);
-		IConsolePrintF(_icolour_def, "    player-no: %d", _network_playas);
+		IConsolePrintF(CC_DEFAULT, "    player-no: %d", _network_playas);
 		/* From a user pov 0 is a new player, internally it's different and all
 		 * players are offset by one to ease up on users (eg players 1-8 not 0-7) */
 		if (_network_playas != PLAYER_SPECTATOR) {
 			_network_playas--;
 			if (!IsValidPlayer(_network_playas)) return false;
 		}
 	}
 	if (port != NULL) {
 		rport = atoi(port);
-		IConsolePrintF(_icolour_def, "    port: %s", port);
+		IConsolePrintF(CC_DEFAULT, "    port: %s", port);
 	}
 	NetworkClientConnectGame(ip, rport);
 	return true;
 	}
 	if (!CloseConsoleLogIfActive()) {
 		if (argc < 2) return false;
-		IConsolePrintF(_icolour_def, "file output started to: %s", argv[1]);
+		IConsolePrintF(CC_DEFAULT, "file output started to: %s", argv[1]);
 		_iconsole_output_file = fopen(argv[1], "ab");
 		if (_iconsole_output_file == NULL) IConsoleError("could not open file");
 	}
 	return true;
 		IConsoleHelp("Print back the first argument to the console. Usage: 'echo <arg>'");
 		return true;
 	}
 	if (argc < 2) return false;
-	IConsolePrint(_icolour_def, argv[1]);
+	IConsolePrint(CC_DEFAULT, argv[1]);
 	return true;
 }
 DEF_CONSOLE_CMD(ConEchoC)
 {
 		IConsoleHelp("Print back the first argument to the console in a given colour. Usage: 'echoc <colour> <arg2>'");
 		return true;
 	}
 	if (argc < 3) return false;
-	IConsolePrint(atoi(argv[1]), argv[2]);
+	IConsolePrint((ConsoleColour)atoi(argv[1]), argv[2]);
 	return true;
 }
 DEF_CONSOLE_CMD(ConNewGame)
 {
 		IConsoleHelp("Returns the seed used to create this game. Usage: 'getseed'");
 		IConsoleHelp("The seed can be used to reproduce the exact same map as the game started with.");
 		return true;
 	}
-	IConsolePrintF(_icolour_def, "Generation Seed: %u", _patches.generation_seed);
+	IConsolePrintF(CC_DEFAULT, "Generation Seed: %u", _patches.generation_seed);
 	return true;
 }
 DEF_CONSOLE_CMD(ConGetDate)
 {
 		return true;
 	}
 	YearMonthDay ymd;
 	ConvertDateToYMD(_date, &ymd);
-	IConsolePrintF(_icolour_def, "Date: %d-%d-%d", ymd.day, ymd.month + 1, ymd.year);
+	IConsolePrintF(CC_DEFAULT, "Date: %d-%d-%d", ymd.day, ymd.month + 1, ymd.year);
 	return true;
 }
 DEF_CONSOLE_CMD(ConAlias)
 	if (var == NULL) {
 		IConsoleError("the given variable was not found");
 		return true;
 	}
-	IConsolePrintF(_icolour_def, "variable name: %s", var->name);
+	IConsolePrintF(CC_DEFAULT, "variable name: %s", var->name);
-	IConsolePrintF(_icolour_def, "variable type: %s", _icon_vartypes[var->type]);
+	IConsolePrintF(CC_DEFAULT, "variable type: %s", _icon_vartypes[var->type]);
-	IConsolePrintF(_icolour_def, "variable addr: 0x%X", var->addr);
+	IConsolePrintF(CC_DEFAULT, "variable addr: 0x%X", var->addr);
 	if (var->hook.access) IConsoleWarning("variable is access hooked");
 	if (var->hook.pre) IConsoleWarning("variable is pre hooked");
 	if (var->hook.post) IConsoleWarning("variable is post hooked");
 	return true;
 	if (cmd == NULL) {
 		IConsoleError("the given command was not found");
 		return true;
 	}
-	IConsolePrintF(_icolour_def, "command name: %s", cmd->name);
+	IConsolePrintF(CC_DEFAULT, "command name: %s", cmd->name);
-	IConsolePrintF(_icolour_def, "command proc: 0x%X", cmd->proc);
+	IConsolePrintF(CC_DEFAULT, "command proc: 0x%X", cmd->proc);
 	if (cmd->hook.access) IConsoleWarning("command is access hooked");
 	if (cmd->hook.pre) IConsoleWarning("command is pre hooked");
 	if (cmd->hook.post) IConsoleWarning("command is post hooked");
 	}
 	if (argc > 2) return false;
 	if (argc == 1) {
-		IConsolePrintF(_icolour_def, "Current debug-level: '%s'", GetDebugString());
+		IConsolePrintF(CC_DEFAULT, "Current debug-level: '%s'", GetDebugString());
 	} else {
 		SetDebugString(argv[1]);
 	}
 	return true;
 			cmd = IConsoleCmdGet(alias->cmdline);
 			if (cmd != NULL) {
 				cmd->proc(0, NULL);
 				return true;
 			}
-			IConsolePrintF(_icolour_err, "ERROR: alias is of special type, please see its execution-line: '%s'", alias->cmdline);
+			IConsolePrintF(CC_ERROR, "ERROR: alias is of special type, please see its execution-line: '%s'", alias->cmdline);
 			return true;
 		}
 		var = IConsoleVarGet(argv[1]);
 		if (var != NULL && var->help != NULL) {
 		IConsoleError("command or variable not found");
 		return true;
 	}
-	IConsolePrint(13, " ---- OpenTTD Console Help ---- ");
+	IConsolePrint(CC_WARNING, " ---- OpenTTD Console Help ---- ");
-	IConsolePrint( 1, " - variables: [command to list all variables: list_vars]");
+	IConsolePrint(CC_DEFAULT, " - variables: [command to list all variables: list_vars]");
-	IConsolePrint( 1, " set value with '<var> = <value>', use '++/--' to in-or decrement");
+	IConsolePrint(CC_DEFAULT, " set value with '<var> = <value>', use '++/--' to in-or decrement");
-	IConsolePrint( 1, " or omit '=' and just '<var> <value>'. get value with typing '<var>'");
+	IConsolePrint(CC_DEFAULT, " or omit '=' and just '<var> <value>'. get value with typing '<var>'");
-	IConsolePrint( 1, " - commands: [command to list all commands: list_cmds]");
+	IConsolePrint(CC_DEFAULT, " - commands: [command to list all commands: list_cmds]");
-	IConsolePrint( 1, " call commands with '<command> <arg2> <arg3>...'");
+	IConsolePrint(CC_DEFAULT, " call commands with '<command> <arg2> <arg3>...'");
-	IConsolePrint( 1, " - to assign strings, or use them as arguments, enclose it within quotes");
+	IConsolePrint(CC_DEFAULT, " - to assign strings, or use them as arguments, enclose it within quotes");
-	IConsolePrint( 1, " like this: '<command> \"string argument with spaces\"'");
+	IConsolePrint(CC_DEFAULT, " like this: '<command> \"string argument with spaces\"'");
-	IConsolePrint( 1, " - use 'help <command> | <variable>' to get specific information");
+	IConsolePrint(CC_DEFAULT, " - use 'help <command> | <variable>' to get specific information");
-	IConsolePrint( 1, " - scroll console output with shift + (up | down) | (pageup | pagedown))");
+	IConsolePrint(CC_DEFAULT, " - scroll console output with shift + (up | down) | (pageup | pagedown))");
-	IConsolePrint( 1, " - scroll console input history with the up | down arrows");
+	IConsolePrint(CC_DEFAULT, " - scroll console input history with the up | down arrows");
-	IConsolePrint( 1, "");
+	IConsolePrint(CC_DEFAULT, "");
 	return true;
 }
 DEF_CONSOLE_CMD(ConListCommands)
 {
 	if (argv[1] != NULL) l = strlen(argv[1]);
 	for (cmd = _iconsole_cmds; cmd != NULL; cmd = cmd->next) {
 		if (argv[1] == NULL || strncmp(cmd->name, argv[1], l) == 0) {
-				IConsolePrintF(_icolour_def, "%s", cmd->name);
+				IConsolePrintF(CC_DEFAULT, "%s", cmd->name);
 		}
 	}
 	return true;
 }
 	if (argv[1] != NULL) l = strlen(argv[1]);
 	for (var = _iconsole_vars; var != NULL; var = var->next) {
 		if (argv[1] == NULL || strncmp(var->name, argv[1], l) == 0)
-			IConsolePrintF(_icolour_def, "%s", var->name);
+			IConsolePrintF(CC_DEFAULT, "%s", var->name);
 	}
 	return true;
 }
 	if (argv[1] != NULL) l = strlen(argv[1]);
 	for (alias = _iconsole_aliases; alias != NULL; alias = alias->next) {
 		if (argv[1] == NULL || strncmp(alias->name, argv[1], l) == 0)
-			IConsolePrintF(_icolour_def, "%s => %s", alias->name, alias->cmdline);
+			IConsolePrintF(CC_DEFAULT, "%s => %s", alias->name, alias->cmdline);
 	}
 	return true;
 }
 		if (!p->is_active) continue;
 		const NetworkPlayerInfo *npi = &_network_player_info[p->index];
 		GetString(buffer, STR_00D1_DARK_BLUE + _player_colors[p->index], lastof(buffer));
-		IConsolePrintF(8, "#:%d(%s) Company Name: '%s'  Year Founded: %d  Money: %" OTTD_PRINTF64 "d  Loan: %" OTTD_PRINTF64 "d  Value: %" OTTD_PRINTF64 "d  (T:%d, R:%d, P:%d, S:%d) %sprotected",
+		IConsolePrintF(CC_INFO, "#:%d(%s) Company Name: '%s'  Year Founded: %d  Money: %" OTTD_PRINTF64 "d  Loan: %" OTTD_PRINTF64 "d  Value: %" OTTD_PRINTF64 "d  (T:%d, R:%d, P:%d, S:%d) %sprotected",
 			p->index + 1, buffer, npi->company_name, p->inaugurated_year, (int64)p->player_money, (int64)p->current_loan, (int64)CalculateCompanyValue(p),
 			/* trains      */ npi->num_vehicle[0],
 			/* lorry + bus */ npi->num_vehicle[1] + npi->num_vehicle[2],
 			/* planes      */ npi->num_vehicle[3],
 			/* ships       */ npi->num_vehicle[4],
 	}
 	if (argc != 3) return false;
 	if (atoi(argv[1]) < 1 || atoi(argv[1]) > MAX_PLAYERS) {
-		IConsolePrintF(_icolour_def, "Unknown player. Player range is between 1 and %d.", MAX_PLAYERS);
+		IConsolePrintF(CC_DEFAULT, "Unknown player. Player range is between 1 and %d.", MAX_PLAYERS);
 		return true;
 	}
 	if (!_network_server) {
 		SEND_COMMAND(PACKET_CLIENT_CHAT)(NETWORK_ACTION_CHAT_COMPANY, DESTTYPE_TEAM, atoi(argv[1]), argv[2]);
 /* Also use from within player_gui to change the password graphically */
 bool NetworkChangeCompanyPassword(byte argc, char *argv[])
 {
 	if (argc == 0) {
 		if (!IsValidPlayer(_local_player)) return true; // dedicated server
-		IConsolePrintF(_icolour_warn, "Current value for 'company_pw': %s", _network_player_info[_local_player].password);
+		IConsolePrintF(CC_WARNING, "Current value for 'company_pw': %s", _network_player_info[_local_player].password);
 		return true;
 	}
 	if (!IsValidPlayer(_local_player)) {
 		IConsoleError("You have to own a company to make use of this command.");
 		SEND_COMMAND(PACKET_CLIENT_SET_PASSWORD)(_network_player_info[_local_player].password);
 	} else {
 		HashCurrentCompanyPassword();
 	}
-	IConsolePrintF(_icolour_warn, "'company_pw' changed to:  %s", _network_player_info[_local_player].password);
+	IConsolePrintF(CC_WARNING, "'company_pw' changed to:  %s", _network_player_info[_local_player].password);
 	return true;
 }
 DEF_CONSOLE_HOOK(ConProcPlayerName)
 	if (strcmp(ci->client_name, _network_player_name) != 0) {
 		if (!_network_server) {
 			SEND_COMMAND(PACKET_CLIENT_SET_NAME)(_network_player_name);
 		} else {
 			if (NetworkFindName(_network_player_name)) {
-				NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, 1, false, ci->client_name, "%s", _network_player_name);
+				NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, CC_DEFAULT, false, ci->client_name, "%s", _network_player_name);
 				ttd_strlcpy(ci->client_name, _network_player_name, sizeof(ci->client_name));
 				NetworkUpdateClientInfo(NETWORK_SERVER_INDEX);
 			}
 		}
 	}
 }
 DEF_CONSOLE_CMD(ConProcServerIP)
 {
 	if (argc == 0) {
-		IConsolePrintF(_icolour_warn, "Current value for 'server_ip': %s", inet_ntoa(*(struct in_addr *)&_network_server_bind_ip));
+		IConsolePrintF(CC_WARNING, "Current value for 'server_ip': %s", inet_ntoa(*(struct in_addr *)&_network_server_bind_ip));
 		return true;
 	}
 	if (argc != 1) return false;
 	_network_server_bind_ip = (strcmp(argv[0], "all") == 0) ? inet_addr("0.0.0.0") : inet_addr(argv[0]);
 	snprintf(_network_server_bind_ip_host, sizeof(_network_server_bind_ip_host), "%s", inet_ntoa(*(struct in_addr *)&_network_server_bind_ip));
-	IConsolePrintF(_icolour_warn, "'server_ip' changed to:  %s", inet_ntoa(*(struct in_addr *)&_network_server_bind_ip));
+	IConsolePrintF(CC_WARNING, "'server_ip' changed to:  %s", inet_ntoa(*(struct in_addr *)&_network_server_bind_ip));
 	return true;
 }
 #endif /* ENABLE_NETWORK */
 DEF_CONSOLE_CMD(ConPatch)

changeset 9337	ab6e0234bacc
parent 9336	6baad5b3033d
child 9354	845e07db4549