[Scummvm-git-logs] scummvm master -> 35794eebffb4b6876647345fd1b01548f3200510

[mduggan]

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:
d7b9b1d6e5 ULTIMA8: Break strings on carat character
b248db7af5 ULTIMA8: Add crusader demo music to list
35794eebff ULTIMA8: Correct return type


Commit: d7b9b1d6e5c1e20426a8acb779a61b2786e3d6e7
    https://github.com/scummvm/scummvm/commit/d7b9b1d6e5c1e20426a8acb779a61b2786e3d6e7
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-07-02T16:49:18+09:00

Commit Message:
ULTIMA8: Break strings on carat character

Changed paths:
    engines/ultima/ultima8/graphics/fonts/font.h


diff --git a/engines/ultima/ultima8/graphics/fonts/font.h b/engines/ultima/ultima8/graphics/fonts/font.h
index 80ea0b1b61..86d060c21c 100644
--- a/engines/ultima/ultima8/graphics/fonts/font.h
+++ b/engines/ultima/ultima8/graphics/fonts/font.h
@@ -109,7 +109,7 @@ protected:
 		static bool isSpace(Std::string::const_iterator &i, bool u8specials) {
 			char c = *i;
 			return (c == ' ' || c == '\t' || c == '\n' || c == '\r' ||
-			        (u8specials && (c == '%' || c == '~' || c == '*')));
+			        (u8specials && (c == '%' || c == '~' || c == '*' || c == '^')));
 		}
 		static bool isTab(Std::string::const_iterator &i, bool u8specials) {
 			char c = *i;


Commit: b248db7af53017b3ba1c8b0a22820bd05d30a73e
    https://github.com/scummvm/scummvm/commit/b248db7af53017b3ba1c8b0a22820bd05d30a73e
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-07-02T16:50:35+09:00

Commit Message:
ULTIMA8: Add crusader demo music to list

Changed paths:
    engines/ultima/ultima8/audio/remorse_music_process.cpp


diff --git a/engines/ultima/ultima8/audio/remorse_music_process.cpp b/engines/ultima/ultima8/audio/remorse_music_process.cpp
index 0b50865cbb..1c7e88826a 100644
--- a/engines/ultima/ultima8/audio/remorse_music_process.cpp
+++ b/engines/ultima/ultima8/audio/remorse_music_process.cpp
@@ -33,7 +33,7 @@
 namespace Ultima {
 namespace Ultima8 {
 
-static const int MAX_TRACK = 20;
+static const int MAX_TRACK = 21;
 
 // TODO: Ensure this is the right order for the uses of this from Usecode.
 static const char *TRACK_FILE_NAMES[] = {
@@ -57,7 +57,8 @@ static const char *TRACK_FILE_NAMES[] = {
 	"M16A",
 	"M16B",
 	"M16C",
-	"menu"
+	"menu",
+	"buyme" // for demo
 };
 
 // p_dynamic_cast stuff


Commit: 35794eebffb4b6876647345fd1b01548f3200510
    https://github.com/scummvm/scummvm/commit/35794eebffb4b6876647345fd1b01548f3200510
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-07-02T17:02:21+09:00

Commit Message:
ULTIMA8: Correct return type

Changed paths:
    engines/ultima/ultima8/world/target_reticle_process.cpp


diff --git a/engines/ultima/ultima8/world/target_reticle_process.cpp b/engines/ultima/ultima8/world/target_reticle_process.cpp
index 9b8e4f6ec3..09f3b0d199 100644
--- a/engines/ultima/ultima8/world/target_reticle_process.cpp
+++ b/engines/ultima/ultima8/world/target_reticle_process.cpp
@@ -78,7 +78,7 @@ bool TargetReticleProcess::findTargetItem() {
 	bool changed = false;
 
 	if (!mainactor || !currentmap)
-		return nullptr;
+		return false;
 
 	int dir = mainactor->getDir();