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

[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:
cb6328c225 WAGE: Fix missing head armor names
0b467ee3c6 WAGE: Fix missing hit text by setting default aim to chest
bae4055216 WAGE: Fix extra newlines by skipping empty strings in appendtext


Commit: cb6328c225792b9f303acc10f08511857006bc3c
    https://github.com/scummvm/scummvm/commit/cb6328c225792b9f303acc10f08511857006bc3c
Author: aunnoman1 (aunnoman123 at outlook.com)
Date: 2025-03-25T12:04:51+08:00

Commit Message:
WAGE: Fix missing head armor names

Fixes head armor names not being printed when games are describing what
armor enemies/monsters are wearing

Changed paths:
    engines/wage/combat.cpp


diff --git a/engines/wage/combat.cpp b/engines/wage/combat.cpp
index b98d49301d8..baaed464a3c 100644
--- a/engines/wage/combat.cpp
+++ b/engines/wage/combat.cpp
@@ -79,8 +79,8 @@ void WageEngine::encounter(Chr *player, Chr *chr) {
 		appendText(chr->_initialComment.c_str());
 
 	if (chr->_armor[Chr::HEAD_ARMOR] != NULL) {
-		snprintf(buf, 512, "%s%s is wearing %s.", chr->getDefiniteArticle(true), chr->_name.c_str(),
-					getIndefiniteArticle(chr->_armor[Chr::HEAD_ARMOR]->_name));
+		snprintf(buf, 512, "%s%s is wearing %s%s.", chr->getDefiniteArticle(true), chr->_name.c_str(),
+					getIndefiniteArticle(chr->_armor[Chr::HEAD_ARMOR]->_name), chr->_armor[Chr::HEAD_ARMOR]->_name.c_str());
 		appendText(buf);
 	}
 	if (chr->_armor[Chr::BODY_ARMOR] != NULL) {


Commit: 0b467ee3c696b1ced241fcd98cfacdd853d7f8d6
    https://github.com/scummvm/scummvm/commit/0b467ee3c696b1ced241fcd98cfacdd853d7f8d6
Author: aunnoman1 (aunnoman123 at outlook.com)
Date: 2025-03-25T12:04:51+08:00

Commit Message:
WAGE: Fix missing hit text by setting default aim to chest

Previously, hitting an enemy did not print any text because the `_aim`
variable had a placeholder default value. This commit sets the default `_aim` to
"chest," ensuring that hit feedback is always displayed.

Changed paths:
    engines/wage/wage.cpp


diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index 732d9333ab4..b439abd48e4 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -67,7 +67,7 @@ namespace Wage {
 WageEngine::WageEngine(OSystem *syst, const ADGameDescription *desc) : Engine(syst), _gameDescription(desc) {
 	_rnd = new Common::RandomSource("wage");
 
-	_aim = -1;
+	_aim = Chr::CHEST;
 	_opponentAim = -1;
 	_temporarilyHidden = false;
 	_isGameOver = false;
@@ -174,7 +174,7 @@ Common::Error WageEngine::run() {
 
 // Resetting required variables
 void WageEngine::resetState() {
-	_aim = -1;
+	_aim = Chr::CHEST;
 	_opponentAim = -1;
 	_temporarilyHidden = false;
 	_isGameOver = false;


Commit: bae4055216f2780ed6dce79a89afb16a8459cf2f
    https://github.com/scummvm/scummvm/commit/bae4055216f2780ed6dce79a89afb16a8459cf2f
Author: aunnoman1 (aunnoman123 at outlook.com)
Date: 2025-03-25T12:04:51+08:00

Commit Message:
WAGE: Fix extra newlines by skipping empty strings in appendtext

Sometimes empty strings are passed to `appendtext` caused unintended newlines. Added a check to ignore them, preventing extra newlines.

Changed paths:
    engines/wage/wage.cpp


diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index b439abd48e4..646101bd6d5 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -265,9 +265,12 @@ void WageEngine::setMenu(Common::String menu) {
 void WageEngine::appendText(const char *str) {
 	Common::String s(str);
 
-	s += '\n';
+	// HACK: Added here because sometimes empty strings would be passed, leading to extra newlines
+	if (!s.empty()){
+		s += '\n';
 
-	_gui->appendText(s.c_str());
+		_gui->appendText(s.c_str());
+	}
 
 	_inputText.clear();
 }