[Scummvm-git-logs] scummvm master -> ed7505aae765f68216e769cd93689344b3372275
dreammaster
dreammaster at scummvm.org
Mon Mar 26 04:07:22 CEST 2018
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:
ed7505aae7 XEEN: Fix giving temple blessings, display in char info
Commit: ed7505aae765f68216e769cd93689344b3372275
https://github.com/scummvm/scummvm/commit/ed7505aae765f68216e769cd93689344b3372275
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-25T22:07:17-04:00
Commit Message:
XEEN: Fix giving temple blessings, display in char info
Changed paths:
engines/xeen/dialogs/dialogs_char_info.cpp
engines/xeen/locations.cpp
diff --git a/engines/xeen/dialogs/dialogs_char_info.cpp b/engines/xeen/dialogs/dialogs_char_info.cpp
index 7285e4f..08b9aed 100644
--- a/engines/xeen/dialogs/dialogs_char_info.cpp
+++ b/engines/xeen/dialogs/dialogs_char_info.cpp
@@ -522,14 +522,22 @@ bool CharacterInfo::expandStat(int attrib, const Character &c) {
++total;
}
- if (party._blessed)
+ if (party._blessed) {
lines[16] = Common::String::format(Res.BLESSED, party._blessed);
- if (party._powerShield)
+ ++total;
+ }
+ if (party._powerShield) {
lines[17] = Common::String::format(Res.POWER_SHIELD, party._powerShield);
- if (party._holyBonus)
+ ++total;
+ }
+ if (party._holyBonus) {
lines[18] = Common::String::format(Res.HOLY_BONUS, party._holyBonus);
- if (party._heroism)
+ ++total;
+ }
+ if (party._heroism) {
lines[19] = Common::String::format(Res.HEROISM, party._heroism);
+ ++total;
+ }
msg = Common::String::format("\x2\x3""c%s\x3l%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\x1",
Res.CONSUMABLE_NAMES[3], lines[0].c_str(), lines[1].c_str(),
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index b81c87e..df28f0c 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -907,9 +907,9 @@ Character *TempleLocation::doOptions(Character *c) {
if (_donation && party.subtract(CONS_GOLD, _donation, WHERE_PARTY, WT_LOC_WAIT)) {
sound.stopSound();
sound.playSound("coina.voc", 1);
- _dayOfWeek = (_dayOfWeek + 1) / 10;
+ _dayOfWeek = (_dayOfWeek + 1) % 10;
- if (_dayOfWeek == (party._day / 10)) {
+ if (_dayOfWeek == (party._day % 10)) {
party._clairvoyanceActive = true;
party._lightCount = 1;
More information about the Scummvm-git-logs
mailing list