[Gemrb-commits] gemrb: branch master updated. v0.6.2-1309-g54f5166

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  54f516686f27e817d0fe6f0618046639af19f8c5 (commit)

Summary of changes:
 gemrb/plugins/FXOpcodes/FXOpcodes.cpp |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
      from  5f1c7edf6059336e44e2366b449d29c3c0df03b5 (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=54f516686f27e817d0fe6f0618046639af19f8c5

commit 54f516686f27e817d0fe6f0618046639af19f8c5
Author: Jaka Kranjc <lyn...@us...>
Date:   Fri Jun 24 21:50:40 2011 +0200

    run the pcf for bounce effects or the underlay doesn't get shown
    broken since ca18cbf6d8792fdc1a034e9514f2689ad9bb0a44

diff --git a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp
index 256eecf..cd540fc 100644
--- a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp
+++ b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp
@@ -4796,7 +4796,7 @@ int fx_familiar_marker (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 int fx_bounce_projectile (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 {
 	if (0) print( "fx_bounce_projectile (%2d): Type: %d\n", fx->Opcode, fx->Parameter2 );
-	STAT_BIT_OR( IE_BOUNCE, BNC_PROJECTILE );
+	STAT_BIT_OR_PCF( IE_BOUNCE, BNC_PROJECTILE );
 	return FX_APPLIED;
 }
 
@@ -4804,7 +4804,7 @@ int fx_bounce_projectile (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 int fx_bounce_opcode (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 {
 	if (0) print( "fx_bounce_opcode (%2d): Type: %d\n", fx->Opcode, fx->Parameter2 );
-	STAT_BIT_OR( IE_BOUNCE, BNC_OPCODE );
+	STAT_BIT_OR_PCF( IE_BOUNCE, BNC_OPCODE );
 	target->AddPortraitIcon(PI_BOUNCE2);
 	return FX_APPLIED;
 }
@@ -4813,7 +4813,7 @@ int fx_bounce_opcode (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 int fx_bounce_spelllevel (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 {
 	if (0) print( "fx_bounce_spellevel (%2d): Type: %d\n", fx->Opcode, fx->Parameter2 );
-	STAT_BIT_OR( IE_BOUNCE, BNC_LEVEL );
+	STAT_BIT_OR_PCF( IE_BOUNCE, BNC_LEVEL );
 	target->AddPortraitIcon(PI_BOUNCE2);
 	return FX_APPLIED;
 }
@@ -4822,7 +4822,7 @@ int fx_bounce_spelllevel (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 int fx_bounce_spelllevel_dec (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 {
 	if (0) print( "fx_bounce_spellevel_dec (%2d): Type: %d\n", fx->Opcode, fx->Parameter2 );
-	STAT_BIT_OR( IE_BOUNCE, BNC_LEVEL_DEC );
+	STAT_BIT_OR_PCF( IE_BOUNCE, BNC_LEVEL_DEC );
 	target->AddPortraitIcon(PI_BOUNCE);
 	return FX_APPLIED;
 }
@@ -4840,7 +4840,7 @@ int fx_protection_spelllevel_dec (Scriptable* /*Owner*/, Actor* target, Effect*
 int fx_bounce_school (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 {
 	if (0) print( "fx_bounce_school (%2d): Type: %d\n", fx->Opcode, fx->Parameter2 );
-	STAT_BIT_OR( IE_BOUNCE, BNC_SCHOOL );
+	STAT_BIT_OR_PCF( IE_BOUNCE, BNC_SCHOOL );
 	target->AddPortraitIcon(PI_BOUNCE2);
 	return FX_APPLIED;
 }
@@ -4849,7 +4849,7 @@ int fx_bounce_school (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 int fx_bounce_secondary_type (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 {
 	if (0) print( "fx_bounce_secondary_type (%2d): Type: %d\n", fx->Opcode, fx->Parameter2 );
-	STAT_BIT_OR( IE_BOUNCE, BNC_SECTYPE );
+	STAT_BIT_OR_PCF( IE_BOUNCE, BNC_SECTYPE );
 	target->AddPortraitIcon(PI_BOUNCE2);
 	return FX_APPLIED;
 }
@@ -4898,7 +4898,7 @@ int fx_resist_spell_dec (Scriptable* /*Owner*/, Actor* target, Effect *fx)
 int fx_bounce_spell (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 {
 	if (0) print( "fx_bounce_spell (%2d): Type: %d\n", fx->Opcode, fx->Parameter2 );
-	STAT_BIT_OR( IE_BOUNCE, BNC_RESOURCE );
+	STAT_BIT_OR_PCF( IE_BOUNCE, BNC_RESOURCE );
 	return FX_APPLIED;
 }
 
@@ -4906,7 +4906,7 @@ int fx_bounce_spell (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 int fx_bounce_spell_dec (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 {
 	if (0) print( "fx_bounce_spell (%2d): Type: %d\n", fx->Opcode, fx->Parameter2 );
-	STAT_BIT_OR( IE_BOUNCE, BNC_RESOURCE_DEC );
+	STAT_BIT_OR_PCF( IE_BOUNCE, BNC_RESOURCE_DEC );
 	return FX_APPLIED;
 }
 
@@ -5273,7 +5273,7 @@ int fx_protection_secondary_type_dec (Scriptable* /*Owner*/, Actor* target, Effe
 int fx_bounce_school_dec (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 {
 	if (0) print( "fx_bounce_school_dec (%2d): Type: %d\n", fx->Opcode, fx->Parameter2 );
-	STAT_BIT_OR( IE_BOUNCE, BNC_SCHOOL_DEC );
+	STAT_BIT_OR_PCF( IE_BOUNCE, BNC_SCHOOL_DEC );
 	target->AddPortraitIcon(PI_BOUNCE2);
 	return FX_APPLIED;
 }
@@ -5282,7 +5282,7 @@ int fx_bounce_school_dec (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 int fx_bounce_secondary_type_dec (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 {
 	if (0) print( "fx_bounce_secondary_type_dec (%2d): Type: %d\n", fx->Opcode, fx->Parameter2 );
-	STAT_BIT_OR( IE_BOUNCE, BNC_SECTYPE_DEC );
+	STAT_BIT_OR_PCF( IE_BOUNCE, BNC_SECTYPE_DEC );
 	target->AddPortraitIcon(PI_BOUNCE2);
 	return FX_APPLIED;
 }

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


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