[Planeshift-cvs] CVS: planeshift/src/common/net messages.h,1.102,1.103 messages.cpp,1.102,1.103

[Keith F. <ven...@us...>]

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

Modified Files:
	messages.h messages.cpp 
Log Message:
Committing patch by Kronon for /clear command and for /advisor and 
/advice commands.  Not tested yet but will test after resynching with
new CS cvs.

Index: messages.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.h,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** messages.h	18 Oct 2003 21:25:38 -0000	1.102
--- messages.h	20 Oct 2003 22:52:33 -0000	1.103
***************
*** 41,44 ****
--- 41,45 ----
  struct iSector;
  
+ 
  #define MSGTYPECHARINFO       0x0001
  #define MSGTYPEAUTHENTICATE   0x0002
***************
*** 244,248 ****
      CHAT_ME =       7,
      CHAT_TELLSELF = 8,
!     CHAT_REPORT =   9
  };
  
--- 245,251 ----
      CHAT_ME =       7,
      CHAT_TELLSELF = 8,
!     CHAT_REPORT =   9,
!     CHAT_ADVISOR = 10,
!     CHAT_ADVICE = 11
  };
  
***************
*** 1132,1137 ****
  };
  
- 
  #endif
  
  
--- 1135,1140 ----
  };
  
  #endif
+ 
  
  

Index: messages.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/net/messages.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** messages.cpp	18 Oct 2003 21:25:38 -0000	1.102
--- messages.cpp	20 Oct 2003 22:52:33 -0000	1.103
***************
*** 567,572 ****
                command == "/starttrading" ||
                command == "/stoptrading" ||
!               command == "/admin" )
      {
          valid = true;
      }
--- 567,577 ----
                command == "/starttrading" ||
                command == "/stoptrading" ||
!               command == "/admin")
!     {
!         valid = true;
!     }
!     else if (command == "/advisor" || command == "/advice")
      {
+         filter = cmd;
          valid = true;
      }
***************
*** 586,590 ****
          dice = atoi(temp.GetData());
         
!         size_t where;	
          for (where=1; where < temp.Length(); where++)
          {
--- 591,595 ----
          dice = atoi(temp.GetData());
         
!         size_t where;
          for (where=1; where < temp.Length(); where++)
          {
***************
*** 1781,1782 ****
--- 1786,1788 ----
  
  //--------------------------------------------------------------------------
+