[Gemrb-commits] SF.net SVN: gemrb:[7242] gemrb/trunk/gemrb

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

Revision: 7242
          http://gemrb.svn.sourceforge.net/gemrb/?rev=7242&view=rev
Author:   lynxlupodian
Date:     2009-09-21 19:51:20 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
added a gameflag for selective magic resistance (so that eg. healing can ignore it)

Modified Paths:
--------------
    gemrb/trunk/gemrb/includes/globals.h
    gemrb/trunk/gemrb/override/bg2/gemrb.ini
    gemrb/trunk/gemrb/override/how/gemrb.ini
    gemrb/trunk/gemrb/override/iwd2/gemrb.ini
    gemrb/trunk/gemrb/plugins/Core/Interface.cpp

Modified: gemrb/trunk/gemrb/includes/globals.h
===================================================================
--- gemrb/trunk/gemrb/includes/globals.h	2009-09-21 18:36:21 UTC (rev 7241)
+++ gemrb/trunk/gemrb/includes/globals.h	2009-09-21 19:51:20 UTC (rev 7242)
@@ -134,8 +134,9 @@
 #define  GF_BREAKABLE_WEAPONS     	37 //bg1, not bg2 and iwd2, maybe others
 #define  GF_3ED_RULES              	38 //iwd2
 #define  GF_LEVELSLOT_PER_CLASS    	39 //iwd2
+#define  GF_SELECTIVE_MAGIC_RES    	40 //bg2, iwd2, (how)
 //update this
-#define GF_COUNT 40
+#define GF_COUNT 41
 
 //the number of item usage fields (used in CREItem and STOItem)
 #define CHARGE_COUNTERS  3

Modified: gemrb/trunk/gemrb/override/bg2/gemrb.ini
===================================================================
--- gemrb/trunk/gemrb/override/bg2/gemrb.ini	2009-09-21 18:36:21 UTC (rev 7241)
+++ gemrb/trunk/gemrb/override/bg2/gemrb.ini	2009-09-21 19:51:20 UTC (rev 7242)
@@ -79,3 +79,4 @@
 SpellBookIconHack = 1
 DeathOnZeroStat = 1
 BreakableWeapons = 0
+SelectiveMagicRes = 1

Modified: gemrb/trunk/gemrb/override/how/gemrb.ini
===================================================================
--- gemrb/trunk/gemrb/override/how/gemrb.ini	2009-09-21 18:36:21 UTC (rev 7241)
+++ gemrb/trunk/gemrb/override/how/gemrb.ini	2009-09-21 19:51:20 UTC (rev 7242)
@@ -78,6 +78,7 @@
 MagicBit = 1
 SpawnIni = 1
 IWDDeathVarFormat = 1
+SelectiveMagicRes = 1
 
 [charset]
 CharCount = 31

Modified: gemrb/trunk/gemrb/override/iwd2/gemrb.ini
===================================================================
--- gemrb/trunk/gemrb/override/iwd2/gemrb.ini	2009-09-21 18:36:21 UTC (rev 7241)
+++ gemrb/trunk/gemrb/override/iwd2/gemrb.ini	2009-09-21 19:51:20 UTC (rev 7242)
@@ -84,3 +84,4 @@
 BreakableWeapons = 0
 3EdRules = 1
 LevelslotPerClass = 1
+SelectiveMagicRes = 1

Modified: gemrb/trunk/gemrb/plugins/Core/Interface.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Interface.cpp	2009-09-21 18:36:21 UTC (rev 7241)
+++ gemrb/trunk/gemrb/plugins/Core/Interface.cpp	2009-09-21 19:51:20 UTC (rev 7242)
@@ -2223,6 +2223,7 @@
 		"BreakableWeapons",   //37GF_BREAKABLE_WEAPONS
 		"3EdRules",           //38GF_3ED_RULES
 		"LevelslotPerClass",  //39GF_LEVELSLOT_PER_CLASS
+		"SelectiveMagicRes",  //40GF_SELECTIVE_MAGIC_RES
 		NULL                  //for our own safety, this marks the end of the pole
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.