cpp/openttd-patchpack/source Changeset - r11998:fc4347de05c4

Changeset - r11998:fc4347de05c4

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 15 years ago 2009-05-23 22:40:14
rubidium@openttd.org

(svn r16409) -Change: don't add empty lines/duplicates of the previous command to the console's history

1 file changed with 14 insertions and 4 deletions:

src/console_gui.cpp

0 comments (0 inline, 0 general)

src/console_gui.cpp

➞

Show inline comments

@@ @@ -323,25 +323,24 @@ void IConsoleGUIInit() @@
 	IConsoleLine::Reset();
 	memset(_iconsole_history, 0, sizeof(_iconsole_history));
 	_iconsole_cmdline.buf = CallocT<char>(ICON_CMDLN_SIZE); // create buffer and zero it
 	_iconsole_cmdline.maxsize = ICON_CMDLN_SIZE;
 	IConsolePrintF(CC_WARNING, "OpenTTD Game Console Revision 7 - %s", _openttd_revision);
 	IConsolePrint(CC_WHITE,  "------------------------------------");
 	IConsolePrint(CC_WHITE,  "use \"help\" for more information");
 	IConsolePrint(CC_WHITE,  "");
 	IConsoleClearCommand();
 	IConsoleHistoryAdd("");
+}
 void IConsoleClearBuffer()
+{
 	IConsoleLine::Reset();
+}
 void IConsoleGUIFree()
+{
 	free(_iconsole_cmdline.buf);
 	IConsoleClearBuffer();
+}
@@ @@ -379,37 +378,48 @@ void IConsoleSwitch() @@
+}
 void IConsoleClose() {if (_iconsole_mode == ICONSOLE_OPENED) IConsoleSwitch();}
 void IConsoleOpen()  {if (_iconsole_mode == ICONSOLE_CLOSED) IConsoleSwitch();}
 /**
  * Add the entered line into the history so you can look it back
  * scroll, etc. Put it to the beginning as it is the latest text
  * @param cmd Text to be entered into the 'history'
  */
 static void IConsoleHistoryAdd(const char *cmd)
+{
 	free(_iconsole_history[ICON_HISTORY_SIZE - 1]);
 	/* Strip all spaces at the begin */
 	while (IsWhitespace(*cmd)) cmd++;
 	/* Do not put empty command in history */
 	if (StrEmpty(cmd)) return;
 	memmove(&_iconsole_history[1], &_iconsole_history[0], sizeof(_iconsole_history[0]) * (ICON_HISTORY_SIZE - 1));
 	_iconsole_history[0] = strdup(cmd);
 	/* Do not put in history if command is same as previous */
 	if (_iconsole_history[0] == NULL || strcmp(_iconsole_history[0], cmd) != 0) {
 		free(_iconsole_history[ICON_HISTORY_SIZE - 1]);
 		memmove(&_iconsole_history[1], &_iconsole_history[0], sizeof(_iconsole_history[0]) * (ICON_HISTORY_SIZE - 1));
 		_iconsole_history[0] = strdup(cmd);
+	}
 	/* Reset the history position */
 	IConsoleResetHistoryPos();
+}
 /**
  * Navigate Up/Down in the history of typed commands
  * @param direction Go further back in history (+1), go to recently typed commands (-1)
  */
 static void IConsoleHistoryNavigate(int direction)
+{
 	if (_iconsole_history[0] == NULL) return; // Empty history
 	int i = _iconsole_historypos + direction;
 	/* watch out for overflows, just wrap around */
 	if (i < 0) i = ICON_HISTORY_SIZE - 1;
 	if (i >= ICON_HISTORY_SIZE) i = 0;
 	if (direction > 0) {
 		if (_iconsole_history[i] == NULL) i = 0;
+	}
 	if (direction < 0) {
 		while (i > 0 && _iconsole_history[i] == NULL) i--;

0 comments (0 inline, 0 general)