[ogs-changes] dist/c++/test CreatureTest.cpp,1.1,1.2

[<ele...@us...>]

Update of /cvsroot/ogs/dist/c++/test
In directory sc8-pr-cvs1:/tmp/cvs-serv22457/c++/test

Modified Files:
	CreatureTest.cpp 
Log Message:
See C++ ChangeLog (Apr 19) for details.


Index: CreatureTest.cpp
===================================================================
RCS file: /cvsroot/ogs/dist/c++/test/CreatureTest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CreatureTest.cpp	15 Apr 2003 16:58:52 -0000	1.1
--- CreatureTest.cpp	19 Apr 2003 18:37:41 -0000	1.2
***************
*** 36,39 ****
--- 36,40 ----
  using std::cout;
  using std::endl;
+ using std::showpos;
  
  using namespace ogs::core;
***************
*** 60,64 ****
    ostr << "d" << die.getSides ();
    if (die.getModifier () != 0) {
!     ostr << std::showpos << die.getModifier ();
    }
    return (ostr.str ());
--- 61,65 ----
    ostr << "d" << die.getSides ();
    if (die.getModifier () != 0) {
!     ostr << showpos << die.getModifier ();
    }
    return (ostr.str ());
***************
*** 88,92 ****
    Abilities::Iterator itor = abilities.getBegin ();
  
-   cout << "Abilities: ";
    while (itor != abilities.getEnd ()) {
      Abilities::Value& value = *itor++;
--- 89,92 ----
***************
*** 101,105 ****
    }
  
!   cout << endl;
  }
  
--- 101,105 ----
    }
  
!   cout << "." << endl;
  }
  
***************
*** 176,181 ****
      SkillPtr skillPtr = *itor++;
  
!     cout << getSkillName (skillPtr->getType ()) << " ("
!          << (skillPtr->getModifiers ()).getValue () << ")";
  
      if (itor != skills.end ()) {
--- 176,181 ----
      SkillPtr skillPtr = *itor++;
  
!     cout << getSkillName (skillPtr->getType ()) << " "
!          << (skillPtr->getModifiers ()).getValue ();
  
      if (itor != skills.end ()) {
***************
*** 236,249 ****
  
    cout << "Size: " << char ((creature.getSize ()).getType ()) << endl;
!   cout << "Hit Dice: " << formatDieNotation (creature.getHitDice ())
!        << endl;
!   cout << "Initiative: " << (creature.getInitiative ()).getValue ()
         << endl;
-   cout << "Defense: " << (creature.getDefense ()).getValue () << endl;
  
    const Saves& saves = creature.getSaves ();
!   cout << "Saves: Fort " << saves.fort.getValue () << ", "
         << "Ref " << saves.ref.getValue () << ", "
!        << "Will " << saves.will.getValue () << endl;
    printAbilities (creature.getAbilities ());
  
--- 236,255 ----
  
    cout << "Size: " << char ((creature.getSize ()).getType ()) << endl;
! 
!   cout << "HD " << formatDieNotation (creature.getHitDice ())
!        << "; ";
!   Entity::Health health = creature.getHealth ();
!   cout << "hp " << std::noshowpos << health.first << "/"
!        << health.second << "; ";
! 
!   cout << "Init " << showpos << (creature.getInitiative ()).getValue ()
!        << "; ";
!   cout << "AC " << (creature.getDefense ()).getValue ()
         << endl;
  
    const Saves& saves = creature.getSaves ();
!   cout << "SV Fort " << saves.fort.getValue () << ", "
         << "Ref " << saves.ref.getValue () << ", "
!        << "Will " << saves.will.getValue () << "; ";
    printAbilities (creature.getAbilities ());