decaldev-cvscommit

[<ec...@us...>]

Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv2330

Modified Files:
	CharacterStats.cpp 
Log Message:
fixed the bug(s) that resulted in coordination and quickness being switched around

Index: CharacterStats.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CharacterStats.cpp	2 Aug 2002 00:38:33 -0000	1.22
--- CharacterStats.cpp	3 Aug 2002 23:12:21 -0000	1.23
***************
*** 383,388 ****
  					pMessage->get_Member(_variant_t ("currentStrength"), &G);		PrimStat[0] = G.lVal; CurStat[0] = G.lVal;
  					pMessage->get_Member(_variant_t ("currentEndurance"), &G);		PrimStat[1] = G.lVal; CurStat[1] = G.lVal;
! 					pMessage->get_Member(_variant_t ("currentCoordination"), &G);	PrimStat[2] = G.lVal; CurStat[2] = G.lVal;
! 					pMessage->get_Member(_variant_t ("currentQuickness"), &G);		PrimStat[3] = G.lVal; CurStat[3] = G.lVal;
  					pMessage->get_Member(_variant_t ("currentFocus"), &G);			PrimStat[4] = G.lVal; CurStat[4] = G.lVal;
  					pMessage->get_Member(_variant_t ("currentSelf"), &G);			PrimStat[5] = G.lVal; CurStat[5] = G.lVal;
--- 383,388 ----
  					pMessage->get_Member(_variant_t ("currentStrength"), &G);		PrimStat[0] = G.lVal; CurStat[0] = G.lVal;
  					pMessage->get_Member(_variant_t ("currentEndurance"), &G);		PrimStat[1] = G.lVal; CurStat[1] = G.lVal;
! 					pMessage->get_Member(_variant_t ("currentQuickness"), &G);		PrimStat[2] = G.lVal; CurStat[2] = G.lVal;
! 					pMessage->get_Member(_variant_t ("currentCoordination"), &G);	PrimStat[3] = G.lVal; CurStat[3] = G.lVal;
  					pMessage->get_Member(_variant_t ("currentFocus"), &G);			PrimStat[4] = G.lVal; CurStat[4] = G.lVal;
  					pMessage->get_Member(_variant_t ("currentSelf"), &G);			PrimStat[5] = G.lVal; CurStat[5] = G.lVal;
***************
*** 763,768 ****
  		{
  			tpench->dwAffected--;
- 			if (tpench->dwAffected == 3) tpench->dwAffected = 2;
- 			else if (tpench->dwAffected == 2) tpench->dwAffected = 3;
  
  			for (std::vector<cEnchantment *>::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
--- 763,766 ----
***************
*** 931,950 ****
  
  	if (SkillInfo[Skill].AttribA != eAttrNULL)
! 	{
! 		if(SkillInfo[Skill].AttribA==3)
! 			TPS += CurStat[3];
! 		else if(SkillInfo[Skill].AttribA==4)
! 			TPS += CurStat[2];
! 		else TPS += CurStat[SkillInfo[Skill].AttribA - 1];
! 	}
  
  	if (SkillInfo[Skill].AttribB != eAttrNULL)
! 	{
! 		if(SkillInfo[Skill].AttribB==3)
! 			TPS += CurStat[3];
! 		else if(SkillInfo[Skill].AttribB==4)
! 			TPS += CurStat[2];
! 		else TPS += CurStat[SkillInfo[Skill].AttribB - 1];
! 	}
  
  	TPS /= SkillInfo[Skill].Divider;
--- 929,936 ----
  
  	if (SkillInfo[Skill].AttribA != eAttrNULL)
! 		TPS += CurStat[SkillInfo[Skill].AttribA - 1];
  
  	if (SkillInfo[Skill].AttribB != eAttrNULL)
! 		TPS += CurStat[SkillInfo[Skill].AttribB - 1];
  
  	TPS /= SkillInfo[Skill].Divider;
***************
*** 1188,1194 ****
  		pAttrib->m_pInfo->m_szName = "Endurance";
  	else if (Index == 3)
- 		pAttrib->m_pInfo->m_szName = "Coordination";
- 	else if (Index == 4)
  		pAttrib->m_pInfo->m_szName = "Quickness";
  	else if (Index == 5)
  		pAttrib->m_pInfo->m_szName = "Focus";
--- 1174,1180 ----
  		pAttrib->m_pInfo->m_szName = "Endurance";
  	else if (Index == 3)
  		pAttrib->m_pInfo->m_szName = "Quickness";
+ 	else if (Index == 4)
+ 		pAttrib->m_pInfo->m_szName = "Coordination";
  	else if (Index == 5)
  		pAttrib->m_pInfo->m_szName = "Focus";