[Decaldev-cvscommit] source/DecalFilters CharacterStats.cpp,1.34,1.35

[<kw...@us...>]

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

Modified Files:
	CharacterStats.cpp 
Log Message:
was advised to not alter how allegiance was done, so it's been reverted

Index: CharacterStats.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** CharacterStats.cpp	27 Oct 2002 00:23:57 -0000	1.34
--- CharacterStats.cpp	27 Oct 2002 01:06:13 -0000	1.35
***************
*** 638,656 ****
  						strcpy(tpai.Name, OLE2T(vName.bstrVal));
  
! 						if (tpai.TreeParent == 1)
  						{
- 							//Monarch
- 							memcpy(&Monarch, &tpai, sizeof(cAllegianceInfo));
- 						} else if (tpai.GUID == GUID) {
  							//Me
  							memcpy(&MyAlleg, &tpai, sizeof(cAllegianceInfo));
! 						} else if (tpai.TreeParent != GUID) {
! 							//Patron
! 							memcpy(&Patron, &tpai, sizeof(cAllegianceInfo));
! 						} else if (tpai.TreeParent == GUID)
! 						{
  							//Vassal
  							memcpy(&Vassals[VassalCount], &tpai, sizeof(cAllegianceInfo));
  							VassalCount++;
  						}
  					}
--- 638,655 ----
  						strcpy(tpai.Name, OLE2T(vName.bstrVal));
  
! 						if (tpai.GUID == GUID)
  						{
  							//Me
  							memcpy(&MyAlleg, &tpai, sizeof(cAllegianceInfo));
! 						} else if (tpai.TreeParent == 1) {
! 							//Monarch
! 							memcpy(&Monarch, &tpai, sizeof(cAllegianceInfo));
! 						} else if (tpai.TreeParent == GUID) {
  							//Vassal
  							memcpy(&Vassals[VassalCount], &tpai, sizeof(cAllegianceInfo));
  							VassalCount++;
+ 						} else {
+ 							//Patron
+ 							memcpy(&Patron, &tpai, sizeof(cAllegianceInfo));
  						}
  					}