[Scummvm-git-logs] scummvm master -> ec3060cb7a58ad5100d3de570a53219650dad52d

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ec3060cb7a ULTIMA8: Update remainder of Console code for ScummVM


Commit: ec3060cb7a58ad5100d3de570a53219650dad52d
    https://github.com/scummvm/scummvm/commit/ec3060cb7a58ad5100d3de570a53219650dad52d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-20T19:03:38-08:00

Commit Message:
ULTIMA8: Update remainder of Console code for ScummVM

Changed paths:
    engines/ultima/ultima8/misc/console.cpp


diff --git a/engines/ultima/ultima8/misc/console.cpp b/engines/ultima/ultima8/misc/console.cpp
index aa6aa87..b89e321 100644
--- a/engines/ultima/ultima8/misc/console.cpp
+++ b/engines/ultima/ultima8/misc/console.cpp
@@ -633,13 +633,13 @@ void Console::AddCharacterToCommandBuffer(int ch) {
 						common = it->_key;
 						found = it;
 					} else {
-#ifdef TODO
 						Console::ArgsType::iterator it1 = common.begin();
 						Console::ArgsType::const_iterator it2 = it->_key.begin();
 						int comsize = 0;
 
 						while (it1 != common.end()) {
-							if (!Console::ArgsType::traits_type::eq(*it1, *it2)) break;
+							if (*it1 == *it2)
+								break;
 
 							comsize++;
 							++it1;
@@ -647,14 +647,11 @@ void Console::AddCharacterToCommandBuffer(int ch) {
 						}
 
 						common.resize(comsize);
-#endif
 					}
 					count++;
 				}
 
 			if (count) {
-#ifdef TODO
-
 				if (count > 1) {
 					pout << "]" << commandBuffer << Std::endl;
 
@@ -671,13 +668,11 @@ void Console::AddCharacterToCommandBuffer(int ch) {
 					commandBuffer = common;
 
 				commandCursorPos = commandBuffer.size();
-#endif
 			}
 		}
 	}
 	// Add the character to the command buffer
 	else {
-#ifdef TODO
 		if (commandCursorPos == static_cast<int>(commandBuffer.size())) {
 			commandBuffer += ch;
 		} else if (commandInsert) {
@@ -687,7 +682,6 @@ void Console::AddCharacterToCommandBuffer(int ch) {
 		}
 
 		commandCursorPos++;
-#endif
 	}
 }
 
@@ -746,14 +740,12 @@ void Console::ConCmd_CmdList(const Console::ArgvType &argv) {
 }
 
 void Console::ConCmd_CmdHistory(const Console::ArgvType & /*argv*/) {
-#ifdef TODO
 	Std::vector<ArgsType>::iterator it;
 
 	for (it = con->commandHistory.begin(); it != con->commandHistory.end(); ++it)
 		pout << " " << *it << Std::endl;
 
 	pout << con->commandHistory.size() << " commands" << Std::endl;
-#endif
 }
 
 /*