From: <ave...@us...> - 2009-05-13 22:08:57
|
Revision: 5960 http://gemrb.svn.sourceforge.net/gemrb/?rev=5960&view=rev Author: avenger_teambg Date: 2009-05-13 22:08:40 +0000 (Wed, 13 May 2009) Log Message: ----------- removed a recent change from GemRB.GetMemorizedSpellsCount because it broke spell scrolling (the parameter is already a bitfield, when there is no level given) changed the conditions when a travel animation is mirrored for a projectile Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py gemrb/trunk/gemrb/plugins/Core/Projectile.cpp gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2009-05-13 20:24:39 UTC (rev 5959) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2009-05-13 22:08:40 UTC (rev 5960) @@ -355,6 +355,8 @@ pc = GemRB.GameGetFirstSelectedPC () TopIndex = GemRB.GetVar ("TopIndex") Type = GemRB.GetVar ("Type") + #Type is a bitfield if there is no level given + #This is to make sure cleric/mages get all spells listed Max = GemRB.GetMemorizedSpellsCount(pc, Type) TopIndex += 10 if TopIndex > Max - 10: @@ -362,7 +364,6 @@ TopIndex = Max-10 else: TopIndex = 0 - GemRB.SetVar ("TopIndex", TopIndex) UpdateActionsWindow () return Modified: gemrb/trunk/gemrb/plugins/Core/Projectile.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Projectile.cpp 2009-05-13 20:24:39 UTC (rev 5959) +++ gemrb/trunk/gemrb/plugins/Core/Projectile.cpp 2009-05-13 22:08:40 UTC (rev 5960) @@ -139,7 +139,8 @@ break; } Animation* a = af->GetCycle( c ); - if (a && c!=Cycle) { + //if (a && c!=Cycle) { + if (a && Cycle>=Aim) { a->MirrorAnimation(); } a->gameAnimation = true; Modified: gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp 2009-05-13 20:24:39 UTC (rev 5959) +++ gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp 2009-05-13 22:08:40 UTC (rev 5960) @@ -6388,7 +6388,7 @@ } if (Level<0) { - return PyInt_FromLong( actor->spellbook.GetSpellInfoSize( 1<<SpellType ) ); + return PyInt_FromLong( actor->spellbook.GetSpellInfoSize( SpellType ) ); } else { return PyInt_FromLong( actor->spellbook.GetMemorizedSpellsCount( SpellType, Level ) ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |