[Planeshift-cvs] CVS: planeshift/src/common/net messages.cpp,1.301,1.302 messages.h,1.302,1.303

[Arianna B. <ar...@us...>]

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

Modified Files:
	messages.cpp messages.h 
Log Message:
Remove fly, several fixes in skillwindow

Index: messages.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.cpp,v
retrieving revision 1.301
retrieving revision 1.302
diff -C2 -d -r1.301 -r1.302
*** messages.cpp	12 Oct 2005 09:01:30 -0000	1.301
--- messages.cpp	12 Oct 2005 20:28:32 -0000	1.302
***************
*** 2435,2439 ****
  									  float apTtl,
                                        bool openWin,
!                                       int32_t focus, 
  									  bool isTraining)
  {
--- 2435,2440 ----
  									  float apTtl,
                                        bool openWin,
!                                       int32_t focus,
! 									  int32_t selSkillCat,
  									  bool isTraining)
  {
***************
*** 2459,2462 ****
--- 2460,2464 ----
                          sizeof(bool) +
                          sizeof(focus)+
+ 						sizeof(selSkillCat)+
  						sizeof(bool)
  						);
***************
*** 2486,2489 ****
--- 2488,2492 ----
      msg->Add( openWin );
      msg->Add( focus );
+ 	msg->Add( selSkillCat );
  	msg->Add( isTraining );
  
***************
*** 2522,2525 ****
--- 2525,2529 ----
          openWindow = message->GetBool();
          focusSkill = message->GetInt32();
+ 		skillCat = message->GetInt32();
  		trainingWindow = message->GetBool();
  	}

Index: messages.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.h,v
retrieving revision 1.302
retrieving revision 1.303
diff -C2 -d -r1.302 -r1.303
*** messages.h	12 Oct 2005 09:01:30 -0000	1.302
--- messages.h	12 Oct 2005 20:28:32 -0000	1.303
***************
*** 1646,1650 ****
  						float apTtl,
                          bool open,
!                         int32_t focus, 
  						bool isTraining);
  
--- 1646,1651 ----
  						float apTtl,
                          bool open,
!                         int32_t focus,
! 						int32_t selSkillCat,
  						bool isTraining);
  
***************
*** 1674,1677 ****
--- 1675,1679 ----
      bool openWindow;
      int32_t focusSkill;
+ 	int32_t skillCat;
  	bool trainingWindow; //Are we training or not?
  };