[Scummvm-git-logs] scummvm master -> 2f891d372b13423f309df0d1484bf1c86d22f6b1

[sev-]

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

Summary:
10b0624223 DIRECTOR: Added missing newlines in debug help
a9892cad18 GUI: Increase console buffer size to 1024 lines
2f891d372b GUI: Wrap console output around console width


Commit: 10b0624223dee49839b7f9e072702b7612af2e02
    https://github.com/scummvm/scummvm/commit/10b0624223dee49839b7f9e072702b7612af2e02
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-15T23:46:31+01:00

Commit Message:
DIRECTOR: Added missing newlines in debug help

Changed paths:
    engines/director/debugger.cpp


diff --git a/engines/director/debugger.cpp b/engines/director/debugger.cpp
index a62cf84a09e..0d5dfb00057 100644
--- a/engines/director/debugger.cpp
+++ b/engines/director/debugger.cpp
@@ -181,13 +181,13 @@ bool Debugger::cmdHelp(int argc, const char **argv) {
 	debugPrintf(" bpmovie / bm [moviePath] - Create a breakpoint on a switch to a movie\n");
 	debugPrintf(" bpframe / bf [frameId] - Create a breakpoint on a frame in the score\n");
 	debugPrintf(" bpframe / bf [moviePath] [frameId] - Create a breakpoint on a frame in the score of a specific movie\n");
-	debugPrintf(" bpentity / be [entityName] - Create a breakpoint on a Lingo \"the\" entity being read or modified");
-	debugPrintf(" bpentity / be [entityName] [r/w/rw] - Create a breakpoint on a Lingo \"the\" entity being accessed in a specific way");
-	debugPrintf(" bpentity / be [entityName:fieldName] - Create a breakpoint on a Lingo \"the\" field being read or modified");
-	debugPrintf(" bpentity / be [entityName:fieldName] [r/w/rw] - Create a breakpoint on a Lingo \"the\" field being accessed in a specific way");
-	debugPrintf(" bpvar / bv [varName] - Create a breakpoint on a Lingo variable being read or modified");
-	debugPrintf(" bpvar / bv [varName] [r/w/rw] - Create a breakpoint on a Lingo variable being accessed in a specific way");
-	debugPrintf(" bpevent / bn [eventName] - Create a breakpoint on a Lingo event");
+	debugPrintf(" bpentity / be [entityName] - Create a breakpoint on a Lingo \"the\" entity being read or modified\n");
+	debugPrintf(" bpentity / be [entityName] [r/w/rw] - Create a breakpoint on a Lingo \"the\" entity being accessed in a specific way\n");
+	debugPrintf(" bpentity / be [entityName:fieldName] - Create a breakpoint on a Lingo \"the\" field being read or modified\n");
+	debugPrintf(" bpentity / be [entityName:fieldName] [r/w/rw] - Create a breakpoint on a Lingo \"the\" field being accessed in a specific way\n");
+	debugPrintf(" bpvar / bv [varName] - Create a breakpoint on a Lingo variable being read or modified\n");
+	debugPrintf(" bpvar / bv [varName] [r/w/rw] - Create a breakpoint on a Lingo variable being accessed in a specific way\n");
+	debugPrintf(" bpevent / bn [eventName] - Create a breakpoint on a Lingo event\n");
 	debugPrintf(" bpdel [n] - Deletes a specific breakpoint\n");
 	debugPrintf(" bpenable [n] - Enables a specific breakpoint\n");
 	debugPrintf(" bpdisable [n] - Disables a specific breakpoint\n");


Commit: a9892cad18cfd76c20abb24e2d423772bfb23b1c
    https://github.com/scummvm/scummvm/commit/a9892cad18cfd76c20abb24e2d423772bfb23b1c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-15T23:46:31+01:00

Commit Message:
GUI: Increase console buffer size to 1024 lines

Changed paths:
    gui/console.h


diff --git a/gui/console.h b/gui/console.h
index eb5c0702cfb..e94a1a8a47b 100644
--- a/gui/console.h
+++ b/gui/console.h
@@ -68,8 +68,8 @@ public:
 
 protected:
 	enum {
-		kBufferSize   = 32768,
 		kCharsPerLine = 128,
+		kBufferSize   = kCharsPerLine * 1024,
 
 		kHistorySize  = 20
 	};


Commit: 2f891d372b13423f309df0d1484bf1c86d22f6b1
    https://github.com/scummvm/scummvm/commit/2f891d372b13423f309df0d1484bf1c86d22f6b1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-15T23:46:31+01:00

Commit Message:
GUI: Wrap console output around console width

Changed paths:
    gui/console.cpp


diff --git a/gui/console.cpp b/gui/console.cpp
index d7b520951b8..7a41928f947 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -800,8 +800,9 @@ void ConsoleDialog::printCharIntern(int c) {
 	else {
 		buffer(_currentPos) = (char)c;
 		_currentPos++;
-		if ((_scrollLine + 1) * kCharsPerLine == _currentPos) {
-			_scrollLine++;
+		if (_currentPos % kCharsPerLine == _pageWidth) {
+			warning("NEXT");
+			nextLine();
 			updateScrollBuffer();
 		}
 	}