[Gemrb-commits] gemrb: branch master updated. v0.7.0-633-g98d57ff

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  98d57ff62223c6b6b7d478c1288ea71d4bd9c2d1 (commit)

Summary of changes:
 gemrb/core/Interface.cpp |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
      from  0b80c63655f67e1f4ce92de40609ab01e6f6106e (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=98d57ff62223c6b6b7d478c1288ea71d4bd9c2d1

commit 98d57ff62223c6b6b7d478c1288ea71d4bd9c2d1
Author: Avenger <ave...@so...>
Date:   Sun Apr 8 16:53:42 2012 +0200

    limit only sex_summon/sex_summon_demon/sex_both

diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index 19419e8..bca897b 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -2777,10 +2777,17 @@ Actor *Interface::SummonCreature(const ieResRef resource, const ieResRef vvcres,
 		}
 		ieDword sex = ab->GetStat(IE_SEX);
 		//TODO: make this external
-		int limit = 5;
-		if (sex==SEX_BOTH) limit = 1;  //summoned deva
+		int limit = 0;
+		switch (sex) {
+		case SEX_SUMMON: case SEX_SUMMON_DEMON:
+			limit = 5;
+			break;
+		case SEX_BOTH:
+			limit = 1;
+			break;
+		}
 
-		if (eamod && map->CountSummons(GA_NO_DEAD, sex)>=limit) {
+		if (limit && eamod && map->CountSummons(GA_NO_DEAD, sex)>=limit) {
 			//summoning limit reached
 			displaymsg->DisplayConstantString(STR_SUMMONINGLIMIT, DMC_WHITE);
 			delete tmp;

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


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