cpp/openttd-patchpack/source Changeset - r1866:3795144cd786

Changeset - r1866:3795144cd786

Parent rev.

Child rev.

[Not reviewed]

master

0 7 0

Darkvater - 19 years ago 2005-05-28 16:59:51
darkvater@openttd.org

(svn r2372) - Fix (console): update the example scripts in the scripts/ directory to reflect the new console functionality
- Fix (console): any line starting with a '#' is a comment so ignore it
- Fix (console): The special variables whose value can only be set by a custom process should, also print out their newly set value there, instead of relying on the default printout which is slightly confusing. Eg after you change the value it still printed out 'current value for...' instead of 'XXX changed to...'

7 files changed with 21 insertions and 10 deletions:

console.c

console_cmds.c

scripts/autoexec.scr.example

scripts/on_client.scr.example

scripts/on_dedicated.scr.example

scripts/pre_dedicated.scr.example

scripts/pre_server.scr.example

0 comments (0 inline, 0 general)

console.c

➞

Show inline comments

@@ @@ -691,6 +691,9 @@ void IConsoleAliasExec(const IConsoleAli @@
 	memset(&aliases, 0, sizeof(aliases));
 	memset(&aliasstream, 0, sizeof(aliasstream));
 	if (_stdlib_con_developer)
 		IConsolePrintF(_icolour_dbg, "condbg: requested command is an alias; parsing...");
 	aliases[0] = aliasstream;
 	for (cmdptr = alias->cmdline, a_index = 0, astream_i = 0; *cmdptr != '\0'; cmdptr++) {
 		if (a_index >= lengthof(aliases) || astream_i >= lengthof(aliasstream)) break;
@@ @@ -964,6 +967,9 @@ void IConsoleVarExec(const IConsoleVar * @@
 	byte t_index = tokencount;
 	uint32 value;
 	if (_stdlib_con_developer)
 		IConsolePrintF(_icolour_dbg, "condbg: requested command is a variable");
 	if (tokencount == 0) { /* Just print out value */
 		IConsoleVarPrintGetValue(var);
 		return;
@@ @@ -976,7 +982,6 @@ void IConsoleVarExec(const IConsoleVar * @@
 		/* Some variables need really special handling, handle it in their callback procedure */
 		if (var->proc != NULL) {
 			var->proc(tokencount, &token[t_index - tokencount]); // set the new value
 			var->proc(0, NULL); // print out new value
 			return;
+		}
 		/* Strings need special processing. No need to convert the argument to
@@ @@ -1035,6 +1040,8 @@ void IConsoleCmdExec(const char *cmdstr) @@
 	bool longtoken = false;
 	bool foundtoken = false;
 	if (cmdstr[0] == '#') return; // comments
 	for (cmdptr = cmdstr; *cmdptr != '\0'; cmdptr++) {
 		if (!IsValidAsciiChar(*cmdptr)) {
 			IConsoleError("command contains malformed characters, aborting");

console_cmds.c

➞

Show inline comments

@@ @@ -1086,6 +1086,8 @@ bool NetworkChangeCompanyPassword(byte a @@
 	if (!_network_server)
 		SEND_COMMAND(PACKET_CLIENT_SET_PASSWORD)(_network_player_info[_local_player].password);
 	IConsolePrintF(_icolour_warn, "'company_pw' changed to:  %s", _network_player_info[_local_player].password);
 	return true;
+}
@@ @@ -1136,6 +1138,7 @@ DEF_CONSOLE_CMD(ConProcServerIP) @@
 	_network_server_bind_ip = 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));
 	return true;
+}

scripts/autoexec.scr.example

➞

Show inline comments

+#
 # send chat messages from the console with
+#
 # ] s i love this chat
+#
 alias "s" "say %!"
@@ \ No newline at end of file @@
 alias s "say %!"
@@ \ No newline at end of file @@

scripts/on_client.scr.example

➞

Show inline comments

 echo "Setting default network client settings..."
-set name "myname"
+name = "myname"

scripts/on_dedicated.scr.example

➞

Show inline comments

 echo "Setting dedicated network server settings..."
 set server_pw "*"
 set server_name "My example dedicated gameserver"
 # empty the server password
 server_pw = "*"
 server_name = "My example dedicated gameserver"

scripts/pre_dedicated.scr.example

➞

Show inline comments

 set server_ip 0.0.0.0
 set server_port 3979
 # set default server port, and have the dedicated server listen on all ports
 server_ip = 0.0.0.0
 server_port = 3979

scripts/pre_server.scr.example

➞

Show inline comments

 set server_port 3979
 # set the server port to the default value
 server_port = 3979

0 comments (0 inline, 0 general)