[Planeshift-cvs] CVS: planeshift/src/server usermanager.cpp,1.60,1.61 psserverdr.cpp,1.33,1.34 psserverchar.cpp,1.63,1.64 psserver.cpp,1.102,1.103 psproxlist.cpp,1.3,1.4 pscelserver.cpp,1.146,1.147 pscel.cpp,1.16,1.17 adminmanager.cpp,1.32,1.33

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

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1:/tmp/cvs-serv14206

Modified Files:
	usermanager.cpp psserverdr.cpp psserverchar.cpp psserver.cpp 
	psproxlist.cpp pscelserver.cpp pscel.cpp adminmanager.cpp 
Log Message:
Edited PS to use the linmove class in CEL instead of the one in PS.
Removed the one in PS.

Index: usermanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/usermanager.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** usermanager.cpp	28 Jun 2003 22:08:24 -0000	1.60
--- usermanager.cpp	10 Jul 2003 05:21:45 -0000	1.61
***************
*** 21,25 ****
  #include "util/psconst.h"
  #include "engine/celbase.h"
! #include "psprop/pc/pspclinmove.h"
  #include "pscelserver.h"
  #include "engine/netpersist.h"
--- 21,25 ----
  #include "util/psconst.h"
  #include "engine/celbase.h"
! #include <propclass/linmove.h>
  #include "pscelserver.h"
  #include "engine/netpersist.h"

Index: psserverdr.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverdr.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** psserverdr.cpp	24 Apr 2003 07:03:11 -0000	1.33
--- psserverdr.cpp	10 Jul 2003 05:21:45 -0000	1.34
***************
*** 28,32 ****
  #include "engine/drmessage.h"
  #include "engine/netpersist.h"
! #include "psprop/pc/pspclinmove.h"
  
  #include "psserver.h"
--- 28,32 ----
  #include "engine/drmessage.h"
  #include "engine/netpersist.h"
! #include <propclass/linmove.h>
  
  #include "psserver.h"

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** psserverchar.cpp	8 Jul 2003 23:12:43 -0000	1.63
--- psserverchar.cpp	10 Jul 2003 05:21:45 -0000	1.64
***************
*** 29,33 ****
  #include "engine/celbase.h"
  #include "engine/drmessage.h"
! #include "psprop/pc/pspclinmove.h"
  #include "psprop/pc/pspcchar.h"
  #include "rpgrules/psrpginfo.h"
--- 29,33 ----
  #include "engine/celbase.h"
  #include "engine/drmessage.h"
! #include <propclass/linmove.h>
  #include "psprop/pc/pspcchar.h"
  #include "rpgrules/psrpginfo.h"

Index: psserver.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserver.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** psserver.cpp	9 Jul 2003 07:06:48 -0000	1.102
--- psserver.cpp	10 Jul 2003 05:21:45 -0000	1.103
***************
*** 52,56 ****
  #include "serverstatus.h"
  
! #include "psprop/pc/pspclinmove.h"
  #include "rpgrules/psrpginfo.h"
  
--- 52,56 ----
  #include "serverstatus.h"
  
! #include <propclass/linmove.h>
  #include "rpgrules/psrpginfo.h"
  

Index: psproxlist.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psproxlist.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** psproxlist.cpp	26 Jun 2003 17:32:17 -0000	1.3
--- psproxlist.cpp	10 Jul 2003 05:21:45 -0000	1.4
***************
*** 43,47 ****
  
  // PS Includes
! #include "psprop/pc/pspclinmove.h"
  #include "util/log.h"
  #include "psproxlist.h"
--- 43,47 ----
  
  // PS Includes
! #include <propclass/linmove.h>
  #include "util/log.h"
  #include "psproxlist.h"

Index: pscelserver.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/pscelserver.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** pscelserver.cpp	9 Jul 2003 07:06:49 -0000	1.146
--- pscelserver.cpp	10 Jul 2003 05:21:45 -0000	1.147
***************
*** 70,74 ****
  #include "npcmanager.h"
  
! #include "psprop/pc/pspclinmove.h"
  #include "psprop/pc/pspcchar.h"
  #include "psprop/pc/pspcnpcdialog.h"
--- 70,74 ----
  #include "npcmanager.h"
  
! #include <propclass/linmove.h>
  #include "psprop/pc/pspcchar.h"
  #include "psprop/pc/pspcnpcdialog.h"

Index: pscel.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/pscel.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** pscel.cpp	9 Jul 2003 07:06:49 -0000	1.16
--- pscel.cpp	10 Jul 2003 05:21:45 -0000	1.17
***************
*** 72,76 ****
  #include "rpgrules/factions.h"
  
! #include "psprop/pc/pspclinmove.h"
  #include "psprop/pc/pspcchar.h"
  #include "psprop/pc/pspcnpcdialog.h"
--- 72,76 ----
  #include "rpgrules/factions.h"
  
! #include <propclass/linmove.h>
  #include "psprop/pc/pspcchar.h"
  #include "psprop/pc/pspcnpcdialog.h"
***************
*** 795,800 ****
      csVector3 top(width,height*(1.0/3.0),depth);
      csVector3 bottom(width-.1,height*(2.0/3.0),depth-.1);
  
!     pcmove->InitCD(top, bottom); 
  
      SetPosition(pos,angle,sector);
--- 795,801 ----
      csVector3 top(width,height*(1.0/3.0),depth);
      csVector3 bottom(width-.1,height*(2.0/3.0),depth-.1);
+     csVector3 offset(0,0,0);
  
!     pcmove->InitCD(top, bottom, offset); 
  
      SetPosition(pos,angle,sector);

Index: adminmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/adminmanager.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** adminmanager.cpp	10 Jul 2003 01:03:07 -0000	1.32
--- adminmanager.cpp	10 Jul 2003 05:21:45 -0000	1.33
***************
*** 28,32 ****
  #include "net/msghandler.h"
  #include "psdatabase.h"
! #include "psprop/pc/pspclinmove.h"
  #include "psprop/pc/pspcnpcdialog.h"
  #include "netthread.h"
--- 28,32 ----
  #include "net/msghandler.h"
  #include "psdatabase.h"
! #include <propclass/linmove.h>
  #include "psprop/pc/pspcnpcdialog.h"
  #include "netthread.h"