[Planeshift-cvs] CVS: planeshift/src/client/gui chatwindow.cpp, 1.129, 1.130 pawscharcreatemain.cpp, 1.93, 1.94 pawsguildwindow.cpp, 1.58, 1.59

[Borrillis <bor...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19183/src/client/gui

Modified Files:
	chatwindow.cpp pawscharcreatemain.cpp pawsguildwindow.cpp 
Log Message:
- Fix for killstealing from magic users : a successful cast now adds the attacker to the DamageHistory of the target. [Bug #183]

Index: chatwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/chatwindow.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** chatwindow.cpp	31 Oct 2006 15:52:19 -0000	1.129
--- chatwindow.cpp	13 Nov 2006 21:37:09 -0000	1.130
***************
*** 94,97 ****
--- 94,100 ----
  pawsChatWindow::~pawsChatWindow()
  {
+     msgqueue->Unsubscribe(this, MSGTYPE_CHAT);
+     msgqueue->Unsubscribe(this, MSGTYPE_SYSTEM);
+ 
      delete chatHistory;
      for (int i = 0; i < CHAT_NLOG; i++)

Index: pawscharcreatemain.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharcreatemain.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** pawscharcreatemain.cpp	5 Jul 2006 19:54:15 -0000	1.93
--- pawscharcreatemain.cpp	13 Nov 2006 21:37:09 -0000	1.94
***************
*** 723,731 ****
  
          
!         if ( widget->GetID() == PSCHARACTER_RACE_KRAN )
!         {
!             SelectGender(PSCHARACTER_GENDER_NONE);
!         }
!         else if ( lastRaceID == -1 || lastRaceID == PSCHARACTER_RACE_KRAN )
          {
              if ( lastGender == PSCHARACTER_GENDER_MALE )
--- 723,732 ----
  
          
!         //if ( widget->GetID() == PSPLAYERCHAR_RACE_KRAN )
!         //{
!         //    SelectGender(PSCHARACTER_GENDER_NONE);
!         //}
!         //else if ( lastRaceID == -1 || lastRaceID == PSPLAYERCHAR_RACE_KRAN )
!         if ( lastRaceID == -1 )
          {
              if ( lastGender == PSCHARACTER_GENDER_MALE )
***************
*** 748,751 ****
--- 749,753 ----
              else if (createManager->IsAvailable(widget->GetID(),PSCHARACTER_GENDER_MALE))
                  SelectGender(PSCHARACTER_GENDER_MALE);
+             else SelectGender( PSCHARACTER_GENDER_NONE );
                  
              lastGender = currentGender;                
***************
*** 807,821 ****
      {
          case MALE_BUTTON:
!             if ( createManager->GetSelectedRace() == PSCHARACTER_RACE_KRAN )
                  SelectGender(PSCHARACTER_GENDER_NONE);
              else
                  SelectGender(PSCHARACTER_GENDER_MALE);
              return true;            
          case FEMALE_BUTTON:
!             if ( createManager->GetSelectedRace() == PSCHARACTER_RACE_KRAN )
                  SelectGender(PSCHARACTER_GENDER_NONE);
              else
                  SelectGender(PSCHARACTER_GENDER_FEMALE);
!             return true;       
          case BACK_BUTTON:
          {
--- 809,834 ----
      {
          case MALE_BUTTON:
!             if ( !createManager->IsAvailable( widget->GetID(), PSCHARACTER_GENDER_MALE ) )
                  SelectGender(PSCHARACTER_GENDER_NONE);
              else
                  SelectGender(PSCHARACTER_GENDER_MALE);
              return true;            
+ 
+             //if ( createManager->GetSelectedRace() == PSPLAYERCHAR_RACE_KRAN )
+             //    SelectGender(PSCHARACTER_GENDER_NONE);
+             //else
+             //    SelectGender(PSCHARACTER_GENDER_MALE);
+             //return true;            
          case FEMALE_BUTTON:
!             if ( !createManager->IsAvailable( widget->GetID(), PSCHARACTER_GENDER_FEMALE ) )
                  SelectGender(PSCHARACTER_GENDER_NONE);
              else
                  SelectGender(PSCHARACTER_GENDER_FEMALE);
!             return true;            
!             //if ( createManager->GetSelectedRace() == PSPLAYERCHAR_RACE_KRAN )
!             //    SelectGender(PSCHARACTER_GENDER_NONE);
!             //else
!             //    SelectGender(PSCHARACTER_GENDER_FEMALE);
!             //return true;       
          case BACK_BUTTON:
          {
***************
*** 992,996 ****
          
      // KRAN has no gender
!     if ( id ==  PSCHARACTER_RACE_KRAN )
      {
          lastGender = createManager->GetSelectedGender();            
--- 1005,1010 ----
          
      // KRAN has no gender
!     //if ( id ==  PSCHARACTER_RACE_KRAN )
!     if ( !createManager->IsAvailable( id, PSCHARACTER_GENDER_MALE ) && !createManager->IsAvailable( id, PSCHARACTER_GENDER_FEMALE ) )
      {
          lastGender = createManager->GetSelectedGender();            

Index: pawsguildwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsguildwindow.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** pawsguildwindow.cpp	22 Feb 2006 22:19:42 -0000	1.58
--- pawsguildwindow.cpp	13 Nov 2006 21:37:09 -0000	1.59
***************
*** 165,169 ****
  pawsGuildWindow::~pawsGuildWindow()
  {
!     
  }
  
--- 165,170 ----
  pawsGuildWindow::~pawsGuildWindow()
  {
!     msgHandler->Unsubscribe( this, MSGTYPE_GUIGUILD );
!     msgHandler->Unsubscribe( this, MSGTYPE_MOTD );
  }