[Gemrb-commits] gemrb: branch master updated. v0.6.6-92-ga123d4d

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  a123d4d5e28fecbff93b906bca0478c1d964bf80 (commit)

Summary of changes:
 gemrb/core/Scriptable/Actor.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
      from  2fc32326cb4e6ec8f30112ee06f9a53292641bc5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=a123d4d5e28fecbff93b906bca0478c1d964bf80

commit a123d4d5e28fecbff93b906bca0478c1d964bf80
Author: Jaka Kranjc <lyn...@us...>
Date:   Sun Nov 6 18:11:36 2011 +0100

    always restore all spells if the rest was longer or equal to 8h

diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index cb0d911..c898e50 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -6478,7 +6478,7 @@ void Actor::Rest(int hours)
 {
 	// this is stored in reversed order (negative malus, positive bonus)
 	int fatigueBonus = - core->GetConstitutionBonus(STAT_CON_FATIGUE, Modified[IE_CON]);
-	if (hours) {
+	if (hours < 8) {
 		//do remove effects
 		int remaining = hours*10;
 		//removes hours*10 fatigue points

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator