[Gemrb-commits] SF.net SVN: gemrb: [5132] gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp

[<avenger_teambg@us...>]

Revision: 5132
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5132&view=rev
Author:   avenger_teambg
Date:     2008-04-11 09:24:34 -0700 (Fri, 11 Apr 2008)

Log Message:
-----------
fixed 2 more off by one errors in EffectQueue

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp

Modified: gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp	2008-04-01 07:56:44 UTC (rev 5131)
+++ gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp	2008-04-11 16:24:34 UTC (rev 5132)
@@ -101,7 +101,7 @@
 #define DURATION  2
 
 static const int fx_prepared[MAX_TIMING_MODE]={DURATION,PERMANENT,PERMANENT,DELAYED, //0-3
-DELAYED,DELAYED,DELAYED,DELAYED,PERMANENT,PERMANENT,PERMANENT};                //4-7
+DELAYED,DELAYED,DELAYED,DELAYED,PERMANENT,PERMANENT,PERMANENT};		//4-7
 
 inline int IsPrepared(ieByte timingmode)
 {
@@ -460,7 +460,8 @@
 
 	case FX_TARGET_PARTY:
 		game=core->GetGame();
-		for (i = game->GetPartySize(true); i >= 0; i--) {
+		i = game->GetPartySize(true);
+		while(i--) {
 			Actor* actor = game->GetPC( i, true );
 			fx->PosX=actor->Pos.x;
 			fx->PosY=actor->Pos.y;
@@ -474,7 +475,8 @@
 
 	case FX_TARGET_GLOBAL_INCL_PARTY:
 		map=self->GetCurrentArea();
-		for (i = map->GetActorCount(true)-1; i >= 0; i--) {
+		i= map->GetActorCount(true);
+		while(i--) {
 			Actor* actor = map->GetActor( i, true );
 			fx->PosX=actor->Pos.x;
 			fx->PosY=actor->Pos.y;
@@ -488,7 +490,8 @@
 
 	case FX_TARGET_GLOBAL_EXCL_PARTY:
 		map=self->GetCurrentArea();
-		for (i = map->GetActorCount(false); i >= 0; i--) {
+		i = map->GetActorCount(false);
+		while(i--) {
 			Actor* actor = map->GetActor( i, false );
 			fx->PosX=actor->Pos.x;
 			fx->PosY=actor->Pos.y;


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

[Gemrb-commits] SF.net SVN: gemrb: [4564] gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp

[<avenger_teambg@us...>]

Revision: 4564
          http://gemrb.svn.sourceforge.net/gemrb/?rev=4564&view=rev
Author:   avenger_teambg
Date:     2007-04-01 04:53:33 -0700 (Sun, 01 Apr 2007)

Log Message:
-----------
use level based effect resistance only if both fields are nonzero

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp

Modified: gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp	2007-03-31 09:26:23 UTC (rev 4563)
+++ gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp	2007-04-01 11:53:33 UTC (rev 4564)
@@ -427,7 +427,7 @@
 		return false;
 	}
 	ieDword level = (ieDword) target->GetXPLevel( true );
-	if ((fx->DiceSides != 0 || fx->DiceThrown != 0) && (level > fx->DiceSides || level < fx->DiceThrown)) {
+	if ((fx->DiceSides != 0 && fx->DiceThrown != 0) && (level > fx->DiceSides || level < fx->DiceThrown)) {
 		return true;
 	}
 	return false;
@@ -445,9 +445,9 @@
 }
 
 static EffectRef fx_level_immunity_ref={"Protection:Spelllevel",NULL,-1};
-static EffectRef fx_opcode_immunity_ref={"Protection:Opcode",NULL,-1};  //bg2
+static EffectRef fx_opcode_immunity_ref={"Protection:Opcode",NULL,-1}; //bg2
 static EffectRef fx_opcode_immunity2_ref={"Protection:Opcode2",NULL,-1};//iwd
-static EffectRef fx_spell_immunity_ref={"Protection:Spell",NULL,-1};  //bg2
+static EffectRef fx_spell_immunity_ref={"Protection:Spell",NULL,-1}; //bg2
 static EffectRef fx_spell_immunity2_ref={"Protection:Spell2",NULL,-1};//iwd
 static EffectRef fx_school_immunity_ref={"Protection:School",NULL,-1};
 static EffectRef fx_secondary_type_immunity_ref={"Protection:SecondaryType",NULL,-1};


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

[Gemrb-commits] SF.net SVN: gemrb: [4579] gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp

[<avenger_teambg@us...>]

Revision: 4579
          http://gemrb.svn.sourceforge.net/gemrb/?rev=4579&view=rev
Author:   avenger_teambg
Date:     2007-04-08 22:42:02 -0700 (Sun, 08 Apr 2007)

Log Message:
-----------
setting the effect coordinates to the current target coordinates, not
the source coordinates

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp

Modified: gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp	2007-04-08 08:42:18 UTC (rev 4578)
+++ gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp	2007-04-09 05:42:02 UTC (rev 4579)
@@ -430,8 +430,6 @@
 	for ( f = effects.begin(); f != effects.end(); f++ ) {
 		//handle resistances and saving throws here
 		(*f)->random_value = random_value;
-		(*f)->PosX = target->Pos.x;
-		(*f)->PosY = target->Pos.y;
 		//if applyeffect returns true, we stop adding the future effects
 		//this is to simulate iwd2's on the fly spell resistance
 		if(AddEffect(*f, Owner, target)) {		
@@ -655,6 +653,8 @@
 	ieDword GameTime = core->GetGame()->GameTime;
 
 	if (first_apply) {
+		fx->PosX = target->Pos.x;
+		fx->PosY = target->Pos.y;
 		//the effect didn't pass the probability check
 		if (!check_probability(fx) ) {
 			fx->TimingMode=FX_DURATION_JUST_EXPIRED;


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

[Gemrb-commits] SF.net SVN: gemrb: [4966] gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp

[<lynxlupodian@us...>]

Revision: 4966
          http://gemrb.svn.sourceforge.net/gemrb/?rev=4966&view=rev
Author:   lynxlupodian
Date:     2007-12-31 13:46:19 -0800 (Mon, 31 Dec 2007)

Log Message:
-----------
fixed off-by-one error in FX_TARGET_GLOBAL_INCL_PARTY loop (detect evil works)

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp

Modified: gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp	2007-12-31 19:33:58 UTC (rev 4965)
+++ gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp	2007-12-31 21:46:19 UTC (rev 4966)
@@ -474,7 +474,7 @@
 
 	case FX_TARGET_GLOBAL_INCL_PARTY:
 		map=self->GetCurrentArea();
-		for (i = map->GetActorCount(true); i >= 0; i--) {
+		for (i = map->GetActorCount(true)-1; i >= 0; i--) {
 			Actor* actor = map->GetActor( i, true );
 			fx->PosX=actor->Pos.x;
 			fx->PosY=actor->Pos.y;


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

[Gemrb-commits] SF.net SVN: gemrb: [5132] gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp

[<avenger_teambg@us...>]

Revision: 5132
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5132&view=rev
Author:   avenger_teambg
Date:     2008-04-11 09:24:34 -0700 (Fri, 11 Apr 2008)

Log Message:
-----------
fixed 2 more off by one errors in EffectQueue

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp

Modified: gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp	2008-04-01 07:56:44 UTC (rev 5131)
+++ gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp	2008-04-11 16:24:34 UTC (rev 5132)
@@ -101,7 +101,7 @@
 #define DURATION  2
 
 static const int fx_prepared[MAX_TIMING_MODE]={DURATION,PERMANENT,PERMANENT,DELAYED, //0-3
-DELAYED,DELAYED,DELAYED,DELAYED,PERMANENT,PERMANENT,PERMANENT};                //4-7
+DELAYED,DELAYED,DELAYED,DELAYED,PERMANENT,PERMANENT,PERMANENT};		//4-7
 
 inline int IsPrepared(ieByte timingmode)
 {
@@ -460,7 +460,8 @@
 
 	case FX_TARGET_PARTY:
 		game=core->GetGame();
-		for (i = game->GetPartySize(true); i >= 0; i--) {
+		i = game->GetPartySize(true);
+		while(i--) {
 			Actor* actor = game->GetPC( i, true );
 			fx->PosX=actor->Pos.x;
 			fx->PosY=actor->Pos.y;
@@ -474,7 +475,8 @@
 
 	case FX_TARGET_GLOBAL_INCL_PARTY:
 		map=self->GetCurrentArea();
-		for (i = map->GetActorCount(true)-1; i >= 0; i--) {
+		i= map->GetActorCount(true);
+		while(i--) {
 			Actor* actor = map->GetActor( i, true );
 			fx->PosX=actor->Pos.x;
 			fx->PosY=actor->Pos.y;
@@ -488,7 +490,8 @@
 
 	case FX_TARGET_GLOBAL_EXCL_PARTY:
 		map=self->GetCurrentArea();
-		for (i = map->GetActorCount(false); i >= 0; i--) {
+		i = map->GetActorCount(false);
+		while(i--) {
 			Actor* actor = map->GetActor( i, false );
 			fx->PosX=actor->Pos.x;
 			fx->PosY=actor->Pos.y;


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