[Gemrb-commits] gemrb: branch master updated. v0.6.2-858-gc670378

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  c67037836cd8f6343574d7b0405b6079079c262e (commit)

Summary of changes:
 gemrb/override/bg1/effects.ids        |    2 +-
 gemrb/plugins/FXOpcodes/FXOpcodes.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
      from  0e9d264691814f96d18d8c177b1d018445066419 (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=c67037836cd8f6343574d7b0405b6079079c262e

commit c67037836cd8f6343574d7b0405b6079079c262e
Author: Jaka Kranjc <lyn...@us...>
Date:   Sat Mar 5 21:54:24 2011 +0100

    complete the SummonDisable/AvatarRemoval swap in bg1/bg2

diff --git a/gemrb/override/bg1/effects.ids b/gemrb/override/bg1/effects.ids
index c62343b..e122471 100644
--- a/gemrb/override/bg1/effects.ids
+++ b/gemrb/override/bg1/effects.ids
@@ -270,7 +270,7 @@ IDS
 0x10c	ExploreModifier
 0x10d	ScreenShake
 0x10e	Cure:CasterHold
-0x10f	AvatarRemoval
+0x10f	SummonDisable
 0x110	ApplyEffectRepeat
 0x111	RemoveProjectile
 0x112	TeleportToTarget
diff --git a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp
index 195946d..586d5e4 100644
--- a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp
+++ b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp
@@ -441,7 +441,7 @@ static EffectDesc effectnames[] = {
 	{ "AttackSpeedModifier", fx_attackspeed_modifier, 0, -1 },
 	{ "AttacksPerRoundModifier", fx_attacks_per_round_modifier, 0, -1 },
 	{ "AuraCleansingModifier", fx_auracleansing_modifier, 0, -1 },
-	{ "AvatarRemoval", fx_avatar_removal, 0, -1 }, //unknown
+	{ "SummonDisable", fx_avatar_removal, 0, -1 }, //unknown
 	{ "AvatarRemovalModifier", fx_avatar_removal_modifier, 0, -1 },
 	{ "BackstabModifier", fx_backstab_modifier, 0, -1 },
 	{ "BerserkStage1Modifier", fx_berserkstage1_modifier, 0, -1 },

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


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