[Planeshift-cvs] CVS: planeshift/src/server progressionmanager.cpp,1.61,1.62

[Ondrej H. <tan...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32286/src/server

Modified Files:
	progressionmanager.cpp 
Log Message:
- ProgressionManager now calls gemActor::DoDamage() instead of psCharacter::AdjustHitPoints()


Index: progressionmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/progressionmanager.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** progressionmanager.cpp	31 Mar 2004 16:32:19 -0000	1.61
--- progressionmanager.cpp	2 Apr 2004 11:55:19 -0000	1.62
***************
*** 819,827 ****
          
          psCharacter * character;
  
          if (aimIsActor)
!             character = actor->GetCharacterData();
          else
!             character = target->GetCharacterData();
              
          if (!character)
--- 819,829 ----
          
          psCharacter * character;
+         gemObject * object;
  
          if (aimIsActor)
!             object = actor;
          else
!             object = target;
!         character = object->GetCharacterData();
              
          if (!character)
***************
*** 843,857 ****
              else
              {
!                 if (setValue)
                  {
!                     result = adjustValue;
!                     character->SetHitPoints(adjustValue);
                  }
-                 else
-                     result = character->AdjustHitPoints(adjustValue);
              }
-         
-             if (target->GetActorPtr())
-                 target->GetActorPtr()->DoDamage(actor,0);
              break;
          case MANA:
--- 845,860 ----
              else
              {
!                 gemActor * objectAsActor = dynamic_cast <gemActor*> (object);
!                 if (objectAsActor != NULL)
                  {
!                     if (setValue)
!                     {
!                         result = adjustValue;
!                         objectAsActor->DoDamage(actor, character->GetHP()-adjustValue);
!                     }
!                     else
!                         objectAsActor->DoDamage(actor, -adjustValue);
                  }
              }
              break;
          case MANA: